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>
14 years ago · b36df56115
parent 4ad0df2b7c
commit b36df56115
139 changed files with 149 additions and 149 deletions
--- a/arch/powerpc/cpu/ppc4xx/40x_spd_sdram.c
+++ b/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)

--- a/arch/powerpc/cpu/ppc4xx/44x_spd_ddr.c
+++ b/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"
--- a/arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c
+++ b/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>
--- a/arch/powerpc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
+++ b/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>

--- a/arch/powerpc/cpu/ppc4xx/4xx_pcie.c
+++ b/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>
--- a/arch/powerpc/cpu/ppc4xx/4xx_uart.c
+++ b/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>
--- a/arch/powerpc/cpu/ppc4xx/cache.S
+++ b/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>
--- a/arch/powerpc/cpu/ppc4xx/cmd_ecctest.c
+++ b/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>
--- a/arch/powerpc/cpu/ppc4xx/cpu.c
+++ b/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;
--- a/arch/powerpc/cpu/ppc4xx/cpu_init.c
+++ b/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;
--- a/arch/powerpc/cpu/ppc4xx/dcr.S
+++ b/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  */

--- a/arch/powerpc/cpu/ppc4xx/denali_data_eye.c
+++ b/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)
 /*-----------------------------------------------------------------------------+
--- a/arch/powerpc/cpu/ppc4xx/denali_spd_ddr2.c
+++ b/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>
--- a/arch/powerpc/cpu/ppc4xx/ecc.c
+++ b/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>
--- a/arch/powerpc/cpu/ppc4xx/fdt.c
+++ b/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>
--- a/arch/powerpc/cpu/ppc4xx/interrupts.c
+++ b/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>

--- a/arch/powerpc/cpu/ppc4xx/kgdb.S
+++ b/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 */
--- a/arch/powerpc/cpu/ppc4xx/miiphy.c
+++ b/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)
--- a/arch/powerpc/cpu/ppc4xx/reginfo.c
+++ b/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 */
--- a/arch/powerpc/cpu/ppc4xx/sdram.c
+++ b/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"
--- a/arch/powerpc/cpu/ppc4xx/speed.c
+++ b/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;
--- a/arch/powerpc/cpu/ppc4xx/start.S
+++ b/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>

--- a/arch/powerpc/cpu/ppc4xx/tlb.c
+++ b/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>
--- a/arch/powerpc/cpu/ppc4xx/uic.c
+++ b/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>

--- a/arch/powerpc/cpu/ppc4xx/xilinx_irq.c
+++ b/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>
--- a/arch/powerpc/include/asm/4xx_pcie.h
+++ b/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
--- a/arch/powerpc/include/asm/ppc405.h
+++ b/arch/powerpc/include/asm/ppc405.h
--- a/arch/powerpc/include/asm/ppc440.h
+++ b/arch/powerpc/include/asm/ppc440.h
--- a/arch/powerpc/include/asm/ppc4xx-emac.h
+++ b/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"


 /*-----------------------------------------------------------------------------+
--- a/arch/powerpc/include/asm/ppc4xx-i2c.h
+++ b/arch/powerpc/include/asm/ppc4xx-i2c.h
--- a/arch/powerpc/include/asm/ppc4xx-mal.h
+++ b/arch/powerpc/include/asm/ppc4xx-mal.h
--- a/arch/powerpc/include/asm/ppc4xx.h
+++ b/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>
--- a/board/amcc/acadia/pll.c
+++ b/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!!! */

--- a/board/amcc/bamboo/bamboo.c
+++ b/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);
--- a/board/amcc/bamboo/flash.c
+++ b/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
--- a/board/amcc/bubinga/flash.c
+++ b/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        */
--- a/board/amcc/canyonlands/canyonlands.c
+++ b/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>
--- a/board/amcc/common/flash.c
+++ b/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 */
--- a/board/amcc/ebony/flash.c
+++ b/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
--- a/board/amcc/katmai/katmai.c
+++ b/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>
--- a/board/amcc/kilauea/kilauea.c
+++ b/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>
--- a/board/amcc/luan/flash.c
+++ b/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
--- a/board/amcc/luan/luan.c
+++ b/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>
--- a/board/amcc/makalu/makalu.c
+++ b/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>
--- a/board/amcc/ocotea/flash.c
+++ b/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
--- a/board/amcc/ocotea/ocotea.c
+++ b/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;

--- a/board/amcc/redwood/redwood.c
+++ b/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>
--- a/board/amcc/sequoia/sdram.c
+++ b/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
--- a/board/amcc/sequoia/sequoia.c
+++ b/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>
--- a/board/amcc/taihu/flash.c
+++ b/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        */
--- a/board/amcc/taishan/taishan.c
+++ b/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
--- a/board/amcc/walnut/flash.c
+++ b/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
--- a/board/amcc/yosemite/yosemite.c
+++ b/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>
--- a/board/amcc/yucca/flash.c
+++ b/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
--- a/board/amcc/yucca/yucca.c
+++ b/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>
--- a/board/amirix/ap1000/init.S
+++ b/board/amirix/ap1000/init.S
@ -16,7 +16,7 @@
 *
 */

