Bläddra i källkod

ppc4xx: Move ppc4xx headers to powerpc include directory

This patch moves some ppc4xx related headers from the common include
directory (include/) to the powerpc specific one
(arch/powerpc/include/asm/). This way to common include directory is not
so cluttered with files.

Signed-off-by: Stefan Roese <sr@denx.de>
Stefan Roese 14 år sedan
förälder
incheckning
b36df56115
100 ändrade filer med 104 tillägg och 104 borttagningar
  1. 1 1
      arch/powerpc/cpu/ppc4xx/40x_spd_sdram.c
  2. 1 1
      arch/powerpc/cpu/ppc4xx/44x_spd_ddr.c
  3. 1 1
      arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c
  4. 1 1
      arch/powerpc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
  5. 1 1
      arch/powerpc/cpu/ppc4xx/4xx_pcie.c
  6. 1 1
      arch/powerpc/cpu/ppc4xx/4xx_uart.c
  7. 1 1
      arch/powerpc/cpu/ppc4xx/cache.S
  8. 1 1
      arch/powerpc/cpu/ppc4xx/cmd_ecctest.c
  9. 1 1
      arch/powerpc/cpu/ppc4xx/cpu.c
  10. 2 2
      arch/powerpc/cpu/ppc4xx/cpu_init.c
  11. 1 1
      arch/powerpc/cpu/ppc4xx/dcr.S
  12. 1 1
      arch/powerpc/cpu/ppc4xx/denali_data_eye.c
  13. 1 1
      arch/powerpc/cpu/ppc4xx/denali_spd_ddr2.c
  14. 1 1
      arch/powerpc/cpu/ppc4xx/ecc.c
  15. 1 1
      arch/powerpc/cpu/ppc4xx/fdt.c
  16. 1 1
      arch/powerpc/cpu/ppc4xx/interrupts.c
  17. 1 1
      arch/powerpc/cpu/ppc4xx/kgdb.S
  18. 2 2
      arch/powerpc/cpu/ppc4xx/miiphy.c
  19. 1 1
      arch/powerpc/cpu/ppc4xx/reginfo.c
  20. 1 1
      arch/powerpc/cpu/ppc4xx/sdram.c
  21. 1 1
      arch/powerpc/cpu/ppc4xx/speed.c
  22. 1 1
      arch/powerpc/cpu/ppc4xx/start.S
  23. 1 1
      arch/powerpc/cpu/ppc4xx/tlb.c
  24. 1 1
      arch/powerpc/cpu/ppc4xx/uic.c
  25. 1 1
      arch/powerpc/cpu/ppc4xx/xilinx_irq.c
  26. 1 1
      arch/powerpc/include/asm/4xx_pcie.h
  27. 0 0
      arch/powerpc/include/asm/ppc405.h
  28. 0 0
      arch/powerpc/include/asm/ppc440.h
  29. 1 1
      arch/powerpc/include/asm/ppc4xx-emac.h
  30. 0 0
      arch/powerpc/include/asm/ppc4xx-i2c.h
  31. 0 0
      arch/powerpc/include/asm/ppc4xx-mal.h
  32. 2 2
      arch/powerpc/include/asm/ppc4xx.h
  33. 1 1
      board/amcc/acadia/pll.c
  34. 1 1
      board/amcc/bamboo/bamboo.c
  35. 2 2
      board/amcc/bamboo/flash.c
  36. 1 1
      board/amcc/bubinga/flash.c
  37. 1 1
      board/amcc/canyonlands/canyonlands.c
  38. 1 1
      board/amcc/common/flash.c
  39. 1 1
      board/amcc/ebony/flash.c
  40. 1 1
      board/amcc/katmai/katmai.c
  41. 2 2
      board/amcc/kilauea/kilauea.c
  42. 1 1
      board/amcc/luan/flash.c
  43. 1 1
      board/amcc/luan/luan.c
  44. 2 2
      board/amcc/makalu/makalu.c
  45. 1 1
      board/amcc/ocotea/flash.c
  46. 1 1
      board/amcc/ocotea/ocotea.c
  47. 1 1
      board/amcc/redwood/redwood.c
  48. 1 1
      board/amcc/sequoia/sdram.c
  49. 1 1
      board/amcc/sequoia/sequoia.c
  50. 1 1
      board/amcc/taihu/flash.c
  51. 1 1
      board/amcc/taishan/taishan.c
  52. 1 1
      board/amcc/walnut/flash.c
  53. 1 1
      board/amcc/yosemite/yosemite.c
  54. 2 2
      board/amcc/yucca/flash.c
  55. 1 1
      board/amcc/yucca/yucca.c
  56. 1 1
      board/amirix/ap1000/init.S
  57. 1 1
      board/amirix/ap1000/pci.c
  58. 1 1
      board/cray/L1/L1.c
  59. 1 1
      board/cray/L1/flash.c
  60. 1 1
      board/cray/L1/init.S
  61. 1 1
      board/csb272/csb272.c
  62. 1 1
      board/csb272/init.S
  63. 1 1
      board/csb472/csb472.c
  64. 1 1
      board/csb472/init.S
  65. 1 1
      board/dave/PPChameleonEVB/flash.c
  66. 1 1
      board/dave/common/pci.c
  67. 1 1
      board/eric/flash.c
  68. 1 1
      board/eric/init.S
  69. 1 1
      board/esd/adciop/flash.c
  70. 1 1
      board/esd/ar405/flash.c
  71. 1 1
      board/esd/ash405/flash.c
  72. 1 1
      board/esd/canbt/flash.c
  73. 1 1
      board/esd/cms700/flash.c
  74. 1 1
      board/esd/common/flash.c
  75. 1 1
      board/esd/common/pci.c
  76. 1 1
      board/esd/cpci2dp/flash.c
  77. 1 1
      board/esd/cpci405/flash.c
  78. 1 1
      board/esd/cpciiser4/flash.c
  79. 1 1
      board/esd/dasa_sim/flash.c
  80. 1 1
      board/esd/dp405/flash.c
  81. 2 2
      board/esd/du405/du405.c
  82. 1 1
      board/esd/du405/flash.c
  83. 1 1
      board/esd/du440/du440.c
  84. 1 1
      board/esd/hh405/flash.c
  85. 1 1
      board/esd/hub405/flash.c
  86. 1 1
      board/esd/ocrtc/flash.c
  87. 1 1
      board/esd/pci405/flash.c
  88. 1 1
      board/esd/pci405/writeibm.S
  89. 1 1
      board/esd/plu405/flash.c
  90. 1 1
      board/esd/pmc440/pmc440.c
  91. 1 1
      board/esd/pmc440/sdram.c
  92. 1 1
      board/esd/tasreg/flash.c
  93. 1 1
      board/esd/voh405/flash.c
  94. 1 1
      board/esd/vom405/flash.c
  95. 1 1
      board/esd/wuh405/flash.c
  96. 1 1
      board/gdsys/gdppc440etx/gdppc440etx.c
  97. 1 1
      board/gdsys/intip/intip.c
  98. 1 1
      board/jse/flash.c
  99. 1 1
      board/jse/init.S
  100. 1 1
      board/jse/jse.c

