ppc4xx: Move ppc4xx headers to powerpc include directory
Subsystems (6)
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 <[email protected]>
---
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%)arch/powerpc/cpu/ppc4xx/40x_spd_sdram.c +1 -1
@@ -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 )
arch/powerpc/cpu/ppc4xx/44x_spd_ddr.c +1 -1
@@ -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"
arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c +1 -1
@@ -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>
arch/powerpc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c +1 -1
@@ -38,7 +38,7 @@#undef DEBUG#include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/io.h> #include <asm/processor.h>
arch/powerpc/cpu/ppc4xx/4xx_pcie.c +1 -1
@@ -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>
arch/powerpc/cpu/ppc4xx/4xx_uart.c +1 -1
@@ -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>
arch/powerpc/cpu/ppc4xx/cache.S +1 -1
@@ -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>
arch/powerpc/cpu/ppc4xx/cmd_ecctest.c +1 -1
@@ -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>
arch/powerpc/cpu/ppc4xx/cpu.c +1 -1
@@ -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 ;
arch/powerpc/cpu/ppc4xx/cpu_init.c +2 -2
@@ -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 ;
arch/powerpc/cpu/ppc4xx/dcr.S +1 -1
@@ -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 */
arch/powerpc/cpu/ppc4xx/denali_data_eye.c +1 -1
@@ -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 )/*-----------------------------------------------------------------------------+
arch/powerpc/cpu/ppc4xx/denali_spd_ddr2.c +1 -1
@@ -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>
arch/powerpc/cpu/ppc4xx/ecc.c +1 -1
@@ -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>
arch/powerpc/cpu/ppc4xx/fdt.c +1 -1
@@ -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>
arch/powerpc/cpu/ppc4xx/interrupts.c +1 -1
@@ -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>
arch/powerpc/cpu/ppc4xx/kgdb.S +1 -1
@@ -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 */
arch/powerpc/cpu/ppc4xx/miiphy.c +2 -2
@@ -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 )
arch/powerpc/cpu/ppc4xx/reginfo.c +1 -1
@@ -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 */
arch/powerpc/cpu/ppc4xx/sdram.c +1 -1
@@ -28,7 +28,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h> #include "sdram.h" #include "ecc.h"
arch/powerpc/cpu/ppc4xx/speed.c +1 -1
@@ -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 ;
arch/powerpc/cpu/ppc4xx/start.S +1 -1
@@ -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>
arch/powerpc/cpu/ppc4xx/tlb.c +1 -1
@@ -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>
arch/powerpc/cpu/ppc4xx/uic.c +1 -1
@@ -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>
arch/powerpc/cpu/ppc4xx/xilinx_irq.c +1 -1
@@ -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>
arch/powerpc/include/asm/4xx_pcie.h +1 -1
@@ -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
arch/powerpc/include/asm/ppc405.h renamed from include/ppc405.h +0 -0
arch/powerpc/include/asm/ppc440.h renamed from include/ppc440.h +0 -0
arch/powerpc/include/asm/ppc4xx-emac.h renamed from include/ppc4xx_enet.h +1 -1
@@ -44,7 +44,7 @@#define _PPC4XX_ENET_H_#include <net.h> -#include "405_mal.h" +#include "asm/ppc4xx-mal.h" /*-----------------------------------------------------------------------------+
arch/powerpc/include/asm/ppc4xx-i2c.h renamed from include/4xx_i2c.h +0 -0
arch/powerpc/include/asm/ppc4xx-mal.h renamed from include/405_mal.h +0 -0
arch/powerpc/include/asm/ppc4xx.h renamed from include/ppc4xx.h +2 -2
@@ -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>
board/amcc/acadia/pll.c +1 -1
@@ -23,7 +23,7 @@#include <common.h> #include <asm/processor.h> -#include <ppc405.h> +#include <asm/ppc405.h> /* test-only: move into cpu directory!!! */
board/amcc/bamboo/bamboo.c +1 -1
@@ -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 );
board/amcc/bamboo/flash.c +2 -2
@@ -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
board/amcc/bubinga/flash.c +1 -1
@@ -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 */
board/amcc/canyonlands/canyonlands.c +1 -1
@@ -19,7 +19,7 @@*/ #include <common.h> -#include <ppc440.h> +#include <asm/ppc440.h> #include <libfdt.h> #include <fdt_support.h> #include <i2c.h>
board/amcc/common/flash.c +1 -1
@@ -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 */
board/amcc/ebony/flash.c +1 -1
@@ -32,7 +32,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h> #undef DEBUG
board/amcc/katmai/katmai.c +1 -1
@@ -23,7 +23,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <i2c.h> #include <libfdt.h> #include <fdt_support.h>
board/amcc/kilauea/kilauea.c +2 -2
@@ -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>
board/amcc/luan/flash.c +1 -1
@@ -32,7 +32,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h> #undef DEBUG
board/amcc/luan/luan.c +1 -1
@@ -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>
board/amcc/makalu/makalu.c +2 -2
@@ -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>
board/amcc/ocotea/flash.c +1 -1
@@ -32,7 +32,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h> #undef DEBUG
board/amcc/ocotea/ocotea.c +1 -1
@@ -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 ;
board/amcc/redwood/redwood.c +1 -1
@@ -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>
board/amcc/sequoia/sdram.c +1 -1
@@ -31,7 +31,7 @@#include <common.h> #include <asm/processor.h> #include <asm/io.h> -#include <ppc440.h> +#include <asm/ppc440.h> /*-----------------------------------------------------------------------------+ * Prototypes
board/amcc/sequoia/sequoia.c +1 -1
@@ -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>
board/amcc/taihu/flash.c +1 -1
@@ -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 */
board/amcc/taishan/taishan.c +1 -1
@@ -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
board/amcc/walnut/flash.c +1 -1
@@ -29,7 +29,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h> #undef DEBUG
board/amcc/yosemite/yosemite.c +1 -1
@@ -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>
board/amcc/yucca/flash.c +2 -2
@@ -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
board/amcc/yucca/yucca.c +1 -1
@@ -26,7 +26,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <i2c.h> #include <netdev.h> #include <asm/processor.h>
board/amirix/ap1000/init.S +1 -1
@@ -16,7 +16,7 @@ * */ -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <ppc_asm.tmpl> #include <ppc_defs.h>
board/amirix/ap1000/pci.c +1 -1
@@ -22,7 +22,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h> #include <pci.h>
board/cray/L1/L1.c +1 -1
@@ -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>
board/cray/L1/flash.c +1 -1
@@ -35,7 +35,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h> /* The flash chip we use... */
board/cray/L1/init.S +1 -1
@@ -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 */
board/csb272/csb272.c +1 -1
@@ -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 );
board/csb272/init.S +1 -1
@@ -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 */
board/csb472/csb472.c +1 -1
@@ -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 );
board/csb472/init.S +1 -1
@@ -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 */
board/dave/PPChameleonEVB/flash.c +1 -1
@@ -22,7 +22,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h> /*
board/dave/common/pci.c +1 -1
@@ -22,7 +22,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h> #include <pci.h>
board/eric/flash.c +1 -1
@@ -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 */
board/eric/init.S +1 -1
@@ -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 */
board/esd/adciop/flash.c +1 -1
@@ -22,7 +22,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h> /*
board/esd/ar405/flash.c +1 -1
@@ -22,7 +22,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h> /*
board/esd/ash405/flash.c +1 -1
@@ -22,7 +22,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h> /*
board/esd/canbt/flash.c +1 -1
@@ -22,7 +22,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h> /*
board/esd/cms700/flash.c +1 -1
@@ -22,7 +22,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h> /*
board/esd/common/flash.c +1 -1
@@ -23,7 +23,7 @@#include <common.h> #ifdef __PPC__ -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #endif #include <asm/processor.h>
board/esd/common/pci.c +1 -1
@@ -22,7 +22,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h> #include <pci.h>
board/esd/cpci2dp/flash.c +1 -1
@@ -22,7 +22,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h> /*
board/esd/cpci405/flash.c +1 -1
@@ -22,7 +22,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h> /*
board/esd/cpciiser4/flash.c +1 -1
@@ -22,7 +22,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h> /*
board/esd/dasa_sim/flash.c +1 -1
@@ -22,7 +22,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h> /*
board/esd/dp405/flash.c +1 -1
@@ -22,7 +22,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h> /*
board/esd/du405/du405.c +2 -2
@@ -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 ;
board/esd/du405/flash.c +1 -1
@@ -22,7 +22,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h> /*
board/esd/du440/du440.c +1 -1
@@ -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 ;
board/esd/hh405/flash.c +1 -1
@@ -22,7 +22,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h> /*
board/esd/hub405/flash.c +1 -1
@@ -22,7 +22,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h> /*
board/esd/ocrtc/flash.c +1 -1
@@ -22,7 +22,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h> /*
board/esd/pci405/flash.c +1 -1
@@ -22,7 +22,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h> /*
board/esd/pci405/writeibm.S +1 -1
@@ -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>
board/esd/plu405/flash.c +1 -1
@@ -22,7 +22,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h> /*
board/esd/pmc440/pmc440.c +1 -1
@@ -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>
board/esd/pmc440/sdram.c +1 -1
@@ -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 );
board/esd/tasreg/flash.c +1 -1
@@ -22,7 +22,7 @@*/ #include <common.h> -/*#include <ppc4xx.h>*/ +/*#include <asm/ppc4xx.h>*/ #include <asm/processor.h> /*
board/esd/voh405/flash.c +1 -1
@@ -22,7 +22,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h> /*
board/esd/vom405/flash.c +1 -1
@@ -22,7 +22,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h> /*
board/esd/wuh405/flash.c +1 -1
@@ -22,7 +22,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h> /*
board/gdsys/gdppc440etx/gdppc440etx.c +1 -1
@@ -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>
board/gdsys/intip/intip.c +1 -1
@@ -23,7 +23,7 @@*/ #include <common.h> -#include <ppc440.h> +#include <asm/ppc440.h> #include <libfdt.h> #include <fdt_support.h> #include <i2c.h>
board/jse/flash.c +1 -1
@@ -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
board/jse/init.S +1 -1
@@ -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>
board/jse/jse.c +1 -1
@@ -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"
board/jse/sdram.c +1 -1
@@ -19,7 +19,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h> # define SDRAM_LEN 0x08000000
board/korat/korat.c +1 -1
@@ -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>
board/lwmon5/lwmon5.c +1 -1
@@ -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>
board/lwmon5/sdram.c +1 -1
@@ -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> /*
board/ml2/init.S +1 -1
@@ -16,7 +16,7 @@ * */ -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <ppc_asm.tmpl> #include <ppc_defs.h>
board/mosaixtech/icon/icon.c +1 -1
@@ -23,7 +23,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <i2c.h> #include <libfdt.h> #include <fdt_support.h>
board/mpl/common/flash.c +1 -1
@@ -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 )
board/mpl/common/memtst.c +1 -1
@@ -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 ;
board/mpl/mip405/init.S +1 -1
@@ -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 */
board/mpl/mip405/mip405.c +1 -1
@@ -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>
board/mpl/pip405/init.S +1 -1
@@ -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 */
board/netstal/common/fixed_sdram.c +1 -1
@@ -19,7 +19,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h> #include "nm.h"
board/netstal/hcu4/hcu4.c +1 -1
@@ -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>
board/netstal/hcu5/hcu5.c +1 -1
@@ -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>
board/netstal/hcu5/sdram.c +1 -1
@@ -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);
board/netstal/mcu25/mcu25.c +1 -1
@@ -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>
board/pcs440ep/pcs440ep.c +1 -1
@@ -22,7 +22,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <malloc.h> #include <command.h> #include <crc.h>
board/prodrive/alpr/alpr.c +1 -1
@@ -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>
board/prodrive/alpr/fpga.c +1 -1
@@ -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 ;
board/sandburst/common/flash.c +1 -1
@@ -29,7 +29,7 @@* Sandburst Corporation */ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h>
board/sandburst/common/ppc440gx_i2c.c +2 -2
@@ -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"
board/sandburst/common/ppc440gx_i2c.h +2 -2
@@ -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
board/sc3/init.S +1 -1
@@ -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 */
board/snmc/qs850/flash.c +1 -1
@@ -25,7 +25,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/u-boot.h> #include <asm/processor.h>
board/snmc/qs860t/flash.c +1 -1
@@ -25,7 +25,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/u-boot.h> #include <asm/processor.h>
board/t3corp/t3corp.c +1 -1
@@ -19,7 +19,7 @@*/ #include <common.h> -#include <ppc440.h> +#include <asm/ppc440.h> #include <libfdt.h> #include <fdt_support.h> #include <i2c.h>
board/tb0229/flash.c +1 -1
@@ -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 */
board/w7o/flash.c +1 -1
@@ -24,7 +24,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h> #include <watchdog.h>
board/w7o/init.S +1 -1
@@ -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 */
board/w7o/post1.S +1 -1
@@ -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 */
drivers/i2c/ppc4xx_i2c.c +2 -2
@@ -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>
drivers/mtd/nand/ndfc.c +1 -1
@@ -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
drivers/net/4xx_enet.c +3 -3
@@ -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>
include/common.h +1 -1
@@ -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>
nand_spl/board/amcc/bamboo/sdram.c +1 -1
@@ -22,7 +22,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/processor.h> #include <asm/io.h>
nand_spl/board/amcc/canyonlands/ddr2_fixed.c +1 -1
@@ -22,7 +22,7 @@*/ #include <common.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> #include <asm/io.h> #include <asm/processor.h>
post/cpu/ppc4xx/denali_ecc.c +1 -1
@@ -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 ;
post/cpu/ppc4xx/ether.c +2 -2
@@ -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 ;
post/cpu/ppc4xx/fpu.c +1 -1
@@ -29,7 +29,7 @@ defined(CONFIG_440EPX)#include <asm/processor.h> -#include <ppc4xx.h> +#include <asm/ppc4xx.h> int fpu_status (void )
Signature · 1 line
1.7.2.3