-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>

 #include <ppc_asm.tmpl>
 #include <ppc_defs.h>
--- a/board/amirix/ap1000/pci.c
+++ b/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>

--- a/board/cray/L1/L1.c
+++ b/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>
--- a/board/cray/L1/flash.c
+++ b/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... */
--- a/board/cray/L1/init.S
+++ b/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	*/

--- a/board/csb272/csb272.c
+++ b/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);

--- a/board/csb272/init.S
+++ b/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	*/

--- a/board/csb472/csb472.c
+++ b/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);

--- a/board/csb472/init.S
+++ b/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	*/

--- a/board/dave/PPChameleonEVB/flash.c
+++ b/board/dave/PPChameleonEVB/flash.c
@ -22,7 +22,7 @@
 */

 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>

 /*
--- a/board/dave/common/pci.c
+++ b/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>

--- a/board/eric/flash.c
+++ b/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	*/
--- a/board/eric/init.S
+++ b/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	*/

--- a/board/esd/adciop/flash.c
+++ b/board/esd/adciop/flash.c
@ -22,7 +22,7 @@
 */

 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>

 /*
--- a/board/esd/ar405/flash.c
+++ b/board/esd/ar405/flash.c
@ -22,7 +22,7 @@
 */

 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>

 /*
--- a/board/esd/ash405/flash.c
+++ b/board/esd/ash405/flash.c
@ -22,7 +22,7 @@
 */

 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>

 /*
--- a/board/esd/canbt/flash.c
+++ b/board/esd/canbt/flash.c
@ -22,7 +22,7 @@
 */

 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>

 /*
--- a/board/esd/cms700/flash.c
+++ b/board/esd/cms700/flash.c
@ -22,7 +22,7 @@
 */

 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>

 /*
--- a/board/esd/common/flash.c
+++ b/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>

--- a/board/esd/common/pci.c
+++ b/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>

--- a/board/esd/cpci2dp/flash.c
+++ b/board/esd/cpci2dp/flash.c
@ -22,7 +22,7 @@
 */

 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>

 /*
--- a/board/esd/cpci405/flash.c
+++ b/board/esd/cpci405/flash.c
@ -22,7 +22,7 @@
 */

 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>

 /*
--- a/board/esd/cpciiser4/flash.c
+++ b/board/esd/cpciiser4/flash.c
@ -22,7 +22,7 @@
 */

 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>

 /*
--- a/board/esd/dasa_sim/flash.c
+++ b/board/esd/dasa_sim/flash.c
@ -22,7 +22,7 @@
 */

 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>

 /*
--- a/board/esd/dp405/flash.c
+++ b/board/esd/dp405/flash.c
@ -22,7 +22,7 @@
 */

 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>

 /*
--- a/board/esd/du405/du405.c
+++ b/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;
--- a/board/esd/du405/flash.c
+++ b/board/esd/du405/flash.c
@ -22,7 +22,7 @@
 */

 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>

 /*
--- a/board/esd/du440/du440.c
+++ b/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;
--- a/board/esd/hh405/flash.c
+++ b/board/esd/hh405/flash.c
@ -22,7 +22,7 @@
 */

 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>

 /*
--- a/board/esd/hub405/flash.c
+++ b/board/esd/hub405/flash.c
@ -22,7 +22,7 @@
 */

 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>

 /*
--- a/board/esd/ocrtc/flash.c
+++ b/board/esd/ocrtc/flash.c
@ -22,7 +22,7 @@
 */

 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>

 /*
--- a/board/esd/pci405/flash.c
+++ b/board/esd/pci405/flash.c
@ -22,7 +22,7 @@
 */

 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>

 /*
--- a/board/esd/pci405/writeibm.S
+++ b/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>
--- a/board/esd/plu405/flash.c
+++ b/board/esd/plu405/flash.c
@ -22,7 +22,7 @@
 */

 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>

 /*
--- a/board/esd/pmc440/pmc440.c
+++ b/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>
--- a/board/esd/pmc440/sdram.c
+++ b/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);
--- a/board/esd/tasreg/flash.c
+++ b/board/esd/tasreg/flash.c
@ -22,7 +22,7 @@
 */

 #include <common.h>
-/*#include <ppc4xx.h>*/
+/*#include <asm/ppc4xx.h>*/
 #include <asm/processor.h>

 /*
--- a/board/esd/voh405/flash.c
+++ b/board/esd/voh405/flash.c
@ -22,7 +22,7 @@
 */

 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>

 /*
--- a/board/esd/vom405/flash.c
+++ b/board/esd/vom405/flash.c
@ -22,7 +22,7 @@
 */

 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>

 /*
--- a/board/esd/wuh405/flash.c
+++ b/board/esd/wuh405/flash.c
@ -22,7 +22,7 @@
 */

 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>

 /*
--- a/board/gdsys/gdppc440etx/gdppc440etx.c
+++ b/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>
--- a/board/gdsys/intip/intip.c
+++ b/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>
--- a/board/jse/flash.c
+++ b/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
--- a/board/jse/init.S
+++ b/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>
--- a/board/jse/jse.c
+++ b/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"
--- a/Show More
+++ b/Show More