+ 1 - 1
arch/powerpc/cpu/ppc4xx/40x_spd_sdram.c

@@ -45,7 +45,7 @@
 #include <common.h>
 #include <asm/processor.h>
 #include <i2c.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 
 #if defined(CONFIG_SPD_EEPROM) && !defined(CONFIG_440)
 

+ 1 - 1
arch/powerpc/cpu/ppc4xx/44x_spd_ddr.c

@@ -50,7 +50,7 @@
 #include <common.h>
 #include <asm/processor.h>
 #include <i2c.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/mmu.h>
 
 #include "ecc.h"

+ 1 - 1
arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c

@@ -41,7 +41,7 @@
 
 #include <common.h>
 #include <command.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <i2c.h>
 #include <asm/io.h>
 #include <asm/processor.h>

+ 1 - 1
arch/powerpc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c

@@ -38,7 +38,7 @@
 #undef DEBUG
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/io.h>
 #include <asm/processor.h>
 

+ 1 - 1
arch/powerpc/cpu/ppc4xx/4xx_pcie.c

@@ -27,7 +27,7 @@
 
 #include <common.h>
 #include <pci.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/errno.h>

+ 1 - 1
arch/powerpc/cpu/ppc4xx/4xx_uart.c

@@ -49,7 +49,7 @@
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <watchdog.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 
 #ifdef CONFIG_SERIAL_MULTI
 #include <serial.h>

