[U-Boot] [PATCH 2/5] 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 --- arch/powerpc/cpu/ppc4xx/40x_spd_sdram.c | 2 +- arch/powerpc/cpu/ppc4xx/44x_spd_ddr.c | 2 +- arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c | 2 +- arch/powerpc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c | 2 +- arch/powerpc/cpu/ppc4xx/4xx_pcie.c | 2 +- arch/powerpc/cpu/ppc4xx/4xx_uart.c | 2 +- arch/powerpc/cpu/ppc4xx/cache.S | 2 +- arch/powerpc/cpu/ppc4xx/cmd_ecctest.c | 2 +- arch/powerpc/cpu/ppc4xx/cpu.c | 2 +- arch/powerpc/cpu/ppc4xx/cpu_init.c | 4 ++-- arch/powerpc/cpu/ppc4xx/dcr.S | 2 +- arch/powerpc/cpu/ppc4xx/denali_data_eye.c | 2 +- arch/powerpc/cpu/ppc4xx/denali_spd_ddr2.c | 2 +- arch/powerpc/cpu/ppc4xx/ecc.c | 2 +- arch/powerpc/cpu/ppc4xx/fdt.c | 2 +- arch/powerpc/cpu/ppc4xx/interrupts.c | 2 +- arch/powerpc/cpu/ppc4xx/kgdb.S | 2 +- arch/powerpc/cpu/ppc4xx/miiphy.c | 4 ++-- arch/powerpc/cpu/ppc4xx/reginfo.c | 2 +- arch/powerpc/cpu/ppc4xx/sdram.c | 2 +- arch/powerpc/cpu/ppc4xx/speed.c | 2 +- arch/powerpc/cpu/ppc4xx/start.S | 2 +- arch/powerpc/cpu/ppc4xx/tlb.c | 2 +- arch/powerpc/cpu/ppc4xx/uic.c | 2 +- arch/powerpc/cpu/ppc4xx/xilinx_irq.c | 2 +- arch/powerpc/include/asm/4xx_pcie.h | 2 +- {include => arch/powerpc/include/asm}/ppc405.h | 0 {include => arch/powerpc/include/asm}/ppc440.h | 0 .../powerpc/include/asm/ppc4xx-emac.h | 2 +- .../powerpc/include/asm/ppc4xx-i2c.h | 0 .../powerpc/include/asm/ppc4xx-mal.h | 0 {include => arch/powerpc/include/asm}/ppc4xx.h | 4 ++-- board/amcc/acadia/pll.c | 2 +- board/amcc/bamboo/bamboo.c | 2 +- board/amcc/bamboo/flash.c | 4 ++-- board/amcc/bubinga/flash.c | 2 +- board/amcc/canyonlands/canyonlands.c | 2 +- board/amcc/common/flash.c | 2 +- board/amcc/ebony/flash.c | 2 +- board/amcc/katmai/katmai.c | 2 +- board/amcc/kilauea/kilauea.c | 4 ++-- board/amcc/luan/flash.c | 2 +- board/amcc/luan/luan.c | 2 +- board/amcc/makalu/makalu.c | 4 ++-- board/amcc/ocotea/flash.c | 2 +- board/amcc/ocotea/ocotea.c | 2 +- board/amcc/redwood/redwood.c | 2 +- board/amcc/sequoia/sdram.c | 2 +- board/amcc/sequoia/sequoia.c | 2 +- board/amcc/taihu/flash.c | 2 +- board/amcc/taishan/taishan.c | 2 +- board/amcc/walnut/flash.c | 2 +- board/amcc/yosemite/yosemite.c | 2 +- board/amcc/yucca/flash.c | 4 ++-- board/amcc/yucca/yucca.c | 2 +- board/amirix/ap1000/init.S | 2 +- board/amirix/ap1000/pci.c | 2 +- board/cray/L1/L1.c | 2 +- board/cray/L1/flash.c | 2 +- board/cray/L1/init.S | 2 +- board/csb272/csb272.c | 2 +- board/csb272/init.S | 2 +- board/csb472/csb472.c | 2 +- board/csb472/init.S | 2 +- board/dave/PPChameleonEVB/flash.c | 2 +- board/dave/common/pci.c | 2 +- board/eric/flash.c | 2 +- board/eric/init.S | 2 +- board/esd/adciop/flash.c | 2 +- board/esd/ar405/flash.c | 2 +- board/esd/ash405/flash.c | 2 +- board/esd/canbt/flash.c | 2 +- board/esd/cms700/flash.c | 2 +- board/esd/common/flash.c | 2 +- board/esd/common/pci.c | 2 +- board/esd/cpci2dp/flash.c | 2 +- board/esd/cpci405/flash.c | 2 +- board/esd/cpciiser4/flash.c | 2 +- board/esd/dasa_sim/flash.c | 2 +- board/esd/dp405/flash.c | 2 +- board/esd/du405/du405.c | 4 ++-- board/esd/du405/flash.c | 2 +- board/esd/du440/du440.c | 2 +- board/esd/hh405/flash.c | 2 +- board/esd/hub405/flash.c | 2 +- board/esd/ocrtc/flash.c | 2 +- board/esd/pci405/flash.c | 2 +- board/esd/pci405/writeibm.S | 2 +- board/esd/plu405/flash.c | 2 +- board/esd/pmc440/pmc440.c | 2 +- board/esd/pmc440/sdram.c | 2 +- board/esd/tasreg/flash.c | 2 +- board/esd/voh405/flash.c | 2 +- board/esd/vom405/flash.c | 2 +- board/esd/wuh405/flash.c | 2 +- board/gdsys/gdppc440etx/gdppc440etx.c | 2 +- board/gdsys/intip/intip.c | 2 +- board/jse/flash.c | 2 +- board/jse/init.S | 2 +- board/jse/jse.c | 2 +- board/jse/sdram.c | 2 +- board/korat/korat.c | 2 +- board/lwmon5/lwmon5.c | 2 +- board/lwmon5/sdram.c | 2 +- board/ml2/init.S | 2 +- board/mosaixtech/icon/icon.c | 2 +- board/mpl/common/flash.c | 2 +- board/mpl/common/memtst.c | 2 +- board/mpl/mip405/init.S | 2 +- board/mpl/mip405/mip405.c | 2 +- board/mpl/pip405/init.S | 2 +- board/netstal/common/fixed_sdram.c | 2 +- board/netstal/hcu4/hcu4.c | 2 +- board/netstal/hcu5/hcu5.c | 2 +- board/netstal/hcu5/sdram.c | 2 +- board/netstal/mcu25/mcu25.c | 2 +- board/pcs440ep/pcs440ep.c | 2 +- board/prodrive/alpr/alpr.c | 2 +- board/prodrive/alpr/fpga.c | 2 +- board/sandburst/common/flash.c | 2 +- board/sandburst/common/ppc440gx_i2c.c | 4 ++-- board/sandburst/common/ppc440gx_i2c.h | 4 ++-- board/sc3/init.S | 2 +- board/snmc/qs850/flash.c | 2 +- board/snmc/qs860t/flash.c | 2 +- board/t3corp/t3corp.c | 2 +- board/tb0229/flash.c | 2 +- board/w7o/flash.c | 2 +- board/w7o/init.S | 2 +- board/w7o/post1.S | 2 +- drivers/i2c/ppc4xx_i2c.c | 4 ++-- drivers/mtd/nand/ndfc.c | 2 +- drivers/net/4xx_enet.c | 6 +++--- include/common.h | 2 +- nand_spl/board/amcc/bamboo/sdram.c | 2 +- nand_spl/board/amcc/canyonlands/ddr2_fixed.c | 2 +- post/cpu/ppc4xx/denali_ecc.c | 2 +- post/cpu/ppc4xx/ether.c | 4 ++-- post/cpu/ppc4xx/fpu.c | 2 +- 139 files changed, 149 insertions(+), 149 deletions(-) rename {include => arch/powerpc/include/asm}/ppc405.h (100%) rename {include => arch/powerpc/include/asm}/ppc440.h (100%) rename include/ppc4xx_enet.h => arch/powerpc/include/asm/ppc4xx-emac.h (99%) rename include/4xx_i2c.h => arch/powerpc/include/asm/ppc4xx-i2c.h (100%) rename include/405_mal.h => arch/powerpc/include/asm/ppc4xx-mal.h (100%) rename {include => arch/powerpc/include/asm}/ppc4xx.h (99%)
diff --git a/arch/powerpc/cpu/ppc4xx/40x_spd_sdram.c b/arch/powerpc/cpu/ppc4xx/40x_spd_sdram.c index f65cd88..a31b17e 100644 --- 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)
diff --git a/arch/powerpc/cpu/ppc4xx/44x_spd_ddr.c b/arch/powerpc/cpu/ppc4xx/44x_spd_ddr.c index 005315b..ec7291f 100644 --- 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" diff --git a/arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c b/arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c index ff5ef5f..3923fee 100644 --- 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> diff --git a/arch/powerpc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c b/arch/powerpc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c index 2cfc37f..e90c93e 100644 --- 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>
diff --git a/arch/powerpc/cpu/ppc4xx/4xx_pcie.c b/arch/powerpc/cpu/ppc4xx/4xx_pcie.c index 10b58b7..b76890e 100644 --- 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> diff --git a/arch/powerpc/cpu/ppc4xx/4xx_uart.c b/arch/powerpc/cpu/ppc4xx/4xx_uart.c index e6ab570..9a11f3b 100644 --- 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> diff --git a/arch/powerpc/cpu/ppc4xx/cache.S b/arch/powerpc/cpu/ppc4xx/cache.S index 269716f..757d7da 100644 --- 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> diff --git a/arch/powerpc/cpu/ppc4xx/cmd_ecctest.c b/arch/powerpc/cpu/ppc4xx/cmd_ecctest.c index b4eac40..fd81b70 100644 --- 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> diff --git a/arch/powerpc/cpu/ppc4xx/cpu.c b/arch/powerpc/cpu/ppc4xx/cpu.c index 851065c..39b8e2f 100644 --- 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; diff --git a/arch/powerpc/cpu/ppc4xx/cpu_init.c b/arch/powerpc/cpu/ppc4xx/cpu_init.c index b31bd0b..7a7954d 100644 --- 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; diff --git a/arch/powerpc/cpu/ppc4xx/dcr.S b/arch/powerpc/cpu/ppc4xx/dcr.S index 93465a3..e668e05 100644 --- 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 */
diff --git a/arch/powerpc/cpu/ppc4xx/denali_data_eye.c b/arch/powerpc/cpu/ppc4xx/denali_data_eye.c index 03b8d3c..9bba0ca 100644 --- 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) /*-----------------------------------------------------------------------------+ diff --git a/arch/powerpc/cpu/ppc4xx/denali_spd_ddr2.c b/arch/powerpc/cpu/ppc4xx/denali_spd_ddr2.c index 080ea0a..c35b113 100644 --- 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> diff --git a/arch/powerpc/cpu/ppc4xx/ecc.c b/arch/powerpc/cpu/ppc4xx/ecc.c index 49f28d9..7fe5dbb 100644 --- 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> diff --git a/arch/powerpc/cpu/ppc4xx/fdt.c b/arch/powerpc/cpu/ppc4xx/fdt.c index 15a184b..90c7e19 100644 --- 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> diff --git a/arch/powerpc/cpu/ppc4xx/interrupts.c b/arch/powerpc/cpu/ppc4xx/interrupts.c index c89bf37..c2d4973 100644 --- 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>
diff --git a/arch/powerpc/cpu/ppc4xx/kgdb.S b/arch/powerpc/cpu/ppc4xx/kgdb.S index 4227a4c..417ba62 100644 --- 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 */ diff --git a/arch/powerpc/cpu/ppc4xx/miiphy.c b/arch/powerpc/cpu/ppc4xx/miiphy.c index 4fec126..3b28122 100644 --- 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) diff --git a/arch/powerpc/cpu/ppc4xx/reginfo.c b/arch/powerpc/cpu/ppc4xx/reginfo.c index a975667..88f8429 100644 --- 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 */ diff --git a/arch/powerpc/cpu/ppc4xx/sdram.c b/arch/powerpc/cpu/ppc4xx/sdram.c index 30c6e0e..b827daf 100644 --- 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" diff --git a/arch/powerpc/cpu/ppc4xx/speed.c b/arch/powerpc/cpu/ppc4xx/speed.c index 906face..4d7eb29 100644 --- 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; diff --git a/arch/powerpc/cpu/ppc4xx/start.S b/arch/powerpc/cpu/ppc4xx/start.S index 4bad32f..fcef0c2 100644 --- 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>
diff --git a/arch/powerpc/cpu/ppc4xx/tlb.c b/arch/powerpc/cpu/ppc4xx/tlb.c index 24a9a9c..684da92 100644 --- 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> diff --git a/arch/powerpc/cpu/ppc4xx/uic.c b/arch/powerpc/cpu/ppc4xx/uic.c index 8b1b259..324f0e9 100644 --- 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>
diff --git a/arch/powerpc/cpu/ppc4xx/xilinx_irq.c b/arch/powerpc/cpu/ppc4xx/xilinx_irq.c index 7108777..eaa3de2 100644 --- 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> diff --git a/arch/powerpc/include/asm/4xx_pcie.h b/arch/powerpc/include/asm/4xx_pcie.h index a0e88de..90e0bd9 100644 --- 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 diff --git a/include/ppc405.h b/arch/powerpc/include/asm/ppc405.h similarity index 100% rename from include/ppc405.h rename to arch/powerpc/include/asm/ppc405.h diff --git a/include/ppc440.h b/arch/powerpc/include/asm/ppc440.h similarity index 100% rename from include/ppc440.h rename to arch/powerpc/include/asm/ppc440.h diff --git a/include/ppc4xx_enet.h b/arch/powerpc/include/asm/ppc4xx-emac.h similarity index 99% rename from include/ppc4xx_enet.h rename to arch/powerpc/include/asm/ppc4xx-emac.h index 3095aed..2b51453 100644 --- a/include/ppc4xx_enet.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"
/*-----------------------------------------------------------------------------+ diff --git a/include/4xx_i2c.h b/arch/powerpc/include/asm/ppc4xx-i2c.h similarity index 100% rename from include/4xx_i2c.h rename to arch/powerpc/include/asm/ppc4xx-i2c.h diff --git a/include/405_mal.h b/arch/powerpc/include/asm/ppc4xx-mal.h similarity index 100% rename from include/405_mal.h rename to arch/powerpc/include/asm/ppc4xx-mal.h diff --git a/include/ppc4xx.h b/arch/powerpc/include/asm/ppc4xx.h similarity index 99% rename from include/ppc4xx.h rename to arch/powerpc/include/asm/ppc4xx.h index ee30a4c..ca04bb4 100644 --- a/include/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> diff --git a/board/amcc/acadia/pll.c b/board/amcc/acadia/pll.c index b63813c..452961d 100644 --- 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!!! */
diff --git a/board/amcc/bamboo/bamboo.c b/board/amcc/bamboo/bamboo.c index c90f86b..99497b2 100644 --- 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); diff --git a/board/amcc/bamboo/flash.c b/board/amcc/bamboo/flash.c index 7bf877d..406342f 100644 --- 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 diff --git a/board/amcc/bubinga/flash.c b/board/amcc/bubinga/flash.c index baf89d5..4850fe1 100644 --- 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 */ diff --git a/board/amcc/canyonlands/canyonlands.c b/board/amcc/canyonlands/canyonlands.c index 158f7bb..ccc44f4 100644 --- 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> diff --git a/board/amcc/common/flash.c b/board/amcc/common/flash.c index 9aaf256..8f23375 100644 --- 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 */ diff --git a/board/amcc/ebony/flash.c b/board/amcc/ebony/flash.c index 8fe3ba1..94eeee2 100644 --- 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 diff --git a/board/amcc/katmai/katmai.c b/board/amcc/katmai/katmai.c index 0bbc75e..15cf703 100644 --- 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> diff --git a/board/amcc/kilauea/kilauea.c b/board/amcc/kilauea/kilauea.c index 646f431..bd6550c 100644 --- 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> diff --git a/board/amcc/luan/flash.c b/board/amcc/luan/flash.c index 2d3b154..8088509 100644 --- 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 diff --git a/board/amcc/luan/luan.c b/board/amcc/luan/luan.c index c09d730..b2595a8 100644 --- 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> diff --git a/board/amcc/makalu/makalu.c b/board/amcc/makalu/makalu.c index 4afe091..3e3fccd 100644 --- 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> diff --git a/board/amcc/ocotea/flash.c b/board/amcc/ocotea/flash.c index a83f93a..fbc552b 100644 --- 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 diff --git a/board/amcc/ocotea/ocotea.c b/board/amcc/ocotea/ocotea.c index 7bffa3c..bbb5331 100644 --- 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;
diff --git a/board/amcc/redwood/redwood.c b/board/amcc/redwood/redwood.c index 32fb8c5..bb7565e 100644 --- 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> diff --git a/board/amcc/sequoia/sdram.c b/board/amcc/sequoia/sdram.c index cabeceb..5c01def 100644 --- 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 diff --git a/board/amcc/sequoia/sequoia.c b/board/amcc/sequoia/sequoia.c index 6756a27..1a6dfc1 100644 --- 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> diff --git a/board/amcc/taihu/flash.c b/board/amcc/taihu/flash.c index 497fdb9..e9fbbb1 100644 --- 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 */ diff --git a/board/amcc/taishan/taishan.c b/board/amcc/taishan/taishan.c index cac7a78..2957a77 100644 --- 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 diff --git a/board/amcc/walnut/flash.c b/board/amcc/walnut/flash.c index 3dc6aab..f72e278 100644 --- 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 diff --git a/board/amcc/yosemite/yosemite.c b/board/amcc/yosemite/yosemite.c index 98c1f3b..aaeab6f 100644 --- 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> diff --git a/board/amcc/yucca/flash.c b/board/amcc/yucca/flash.c index 5fab7bb..20b6af9 100644 --- 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 diff --git a/board/amcc/yucca/yucca.c b/board/amcc/yucca/yucca.c index 0d23929..b128e46 100644 --- 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> diff --git a/board/amirix/ap1000/init.S b/board/amirix/ap1000/init.S index 65f13e1..eac7cd3 100644 --- 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> diff --git a/board/amirix/ap1000/pci.c b/board/amirix/ap1000/pci.c index 5fbcd37..d021164 100644 --- 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>
diff --git a/board/cray/L1/L1.c b/board/cray/L1/L1.c index 33f2089..0f5f02c 100644 --- 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> diff --git a/board/cray/L1/flash.c b/board/cray/L1/flash.c index 36d186f..a3d893e 100644 --- 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... */ diff --git a/board/cray/L1/init.S b/board/cray/L1/init.S index e8dbb93..1662141 100644 --- 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 */
diff --git a/board/csb272/csb272.c b/board/csb272/csb272.c index 1ed3e1b..e248aa7 100644 --- 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);
diff --git a/board/csb272/init.S b/board/csb272/init.S index a6b0d40..82c6fdb 100644 --- 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 */
diff --git a/board/csb472/csb472.c b/board/csb472/csb472.c index c138b0d..25709f2 100644 --- 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);
diff --git a/board/csb472/init.S b/board/csb472/init.S index b31bd04..e00b5f5 100644 --- 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 */
diff --git a/board/dave/PPChameleonEVB/flash.c b/board/dave/PPChameleonEVB/flash.c index 237c807..2e1a9ab 100644 --- 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>
/* diff --git a/board/dave/common/pci.c b/board/dave/common/pci.c index ddfbea9..3036799 100644 --- 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>
diff --git a/board/eric/flash.c b/board/eric/flash.c index fded412..7459873 100644 --- 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 */ diff --git a/board/eric/init.S b/board/eric/init.S index c18663a..1902241 100644 --- 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 */
diff --git a/board/esd/adciop/flash.c b/board/esd/adciop/flash.c index dd578c8..9559efb 100644 --- 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>
/* diff --git a/board/esd/ar405/flash.c b/board/esd/ar405/flash.c index a53122b..895a836 100644 --- 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>
/* diff --git a/board/esd/ash405/flash.c b/board/esd/ash405/flash.c index a53122b..895a836 100644 --- 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>
/* diff --git a/board/esd/canbt/flash.c b/board/esd/canbt/flash.c index 224dde4..b210281 100644 --- 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>
/* diff --git a/board/esd/cms700/flash.c b/board/esd/cms700/flash.c index a53122b..895a836 100644 --- 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>
/* diff --git a/board/esd/common/flash.c b/board/esd/common/flash.c index 38a58fb..b9c7885 100644 --- 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>
diff --git a/board/esd/common/pci.c b/board/esd/common/pci.c index 83f8103..11e55c5 100644 --- 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>
diff --git a/board/esd/cpci2dp/flash.c b/board/esd/cpci2dp/flash.c index 224dde4..b210281 100644 --- 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>
/* diff --git a/board/esd/cpci405/flash.c b/board/esd/cpci405/flash.c index 4fcf174..4b12e92 100644 --- 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>
/* diff --git a/board/esd/cpciiser4/flash.c b/board/esd/cpciiser4/flash.c index 224dde4..b210281 100644 --- 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>
/* diff --git a/board/esd/dasa_sim/flash.c b/board/esd/dasa_sim/flash.c index 9c71b04..d6a7737 100644 --- 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>
/* diff --git a/board/esd/dp405/flash.c b/board/esd/dp405/flash.c index a53122b..895a836 100644 --- 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>
/* diff --git a/board/esd/du405/du405.c b/board/esd/du405/du405.c index e0faa77..b1362a8 100644 --- 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; diff --git a/board/esd/du405/flash.c b/board/esd/du405/flash.c index c62c6a9..c30886e 100644 --- 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>
/* diff --git a/board/esd/du440/du440.c b/board/esd/du440/du440.c index ad255f9..fccfaee 100644 --- 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; diff --git a/board/esd/hh405/flash.c b/board/esd/hh405/flash.c index a53122b..895a836 100644 --- 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>
/* diff --git a/board/esd/hub405/flash.c b/board/esd/hub405/flash.c index a53122b..895a836 100644 --- 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>
/* diff --git a/board/esd/ocrtc/flash.c b/board/esd/ocrtc/flash.c index eda7c57..c83e594 100644 --- 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>
/* diff --git a/board/esd/pci405/flash.c b/board/esd/pci405/flash.c index 67a7bb5..6ca6e4b 100644 --- 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>
/* diff --git a/board/esd/pci405/writeibm.S b/board/esd/pci405/writeibm.S index 4e319c1..5925bc6 100644 --- 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> diff --git a/board/esd/plu405/flash.c b/board/esd/plu405/flash.c index a53122b..895a836 100644 --- 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>
/* diff --git a/board/esd/pmc440/pmc440.c b/board/esd/pmc440/pmc440.c index bd43a9a..c907b85 100644 --- 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> diff --git a/board/esd/pmc440/sdram.c b/board/esd/pmc440/sdram.c index c3528bc..34ff402 100644 --- 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); diff --git a/board/esd/tasreg/flash.c b/board/esd/tasreg/flash.c index ce905e9..fe120aa 100644 --- 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>
/* diff --git a/board/esd/voh405/flash.c b/board/esd/voh405/flash.c index a53122b..895a836 100644 --- 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>
/* diff --git a/board/esd/vom405/flash.c b/board/esd/vom405/flash.c index a53122b..895a836 100644 --- 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>
/* diff --git a/board/esd/wuh405/flash.c b/board/esd/wuh405/flash.c index a53122b..895a836 100644 --- 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>
/* diff --git a/board/gdsys/gdppc440etx/gdppc440etx.c b/board/gdsys/gdppc440etx/gdppc440etx.c index ecbc3c3..328eb95 100644 --- 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> diff --git a/board/gdsys/intip/intip.c b/board/gdsys/intip/intip.c index 23a10c4..8d83198 100644 --- 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> diff --git a/board/jse/flash.c b/board/jse/flash.c index 92acdb1..5735f19 100644 --- 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 diff --git a/board/jse/init.S b/board/jse/init.S index 92f43f4..bccc7e0 100644 --- 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> diff --git a/board/jse/jse.c b/board/jse/jse.c index fb39c84..f5c52c9 100644 --- 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" diff --git a/board/jse/sdram.c b/board/jse/sdram.c index 02eb6f2..8ce8798 100644 --- a/board/jse/sdram.c +++ b/board/jse/sdram.c @@ -19,7 +19,7 @@ */
#include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h>
# define SDRAM_LEN 0x08000000 diff --git a/board/korat/korat.c b/board/korat/korat.c index e5ec694..cdcd8c9 100644 --- a/board/korat/korat.c +++ b/board/korat/korat.c @@ -29,7 +29,7 @@ #include <fdt_support.h> #include <i2c.h> #include <libfdt.h> -#include <ppc440.h> +#include <asm/ppc440.h> #include <asm/bitops.h> #include <asm/gpio.h> #include <asm/io.h> diff --git a/board/lwmon5/lwmon5.c b/board/lwmon5/lwmon5.c index ec113e7..aec0263 100644 --- a/board/lwmon5/lwmon5.c +++ b/board/lwmon5/lwmon5.c @@ -20,7 +20,7 @@
#include <common.h> #include <command.h> -#include <ppc440.h> +#include <asm/ppc440.h> #include <asm/processor.h> #include <asm/gpio.h> #include <asm/io.h> diff --git a/board/lwmon5/sdram.c b/board/lwmon5/sdram.c index a482387..f90efeb 100644 --- a/board/lwmon5/sdram.c +++ b/board/lwmon5/sdram.c @@ -35,7 +35,7 @@ #include <asm/mmu.h> #include <asm/io.h> #include <asm/cache.h> -#include <ppc440.h> +#include <asm/ppc440.h> #include <watchdog.h>
/* diff --git a/board/ml2/init.S b/board/ml2/init.S index 9064d3b..91d053c 100644 --- a/board/ml2/init.S +++ b/board/ml2/init.S @@ -16,7 +16,7 @@ * */
-#include <ppc4xx.h> +#include <asm/ppc4xx.h>
#include <ppc_asm.tmpl> #include <ppc_defs.h> diff --git a/board/mosaixtech/icon/icon.c b/board/mosaixtech/icon/icon.c index ecea1ee..70b03dc 100644 --- a/board/mosaixtech/icon/icon.c +++ b/board/mosaixtech/icon/icon.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> diff --git a/board/mpl/common/flash.c b/board/mpl/common/flash.c index 682f0e7..61f031a 100644 --- a/board/mpl/common/flash.c +++ b/board/mpl/common/flash.c @@ -38,7 +38,7 @@ #include <common.h>
#if !defined(CONFIG_PATI) -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h> #include "common_util.h" #if defined(CONFIG_MIP405) diff --git a/board/mpl/common/memtst.c b/board/mpl/common/memtst.c index 68973f9..9c08065 100644 --- a/board/mpl/common/memtst.c +++ b/board/mpl/common/memtst.c @@ -48,7 +48,7 @@ int testdram (void)
#include <common.h> #include <asm/processor.h> -#include <4xx_i2c.h> +#include <asm/ppc4xx-i2c.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/mpl/mip405/init.S b/board/mpl/mip405/init.S index f3d94c3..67988ba 100644 --- a/board/mpl/mip405/init.S +++ b/board/mpl/mip405/init.S @@ -39,7 +39,7 @@ * Bank 6 - not used * Bank 7 - PLD Register *-----------------------------------------------------------------------------*/ -#include <ppc4xx.h> +#include <asm/ppc4xx.h>
#define _LINUX_CONFIG_H 1 /* avoid reading Linux autoconf.h file */
diff --git a/board/mpl/mip405/mip405.c b/board/mpl/mip405/mip405.c index 7400ca6..3db06e7 100644 --- a/board/mpl/mip405/mip405.c +++ b/board/mpl/mip405/mip405.c @@ -65,7 +65,7 @@ #include <common.h> #include "mip405.h" #include <asm/processor.h> -#include <4xx_i2c.h> +#include <asm/ppc4xx-i2c.h> #include <miiphy.h> #include "../common/common_util.h" #include <stdio_dev.h> diff --git a/board/mpl/pip405/init.S b/board/mpl/pip405/init.S index 18e8b09..e82be89 100644 --- a/board/mpl/pip405/init.S +++ b/board/mpl/pip405/init.S @@ -39,7 +39,7 @@ * Bank 6 - used to switch on the 12V for the Multipurpose socket * Bank 7 - Config Register *-----------------------------------------------------------------------------*/ -#include <ppc4xx.h> +#include <asm/ppc4xx.h>
#define _LINUX_CONFIG_H 1 /* avoid reading Linux autoconf.h file */
diff --git a/board/netstal/common/fixed_sdram.c b/board/netstal/common/fixed_sdram.c index 2f21fbb..51b34b2 100644 --- a/board/netstal/common/fixed_sdram.c +++ b/board/netstal/common/fixed_sdram.c @@ -19,7 +19,7 @@ */
#include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h> #include "nm.h"
diff --git a/board/netstal/hcu4/hcu4.c b/board/netstal/hcu4/hcu4.c index 6fd6138..aaf3616 100644 --- a/board/netstal/hcu4/hcu4.c +++ b/board/netstal/hcu4/hcu4.c @@ -19,7 +19,7 @@ */
#include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h> #include <asm/io.h> #include <asm/u-boot.h> diff --git a/board/netstal/hcu5/hcu5.c b/board/netstal/hcu5/hcu5.c index 5eb8efc..b15f99e 100644 --- a/board/netstal/hcu5/hcu5.c +++ b/board/netstal/hcu5/hcu5.c @@ -20,7 +20,7 @@
#include <common.h> #include <asm/processor.h> -#include <ppc440.h> +#include <asm/ppc440.h> #include <asm/io.h> #include <asm/4xx_pci.h>
diff --git a/board/netstal/hcu5/sdram.c b/board/netstal/hcu5/sdram.c index 0546cd7..e5ac46b 100644 --- a/board/netstal/hcu5/sdram.c +++ b/board/netstal/hcu5/sdram.c @@ -35,7 +35,7 @@ #include <asm/io.h> #include <asm/mmu.h> #include <asm/cache.h> -#include <ppc440.h> +#include <asm/ppc440.h>
void hcu_led_set(u32 value); void dcbz_area(u32 start_address, u32 num_bytes); diff --git a/board/netstal/mcu25/mcu25.c b/board/netstal/mcu25/mcu25.c index ed28e20..36fb388 100644 --- a/board/netstal/mcu25/mcu25.c +++ b/board/netstal/mcu25/mcu25.c @@ -19,7 +19,7 @@ */
#include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h> #include <asm/io.h> #include <asm/u-boot.h> diff --git a/board/pcs440ep/pcs440ep.c b/board/pcs440ep/pcs440ep.c index a61e945..70d8fe2 100644 --- a/board/pcs440ep/pcs440ep.c +++ b/board/pcs440ep/pcs440ep.c @@ -22,7 +22,7 @@ */
#include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <malloc.h> #include <command.h> #include <crc.h> diff --git a/board/prodrive/alpr/alpr.c b/board/prodrive/alpr/alpr.c index 060e7eb..1784982 100644 --- a/board/prodrive/alpr/alpr.c +++ b/board/prodrive/alpr/alpr.c @@ -26,7 +26,7 @@ #include <libfdt.h> #include <fdt_support.h> #include <spd_sdram.h> -#include <ppc4xx_enet.h> +#include <asm/ppc4xx-emac.h> #include <miiphy.h> #include <asm/processor.h> #include <asm/4xx_pci.h> diff --git a/board/prodrive/alpr/fpga.c b/board/prodrive/alpr/fpga.c index f3bc1fa..93f2449 100644 --- a/board/prodrive/alpr/fpga.c +++ b/board/prodrive/alpr/fpga.c @@ -31,7 +31,7 @@ #include <ACEX1K.h> #include <command.h> #include <asm/processor.h> -#include <ppc440.h> +#include <asm/ppc440.h> #include "fpga.h"
DECLARE_GLOBAL_DATA_PTR; diff --git a/board/sandburst/common/flash.c b/board/sandburst/common/flash.c index dd712e3..c65cb96 100644 --- a/board/sandburst/common/flash.c +++ b/board/sandburst/common/flash.c @@ -29,7 +29,7 @@ * Sandburst Corporation */ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h>
diff --git a/board/sandburst/common/ppc440gx_i2c.c b/board/sandburst/common/ppc440gx_i2c.c index 68acdd8..85b63fc 100644 --- a/board/sandburst/common/ppc440gx_i2c.c +++ b/board/sandburst/common/ppc440gx_i2c.c @@ -26,8 +26,8 @@ * Sandburst Corporation. */ #include <common.h> -#include <ppc4xx.h> -#include <4xx_i2c.h> +#include <asm/ppc4xx.h> +#include <asm/ppc4xx-i2c.h> #include <i2c.h> #include <command.h> #include "ppc440gx_i2c.h" diff --git a/board/sandburst/common/ppc440gx_i2c.h b/board/sandburst/common/ppc440gx_i2c.h index 0676c0e..7496db4 100644 --- a/board/sandburst/common/ppc440gx_i2c.h +++ b/board/sandburst/common/ppc440gx_i2c.h @@ -26,8 +26,8 @@ * Sandburst Corporation */ #include <common.h> -#include <ppc4xx.h> -#include <4xx_i2c.h> +#include <asm/ppc4xx.h> +#include <asm/ppc4xx-i2c.h> #include <i2c.h>
#ifdef CONFIG_HARD_I2C diff --git a/board/sc3/init.S b/board/sc3/init.S index 6052c66..d374db4 100644 --- a/board/sc3/init.S +++ b/board/sc3/init.S @@ -27,7 +27,7 @@ *------------------------------------------------------------------------------- */
#include <config.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h>
#define _LINUX_CONFIG_H 1 /* avoid reading Linux autoconf.h file */
diff --git a/board/snmc/qs850/flash.c b/board/snmc/qs850/flash.c index a26a679..b592285 100644 --- a/board/snmc/qs850/flash.c +++ b/board/snmc/qs850/flash.c @@ -25,7 +25,7 @@ */
#include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/u-boot.h> #include <asm/processor.h>
diff --git a/board/snmc/qs860t/flash.c b/board/snmc/qs860t/flash.c index 48c2258..e725115 100644 --- a/board/snmc/qs860t/flash.c +++ b/board/snmc/qs860t/flash.c @@ -25,7 +25,7 @@ */
#include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/u-boot.h> #include <asm/processor.h>
diff --git a/board/t3corp/t3corp.c b/board/t3corp/t3corp.c index ddf5897..26568e2 100644 --- a/board/t3corp/t3corp.c +++ b/board/t3corp/t3corp.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> diff --git a/board/tb0229/flash.c b/board/tb0229/flash.c index 1554642..75d7769 100644 --- a/board/tb0229/flash.c +++ b/board/tb0229/flash.c @@ -24,7 +24,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 */ diff --git a/board/w7o/flash.c b/board/w7o/flash.c index 6774949..184661b 100644 --- a/board/w7o/flash.c +++ b/board/w7o/flash.c @@ -24,7 +24,7 @@ */
#include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h>
#include <watchdog.h> diff --git a/board/w7o/init.S b/board/w7o/init.S index 5477f98..b3aadca 100644 --- a/board/w7o/init.S +++ b/board/w7o/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 */
diff --git a/board/w7o/post1.S b/board/w7o/post1.S index a6f46c8..0aaca02 100644 --- a/board/w7o/post1.S +++ b/board/w7o/post1.S @@ -27,7 +27,7 @@ * Routine to exercise memory for the bringing up of our boards. */ #include <config.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h>
#define _LINUX_CONFIG_H 1 /* avoid reading Linux autoconf.h file */
diff --git a/drivers/i2c/ppc4xx_i2c.c b/drivers/i2c/ppc4xx_i2c.c index e9548f1..c1cbe55 100644 --- a/drivers/i2c/ppc4xx_i2c.c +++ b/drivers/i2c/ppc4xx_i2c.c @@ -27,8 +27,8 @@ */
#include <common.h> -#include <ppc4xx.h> -#include <4xx_i2c.h> +#include <asm/ppc4xx.h> +#include <asm/ppc4xx-i2c.h> #include <i2c.h> #include <asm/io.h>
diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c index 0dd6789..3ca13a9 100644 --- a/drivers/mtd/nand/ndfc.c +++ b/drivers/mtd/nand/ndfc.c @@ -35,7 +35,7 @@ #include <linux/mtd/nand_ecc.h> #include <asm/processor.h> #include <asm/io.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h>
/* * We need to store the info, which chip-select (CS) is used for the diff --git a/drivers/net/4xx_enet.c b/drivers/net/4xx_enet.c index d9487ad..bc9211e 100644 --- a/drivers/net/4xx_enet.c +++ b/drivers/net/4xx_enet.c @@ -87,9 +87,9 @@ #include <asm/cache.h> #include <asm/mmu.h> #include <commproc.h> -#include <ppc4xx.h> -#include <ppc4xx_enet.h> -#include <405_mal.h> +#include <asm/ppc4xx.h> +#include <asm/ppc4xx-emac.h> +#include <asm/ppc4xx-mal.h> #include <miiphy.h> #include <malloc.h>
diff --git a/include/common.h b/include/common.h index 7e647e6..e584af6 100644 --- a/include/common.h +++ b/include/common.h @@ -96,7 +96,7 @@ typedef volatile unsigned char vu_char; #include <asm/immap_83xx.h> #endif #ifdef CONFIG_4xx -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #endif #ifdef CONFIG_HYMOD #include <board/hymod/hymod.h> diff --git a/nand_spl/board/amcc/bamboo/sdram.c b/nand_spl/board/amcc/bamboo/sdram.c index 9fec5ca..504a02b 100644 --- a/nand_spl/board/amcc/bamboo/sdram.c +++ b/nand_spl/board/amcc/bamboo/sdram.c @@ -22,7 +22,7 @@ */
#include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h> #include <asm/io.h>
diff --git a/nand_spl/board/amcc/canyonlands/ddr2_fixed.c b/nand_spl/board/amcc/canyonlands/ddr2_fixed.c index ed1888c..9440c1e 100644 --- a/nand_spl/board/amcc/canyonlands/ddr2_fixed.c +++ b/nand_spl/board/amcc/canyonlands/ddr2_fixed.c @@ -22,7 +22,7 @@ */
#include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/io.h> #include <asm/processor.h>
diff --git a/post/cpu/ppc4xx/denali_ecc.c b/post/cpu/ppc4xx/denali_ecc.c index 6ab1593..50ae7fb 100644 --- a/post/cpu/ppc4xx/denali_ecc.c +++ b/post/cpu/ppc4xx/denali_ecc.c @@ -45,7 +45,7 @@ #include <asm/processor.h> #include <asm/mmu.h> #include <asm/io.h> -#include <ppc440.h> +#include <asm/ppc440.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/post/cpu/ppc4xx/ether.c b/post/cpu/ppc4xx/ether.c index a58db04..7f44f38 100644 --- a/post/cpu/ppc4xx/ether.c +++ b/post/cpu/ppc4xx/ether.c @@ -44,8 +44,8 @@ #include <asm/cache.h> #include <asm/io.h> #include <asm/processor.h> -#include <405_mal.h> -#include <ppc4xx_enet.h> +#include <asm/ppc4xx-mal.h> +#include <asm/ppc4xx-emac.h> #include <malloc.h>
DECLARE_GLOBAL_DATA_PTR; diff --git a/post/cpu/ppc4xx/fpu.c b/post/cpu/ppc4xx/fpu.c index e9b96dd..9f49690 100644 --- a/post/cpu/ppc4xx/fpu.c +++ b/post/cpu/ppc4xx/fpu.c @@ -29,7 +29,7 @@ defined(CONFIG_440EPX)
#include <asm/processor.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h>
int fpu_status(void)
participants (1)
-
Stefan Roese