diff options
Diffstat (limited to 'board')
98 files changed, 105 insertions, 105 deletions
| diff --git a/board/amcc/acadia/pll.c b/board/amcc/acadia/pll.c index b63813c7b..452961d34 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 c90f86b8d..99497b2d4 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 7bf877de8..406342fd8 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 baf89d548..4850fe121 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 158f7bb27..ccc44f441 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 9aaf256c2..8f2337517 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 8fe3ba1b8..94eeee2e4 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 0bbc75e7c..15cf70389 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 646f4311e..bd6550cd0 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 2d3b15438..8088509fb 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 c09d73088..b2595a8ec 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 4afe09166..3e3fccdbb 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 a83f93afa..fbc552bf8 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 7bffa3c40..bbb5331ef 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 32fb8c584..bb7565e2e 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 cabeceb97..5c01deff9 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 6756a2723..1a6dfc1dc 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 497fdb963..e9fbbb102 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 cac7a78d6..2957a7748 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 3dc6aabe1..f72e278b4 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 98c1f3b81..aaeab6f5f 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 5fab7bb1d..20b6af9a6 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 0d2392990..b128e46c2 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 65f13e17a..eac7cd3c1 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 5fbcd37ce..d021164f9 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 33f2089c8..0f5f02cb8 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 36d186fb9..a3d893e92 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 e8dbb93e1..166214148 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 1ed3e1b6a..e248aa752 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 a6b0d4045..82c6fdb96 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 c138b0d9e..25709f2a4 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 b31bd0455..e00b5f530 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 237c807b4..2e1a9abc0 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 ddfbea9a0..30367998d 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 fded41271..745987336 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 c18663a75..19022413b 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 dd578c893..9559efb38 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 a53122b21..895a83670 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 a53122b21..895a83670 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 224dde4ee..b210281fc 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 a53122b21..895a83670 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 38a58fb5e..b9c78852c 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 83f810307..11e55c542 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 224dde4ee..b210281fc 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 4fcf174d1..4b12e9207 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 224dde4ee..b210281fc 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 9c71b043c..d6a773797 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 a53122b21..895a83670 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 e0faa77ca..b1362a869 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 c62c6a9b0..c30886e67 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 ad255f91a..fccfaee7b 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 a53122b21..895a83670 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 a53122b21..895a83670 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 eda7c5713..c83e594e4 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 67a7bb5d8..6ca6e4b0b 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 4e319c192..5925bc6ec 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 a53122b21..895a83670 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 bd43a9aef..c907b85ae 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 c3528bca4..34ff40202 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 ce905e94c..fe120aa26 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 a53122b21..895a83670 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 a53122b21..895a83670 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 a53122b21..895a83670 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 ecbc3c3d1..328eb95aa 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 23a10c41f..8d83198f7 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 92acdb102..5735f19b8 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 92f43f4fc..bccc7e099 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 fb39c8416..f5c52c95c 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 02eb6f2c3..8ce8798c8 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 e5ec69470..cdcd8c9a7 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 ec113e7f5..aec026314 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 a48238702..f90efebb8 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 9064d3b66..91d053c96 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 ecea1ee50..70b03dc80 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 682f0e76d..61f031aab 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 68973f9cb..9c0806599 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 f3d94c3fc..67988ba4f 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 7400ca673..3db06e760 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 18e8b09dd..e82be89ca 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 2f21fbb4e..51b34b29f 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 6fd613822..aaf361611 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 5eb8efc52..b15f99e30 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 0546cd726..e5ac46b54 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 ed28e209f..36fb388a0 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 a61e9451a..70d8fe2c3 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 060e7eb23..178498235 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 f3bc1fa7a..93f2449a1 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 dd712e3a3..c65cb9607 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 68acdd8d1..85b63fc55 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 0676c0e40..7496db484 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 6052c6655..d374db414 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 a26a67900..b59228577 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 48c2258b3..e725115b7 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 ddf58970a..26568e23c 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 15546421a..75d7769b6 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 677494977..184661bd0 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 5477f986b..b3aadcace 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 a6f46c874..0aaca02e0 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  */ |