+ 1 - 1
arch/powerpc/cpu/ppc4xx/cache.S

@@ -14,7 +14,7 @@
 
 #include <config.h>
 #include <config.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <ppc_asm.tmpl>
 #include <ppc_defs.h>
 #include <asm/cache.h>

+ 1 - 1
arch/powerpc/cpu/ppc4xx/cmd_ecctest.c

@@ -23,7 +23,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/cache.h>

+ 1 - 1
arch/powerpc/cpu/ppc4xx/cpu.c

@@ -35,7 +35,7 @@
 #include <watchdog.h>
 #include <command.h>
 #include <asm/cache.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <netdev.h>
 
 DECLARE_GLOBAL_DATA_PTR;

+ 2 - 2
arch/powerpc/cpu/ppc4xx/cpu_init.c

@@ -23,10 +23,10 @@
 
 #include <common.h>
 #include <watchdog.h>
-#include <ppc4xx_enet.h>
+#include <asm/ppc4xx-emac.h>
 #include <asm/processor.h>
 #include <asm/gpio.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 
 #if defined(CONFIG_405GP)  || defined(CONFIG_405EP)
 DECLARE_GLOBAL_DATA_PTR;

+ 1 - 1
arch/powerpc/cpu/ppc4xx/dcr.S

@@ -24,7 +24,7 @@
 
 #if defined(CONFIG_4xx) && defined(CONFIG_CMD_SETGETDCR)
 
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 
 #define _LINUX_CONFIG_H 1       /* avoid reading Linux autoconf.h file  */
 

+ 1 - 1
arch/powerpc/cpu/ppc4xx/denali_data_eye.c

@@ -36,7 +36,7 @@
 #include <common.h>
 #include <asm/processor.h>
 #include <asm/io.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 
 #if defined(CONFIG_440EPX) || defined(CONFIG_440GRX)
 /*-----------------------------------------------------------------------------+

+ 1 - 1
arch/powerpc/cpu/ppc4xx/denali_spd_ddr2.c

@@ -40,7 +40,7 @@
 
 #include <common.h>
 #include <command.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <i2c.h>
 #include <asm/io.h>
 #include <asm/processor.h>

+ 1 - 1
arch/powerpc/cpu/ppc4xx/ecc.c

@@ -37,7 +37,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <ppc_asm.tmpl>
 #include <ppc_defs.h>
 #include <asm/processor.h>

+ 1 - 1
arch/powerpc/cpu/ppc4xx/fdt.c

@@ -25,7 +25,7 @@
 #include <watchdog.h>
 #include <command.h>
 #include <asm/cache.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 
 #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
 #include <libfdt.h>

+ 1 - 1
arch/powerpc/cpu/ppc4xx/interrupts.c

@@ -36,7 +36,7 @@
 #include <command.h>
 #include <asm/processor.h>
 #include <asm/interrupt.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <ppc_asm.tmpl>
 #include <commproc.h>
 

+ 1 - 1
arch/powerpc/cpu/ppc4xx/kgdb.S

@@ -22,7 +22,7 @@
 
 #include <config.h>
 #include <command.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <version.h>
 
 #define CONFIG_405GP 1		/* needed for Linux kernel header files */

+ 2 - 2
arch/powerpc/cpu/ppc4xx/miiphy.c

@@ -41,8 +41,8 @@
 #include <asm/io.h>
 #include <ppc_asm.tmpl>
 #include <commproc.h>
-#include <ppc4xx_enet.h>
-#include <405_mal.h>
+#include <asm/ppc4xx-emac.h>
+#include <asm/ppc4xx-mal.h>
 #include <miiphy.h>
 
 #if !defined(CONFIG_PHY_CLK_FREQ)

+ 1 - 1
arch/powerpc/cpu/ppc4xx/reginfo.c

@@ -28,7 +28,7 @@
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/ppc4xx-uic.h>
-#include <ppc4xx_enet.h>
+#include <asm/ppc4xx-emac.h>
 
 enum REGISTER_TYPE {
 	IDCR1,	/* Indirectly Accessed DCR via SDRAM0_CFGADDR/SDRAM0_CFGDATA */

+ 1 - 1
arch/powerpc/cpu/ppc4xx/sdram.c

@@ -28,7 +28,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 #include "sdram.h"
 #include "ecc.h"

+ 1 - 1
arch/powerpc/cpu/ppc4xx/speed.c

@@ -23,7 +23,7 @@
 
 #include <common.h>
 #include <ppc_asm.tmpl>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 
 DECLARE_GLOBAL_DATA_PTR;

+ 1 - 1
arch/powerpc/cpu/ppc4xx/start.S

@@ -64,7 +64,7 @@
  *  address and (s)dram will be positioned at address 0
  */
 #include <config.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <timestamp.h>
 #include <version.h>
 

+ 1 - 1
arch/powerpc/cpu/ppc4xx/tlb.c

@@ -25,7 +25,7 @@
 
 #if defined(CONFIG_440)
 
-#include <ppc440.h>
+#include <asm/ppc440.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <asm/mmu.h>

+ 1 - 1
arch/powerpc/cpu/ppc4xx/uic.c

@@ -36,7 +36,7 @@
 #include <command.h>
 #include <asm/processor.h>
 #include <asm/interrupt.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <ppc_asm.tmpl>
 #include <commproc.h>
 

+ 1 - 1
arch/powerpc/cpu/ppc4xx/xilinx_irq.c

@@ -21,7 +21,7 @@
 #include <command.h>
 #include <asm/processor.h>
 #include <asm/interrupt.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <ppc_asm.tmpl>
 #include <commproc.h>
 #include <asm/io.h>

+ 1 - 1
arch/powerpc/include/asm/4xx_pcie.h

@@ -11,7 +11,7 @@
 #ifndef __4XX_PCIE_H
 #define __4XX_PCIE_H
 
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <pci.h>
 
 #define DCRN_SDR0_CFGADDR	0x00e

+ 0 - 0
include/ppc405.h → arch/powerpc/include/asm/ppc405.h


+ 0 - 0
include/ppc440.h → arch/powerpc/include/asm/ppc440.h


+ 1 - 1
include/ppc4xx_enet.h → arch/powerpc/include/asm/ppc4xx-emac.h

@@ -44,7 +44,7 @@
 #define _PPC4XX_ENET_H_
 
 #include <net.h>
-#include "405_mal.h"
+#include "asm/ppc4xx-mal.h"
 
 
 /*-----------------------------------------------------------------------------+

+ 0 - 0
include/4xx_i2c.h → arch/powerpc/include/asm/ppc4xx-i2c.h


+ 0 - 0
include/405_mal.h → arch/powerpc/include/asm/ppc4xx-mal.h


+ 2 - 2
include/ppc4xx.h → arch/powerpc/include/asm/ppc4xx.h

@@ -100,9 +100,9 @@
 #endif /* 440EP/EPX 440GR/GRX 440SP/SPE 460EX/GT/SX 405EX*/
 
 #if defined(CONFIG_440)
-#include <ppc440.h>
+#include <asm/ppc440.h>
 #else
-#include <ppc405.h>
+#include <asm/ppc405.h>
 #endif
 
 #include <asm/ppc4xx-sdram.h>

+ 1 - 1
board/amcc/acadia/pll.c

@@ -23,7 +23,7 @@
 
 #include <common.h>
 #include <asm/processor.h>
-#include <ppc405.h>
+#include <asm/ppc405.h>
 
 /* test-only: move into cpu directory!!! */
 

+ 1 - 1
board/amcc/bamboo/bamboo.c

@@ -25,7 +25,7 @@
 #include <asm/processor.h>
 #include <asm/gpio.h>
 #include <spd_sdram.h>
-#include <ppc440.h>
+#include <asm/ppc440.h>
 #include "bamboo.h"
 
 void ext_bus_cntlr_init(void);

+ 2 - 2
board/amcc/bamboo/flash.c

@@ -32,9 +32,9 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
-#include <ppc440.h>
+#include <asm/ppc440.h>
 #include "bamboo.h"
 
 #undef DEBUG

+ 1 - 1
board/amcc/bubinga/flash.c

@@ -29,7 +29,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 
 flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];	/* info for FLASH chips        */

+ 1 - 1
board/amcc/canyonlands/canyonlands.c

@@ -19,7 +19,7 @@
  */
 
 #include <common.h>
-#include <ppc440.h>
+#include <asm/ppc440.h>
 #include <libfdt.h>
 #include <fdt_support.h>
 #include <i2c.h>

+ 1 - 1
board/amcc/common/flash.c

@@ -32,7 +32,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 
 flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];	/* info for FLASH chips */

+ 1 - 1
board/amcc/ebony/flash.c

@@ -32,7 +32,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 
 #undef DEBUG

+ 1 - 1
board/amcc/katmai/katmai.c

@@ -23,7 +23,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <i2c.h>
 #include <libfdt.h>
 #include <fdt_support.h>

+ 2 - 2
board/amcc/kilauea/kilauea.c

@@ -22,8 +22,8 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
-#include <ppc405.h>
+#include <asm/ppc4xx.h>
+#include <asm/ppc405.h>
 #include <libfdt.h>
 #include <fdt_support.h>
 #include <asm/processor.h>

+ 1 - 1
board/amcc/luan/flash.c

@@ -32,7 +32,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 
 #undef DEBUG

+ 1 - 1
board/amcc/luan/luan.c

@@ -23,7 +23,7 @@
 
 #include <common.h>
 #include <command.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 #include <asm/ppc4xx-isram.h>
 #include <spd_sdram.h>

+ 2 - 2
board/amcc/makalu/makalu.c

@@ -22,8 +22,8 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
-#include <ppc405.h>
+#include <asm/ppc4xx.h>
+#include <asm/ppc405.h>
 #include <libfdt.h>
 #include <asm/processor.h>
 #include <asm/gpio.h>

+ 1 - 1
board/amcc/ocotea/flash.c

@@ -32,7 +32,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 
 #undef DEBUG

+ 1 - 1
board/amcc/ocotea/ocotea.c

@@ -28,7 +28,7 @@
 #include "ocotea.h"
 #include <asm/processor.h>
 #include <spd_sdram.h>
-#include <ppc4xx_enet.h>
+#include <asm/ppc4xx-emac.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 

+ 1 - 1
board/amcc/redwood/redwood.c

@@ -26,7 +26,7 @@
 
 #include <common.h>
 #include "redwood.h"
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 #include <i2c.h>
 #include <asm/io.h>

+ 1 - 1
board/amcc/sequoia/sdram.c

@@ -31,7 +31,7 @@
 #include <common.h>
 #include <asm/processor.h>
 #include <asm/io.h>
-#include <ppc440.h>
+#include <asm/ppc440.h>
 
 /*-----------------------------------------------------------------------------+
  * Prototypes

+ 1 - 1
board/amcc/sequoia/sequoia.c

@@ -25,7 +25,7 @@
 #include <common.h>
 #include <libfdt.h>
 #include <fdt_support.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/gpio.h>
 #include <asm/processor.h>
 #include <asm/io.h>

+ 1 - 1
board/amcc/taihu/flash.c

@@ -29,7 +29,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 
 flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];	/* info for FLASH chips        */

+ 1 - 1
board/amcc/taishan/taishan.c

@@ -26,7 +26,7 @@
 #include <common.h>
 #include <asm/processor.h>
 #include <spd_sdram.h>
-#include <ppc4xx_enet.h>
+#include <asm/ppc4xx-emac.h>
 #include <netdev.h>
 
 #ifdef CONFIG_SYS_INIT_SHOW_RESET_REG

+ 1 - 1
board/amcc/walnut/flash.c

@@ -29,7 +29,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 
 #undef DEBUG

+ 1 - 1
board/amcc/yosemite/yosemite.c

@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <spd_sdram.h>

+ 2 - 2
board/amcc/yucca/flash.c

@@ -32,9 +32,9 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
-#include <ppc440.h>
+#include <asm/ppc440.h>
 #include "yucca.h"
 
 #ifdef DEBUG

+ 1 - 1
board/amcc/yucca/yucca.c

@@ -26,7 +26,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <i2c.h>
 #include <netdev.h>
 #include <asm/processor.h>

+ 1 - 1
board/amirix/ap1000/init.S

@@ -16,7 +16,7 @@
  *
  */
 
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 
 #include <ppc_asm.tmpl>
 #include <ppc_defs.h>

+ 1 - 1
board/amirix/ap1000/pci.c

@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 #include <pci.h>
 

+ 1 - 1
board/cray/L1/L1.c

@@ -23,7 +23,7 @@
 
 #include <common.h>
 #include <asm/processor.h>
-#include <4xx_i2c.h>
+#include <asm/ppc4xx-i2c.h>
 #include <command.h>
 #include <rtc.h>
 #include <post.h>

+ 1 - 1
board/cray/L1/flash.c

@@ -35,7 +35,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 
 /* The flash chip we use... */

+ 1 - 1
board/cray/L1/init.S

@@ -41,7 +41,7 @@
 /*	Bank 6 - not used */
 /*	Bank 7 - FPGA registers */
 /*-----------------------------------------------------------------------------#include <config.h> */
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 
 #define _LINUX_CONFIG_H 1	/* avoid reading Linux autoconf.h file	*/
 

+ 1 - 1
board/csb272/csb272.c

@@ -25,7 +25,7 @@
 #include <asm/processor.h>
 #include <i2c.h>
 #include <miiphy.h>
-#include <ppc4xx_enet.h>
+#include <asm/ppc4xx-emac.h>
 
 void sdram_init(void);
 

+ 1 - 1
board/csb272/init.S

@@ -22,7 +22,7 @@
  *
  *****************************************************************************/
 #include <config.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 
 #define _LINUX_CONFIG_H 1	/* avoid reading Linux autoconf.h file	*/
 

+ 1 - 1
board/csb472/csb472.c

@@ -25,7 +25,7 @@
 #include <asm/processor.h>
 #include <i2c.h>
 #include <miiphy.h>
-#include <ppc4xx_enet.h>
+#include <asm/ppc4xx-emac.h>
 
 void sdram_init(void);
 

+ 1 - 1
board/csb472/init.S

@@ -22,7 +22,7 @@
  *
  *****************************************************************************/
 #include <config.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 
 #define _LINUX_CONFIG_H 1	/* avoid reading Linux autoconf.h file	*/
 

+ 1 - 1
board/dave/PPChameleonEVB/flash.c

@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 
 /*

+ 1 - 1
board/dave/common/pci.c

@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 #include <pci.h>
 

+ 1 - 1
board/eric/flash.c

@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 
 flash_info_t	flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; /* info for FLASH chips	*/

+ 1 - 1
board/eric/init.S

@@ -35,7 +35,7 @@
 /* */
 /*----------------------------------------------------------------------------- */
 #include <config.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 
 #define _LINUX_CONFIG_H 1	/* avoid reading Linux autoconf.h file	*/
 

+ 1 - 1
board/esd/adciop/flash.c

@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 
 /*

+ 1 - 1
board/esd/ar405/flash.c

@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 
 /*

+ 1 - 1
board/esd/ash405/flash.c

@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 
 /*

+ 1 - 1
board/esd/canbt/flash.c

@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 
 /*

+ 1 - 1
board/esd/cms700/flash.c

@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 
 /*

+ 1 - 1
board/esd/common/flash.c

@@ -23,7 +23,7 @@
 
 #include <common.h>
 #ifdef __PPC__
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #endif
 #include <asm/processor.h>
 

+ 1 - 1
board/esd/common/pci.c

@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 #include <pci.h>
 

+ 1 - 1
board/esd/cpci2dp/flash.c

@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 
 /*

+ 1 - 1
board/esd/cpci405/flash.c

@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 
 /*

+ 1 - 1
board/esd/cpciiser4/flash.c

@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 
 /*

+ 1 - 1
board/esd/dasa_sim/flash.c

@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 
 /*

+ 1 - 1
board/esd/dp405/flash.c

@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 
 /*

+ 2 - 2
board/esd/du405/du405.c

@@ -24,8 +24,8 @@
 #include <common.h>
 #include "du405.h"
 #include <asm/processor.h>
-#include <ppc4xx.h>
-#include <4xx_i2c.h>
+#include <asm/ppc4xx.h>
+#include <asm/ppc4xx-i2c.h>
 #include <command.h>
 
 DECLARE_GLOBAL_DATA_PTR;

+ 1 - 1
board/esd/du405/flash.c

@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 
 /*

+ 1 - 1
board/esd/du440/du440.c

@@ -24,7 +24,7 @@
 #include <asm/bitops.h>
 #include <command.h>
 #include <i2c.h>
-#include <ppc440.h>
+#include <asm/ppc440.h>
 #include "du440.h"
 
 DECLARE_GLOBAL_DATA_PTR;

+ 1 - 1
board/esd/hh405/flash.c

@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 
 /*

+ 1 - 1
board/esd/hub405/flash.c

@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 
 /*

+ 1 - 1
board/esd/ocrtc/flash.c

@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 
 /*

+ 1 - 1
board/esd/pci405/flash.c

@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 
 /*

+ 1 - 1
board/esd/pci405/writeibm.S

@@ -41,7 +41,7 @@
 /*	Bank 6 - not used */
 /*	Bank 7 - FPGA registers */
 /*----------------------------------------------------------------------------- */
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 
 #include <ppc_asm.tmpl>
 #include <ppc_defs.h>

+ 1 - 1
board/esd/plu405/flash.c

@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 
 /*

+ 1 - 1
board/esd/pmc440/pmc440.c

@@ -29,7 +29,7 @@
 #include <common.h>
 #include <libfdt.h>
 #include <fdt_support.h>
-#include <ppc440.h>
+#include <asm/ppc440.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/bitops.h>

+ 1 - 1
board/esd/pmc440/sdram.c

@@ -35,7 +35,7 @@
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/mmu.h>
-#include <ppc440.h>
+#include <asm/ppc440.h>
 
 extern int denali_wait_for_dlllock(void);
 extern void denali_core_search_data_eye(void);

+ 1 - 1
board/esd/tasreg/flash.c

@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-/*#include <ppc4xx.h>*/
+/*#include <asm/ppc4xx.h>*/
 #include <asm/processor.h>
 
 /*

+ 1 - 1
board/esd/voh405/flash.c

@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 
 /*

+ 1 - 1
board/esd/vom405/flash.c

@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 
 /*

+ 1 - 1
board/esd/wuh405/flash.c

@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 
 /*

+ 1 - 1
board/gdsys/gdppc440etx/gdppc440etx.c

@@ -26,7 +26,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/4xx_pci.h>

+ 1 - 1
board/gdsys/intip/intip.c

@@ -23,7 +23,7 @@
  */
 
 #include <common.h>
-#include <ppc440.h>
+#include <asm/ppc440.h>
 #include <libfdt.h>
 #include <fdt_support.h>
 #include <i2c.h>

+ 1 - 1
board/jse/flash.c

@@ -29,7 +29,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 
 #if CONFIG_SYS_MAX_FLASH_BANKS != 1

+ 1 - 1
board/jse/init.S

@@ -44,7 +44,7 @@
 /*	Bank 6 - not used             */
 /*	Bank 7 - not used             */
 /*------------------------------------------------------------------------- */
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 
 #include <ppc_asm.tmpl>
 #include <ppc_defs.h>

+ 1 - 1
board/jse/jse.c

@@ -19,7 +19,7 @@
  */
 
 # include  <common.h>
-# include  <ppc4xx.h>
+# include  <asm/ppc4xx.h>
 # include  <asm/processor.h>
 # include  <asm/io.h>
 # include  "jse_priv.h"

Vissa filer visades inte eftersom för många filer har ändrats