The appropriate include/asm-$ARCH directory should already by symlinked to include/asm so using the whole "asm-$ARCH" path is unnecessary.
This change will also allow us to move the include/asm-$ARCH directories into their appropriate lib/$ARCH/ directories.
Signed-off-by: Peter Tyser ptyser@xes-inc.com --- board/amcc/bamboo/init.S | 2 +- board/amcc/canyonlands/init.S | 2 +- board/amcc/ebony/init.S | 2 +- board/amcc/katmai/init.S | 2 +- board/amcc/luan/init.S | 2 +- board/amcc/ocotea/init.S | 2 +- board/amcc/redwood/init.S | 2 +- board/amcc/redwood/redwood.c | 2 +- board/amcc/sequoia/init.S | 2 +- board/amcc/yucca/init.S | 2 +- board/bf537-stamp/cmd_bf537led.c | 2 +- board/esd/du440/init.S | 2 +- board/esd/pmc440/init.S | 2 +- board/galaxy5200/galaxy5200.c | 2 +- board/gdsys/intip/init.S | 2 +- board/korat/init.S | 2 +- board/lwmon5/init.S | 2 +- board/m501sk/m501sk.h | 4 ++-- board/netstal/hcu4/hcu4.c | 2 +- board/netstal/mcu25/mcu25.c | 2 +- board/phytec/pcm030/pcm030.c | 2 +- board/pleb2/pleb2.c | 2 +- board/prodrive/alpr/fpga.c | 2 +- board/tqc/tqm834x/tqm834x.c | 2 +- board/xilinx/ppc440-generic/init.S | 2 +- cpu/ppc4xx/4xx_pcie.c | 2 +- cpu/ppc4xx/i2c.c | 2 +- include/asm-arm/arch-arm720t/hardware.h | 2 +- include/asm-arm/arch-lpc2292/hardware.h | 2 +- nand_spl/board/freescale/p1_p2_rdb/nand_boot.c | 2 +- nand_spl/nand_boot_fsl_nfc.c | 2 +- 31 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/board/amcc/bamboo/init.S b/board/amcc/bamboo/init.S index a5c9d6d..7439c80 100644 --- a/board/amcc/bamboo/init.S +++ b/board/amcc/bamboo/init.S @@ -25,7 +25,7 @@
#include <ppc_asm.tmpl> #include <config.h> -#include <asm-ppc/mmu.h> +#include <asm/mmu.h>
/************************************************************************** * TLB TABLE diff --git a/board/amcc/canyonlands/init.S b/board/amcc/canyonlands/init.S index 0b66796..993bec3 100644 --- a/board/amcc/canyonlands/init.S +++ b/board/amcc/canyonlands/init.S @@ -23,7 +23,7 @@
#include <ppc_asm.tmpl> #include <config.h> -#include <asm-ppc/mmu.h> +#include <asm/mmu.h>
/************************************************************************** * TLB TABLE diff --git a/board/amcc/ebony/init.S b/board/amcc/ebony/init.S index 811a96a..153fa81 100644 --- a/board/amcc/ebony/init.S +++ b/board/amcc/ebony/init.S @@ -22,7 +22,7 @@
#include <ppc_asm.tmpl> #include <config.h> -#include <asm-ppc/mmu.h> +#include <asm/mmu.h>
/************************************************************************** * TLB TABLE diff --git a/board/amcc/katmai/init.S b/board/amcc/katmai/init.S index 1c74a82..90598f6 100644 --- a/board/amcc/katmai/init.S +++ b/board/amcc/katmai/init.S @@ -25,7 +25,7 @@
#include <ppc_asm.tmpl> #include <config.h> -#include <asm-ppc/mmu.h> +#include <asm/mmu.h>
/************************************************************************** * TLB TABLE diff --git a/board/amcc/luan/init.S b/board/amcc/luan/init.S index fb54dea..513b0fc 100644 --- a/board/amcc/luan/init.S +++ b/board/amcc/luan/init.S @@ -25,7 +25,7 @@
#include <ppc_asm.tmpl> #include <config.h> -#include <asm-ppc/mmu.h> +#include <asm/mmu.h>
/************************************************************************** * TLB TABLE diff --git a/board/amcc/ocotea/init.S b/board/amcc/ocotea/init.S index 8bcfbb1..e7c75df 100644 --- a/board/amcc/ocotea/init.S +++ b/board/amcc/ocotea/init.S @@ -22,7 +22,7 @@
#include <ppc_asm.tmpl> #include <config.h> -#include <asm-ppc/mmu.h> +#include <asm/mmu.h>
/************************************************************************** * TLB TABLE diff --git a/board/amcc/redwood/init.S b/board/amcc/redwood/init.S index 363d793..4da5869 100644 --- a/board/amcc/redwood/init.S +++ b/board/amcc/redwood/init.S @@ -23,7 +23,7 @@
#include <ppc_asm.tmpl> #include <config.h> -#include <asm-ppc/mmu.h> +#include <asm/mmu.h>
/************************************************************************** * TLB TABLE diff --git a/board/amcc/redwood/redwood.c b/board/amcc/redwood/redwood.c index bc8cb0c..32fb8c5 100644 --- a/board/amcc/redwood/redwood.c +++ b/board/amcc/redwood/redwood.c @@ -29,7 +29,7 @@ #include <ppc4xx.h> #include <asm/processor.h> #include <i2c.h> -#include <asm-ppc/io.h> +#include <asm/io.h>
int compare_to_true(char *str); char *remove_l_w_space(char *in_str); diff --git a/board/amcc/sequoia/init.S b/board/amcc/sequoia/init.S index 3c0e400..f090070 100644 --- a/board/amcc/sequoia/init.S +++ b/board/amcc/sequoia/init.S @@ -22,7 +22,7 @@ */
#include <ppc_asm.tmpl> -#include <asm-ppc/mmu.h> +#include <asm/mmu.h> #include <config.h>
/* diff --git a/board/amcc/yucca/init.S b/board/amcc/yucca/init.S index 9308fda..f51035f 100644 --- a/board/amcc/yucca/init.S +++ b/board/amcc/yucca/init.S @@ -25,7 +25,7 @@
#include <ppc_asm.tmpl> #include <config.h> -#include <asm-ppc/mmu.h> +#include <asm/mmu.h>
/************************************************************************** * TLB TABLE diff --git a/board/bf537-stamp/cmd_bf537led.c b/board/bf537-stamp/cmd_bf537led.c index e65c4f8..317f088 100644 --- a/board/bf537-stamp/cmd_bf537led.c +++ b/board/bf537-stamp/cmd_bf537led.c @@ -25,7 +25,7 @@ #include <config.h> #include <command.h> #include <asm/blackfin.h> -#include <asm-blackfin/string.h> +#include <asm/string.h> #ifdef CONFIG_BF537_STAMP_LEDCMD
/* Define the command usage in a reusable way */ diff --git a/board/esd/du440/init.S b/board/esd/du440/init.S index 3cac6b1..afcf9c4 100644 --- a/board/esd/du440/init.S +++ b/board/esd/du440/init.S @@ -22,7 +22,7 @@ */
#include <ppc_asm.tmpl> -#include <asm-ppc/mmu.h> +#include <asm/mmu.h> #include <config.h>
/* diff --git a/board/esd/pmc440/init.S b/board/esd/pmc440/init.S index 6585fed..d51cd0c 100644 --- a/board/esd/pmc440/init.S +++ b/board/esd/pmc440/init.S @@ -20,7 +20,7 @@ */
#include <ppc_asm.tmpl> -#include <asm-ppc/mmu.h> +#include <asm/mmu.h> #include <config.h>
/* diff --git a/board/galaxy5200/galaxy5200.c b/board/galaxy5200/galaxy5200.c index 5aa9d3a..d4a2245 100644 --- a/board/galaxy5200/galaxy5200.c +++ b/board/galaxy5200/galaxy5200.c @@ -33,7 +33,7 @@ #include <common.h> #include <mpc5xxx.h> #include <pci.h> -#include <asm-ppc/io.h> +#include <asm/io.h>
#ifndef CONFIG_SYS_RAMBOOT static void sdram_start(int hi_addr) diff --git a/board/gdsys/intip/init.S b/board/gdsys/intip/init.S index e205c9d..a8e8b6c 100644 --- a/board/gdsys/intip/init.S +++ b/board/gdsys/intip/init.S @@ -27,7 +27,7 @@
#include <ppc_asm.tmpl> #include <config.h> -#include <asm-ppc/mmu.h> +#include <asm/mmu.h>
/************************************************************************** * TLB TABLE diff --git a/board/korat/init.S b/board/korat/init.S index ea43a1f..c725bbb 100644 --- a/board/korat/init.S +++ b/board/korat/init.S @@ -20,7 +20,7 @@ */
#include <ppc_asm.tmpl> -#include <asm-ppc/mmu.h> +#include <asm/mmu.h> #include <config.h>
/************************************************************************** diff --git a/board/lwmon5/init.S b/board/lwmon5/init.S index 718cec6..c714fb7 100644 --- a/board/lwmon5/init.S +++ b/board/lwmon5/init.S @@ -25,7 +25,7 @@
#include <ppc_asm.tmpl> #include <config.h> -#include <asm-ppc/mmu.h> +#include <asm/mmu.h>
/************************************************************************** * TLB TABLE diff --git a/board/m501sk/m501sk.h b/board/m501sk/m501sk.h index 42a6757..838ee1b 100644 --- a/board/m501sk/m501sk.h +++ b/board/m501sk/m501sk.h @@ -21,9 +21,9 @@ #define __M501SK_H
#ifndef __ASSEMBLY__ -#include <asm-arm/arch-at91rm9200/AT91RM9200.h> +#include <asm/arch-at91rm9200/AT91RM9200.h> #else -#include <asm-arm/arch-at91rm9200/AT91RM9200_inc.h> +#include <asm/arch-at91rm9200/AT91RM9200_inc.h> #endif
#define AT91C_PIO_PA22 ((unsigned int) 1 << 22) /* Pin Controlled by PA22 */ diff --git a/board/netstal/hcu4/hcu4.c b/board/netstal/hcu4/hcu4.c index 3f07ff1..1c99405 100644 --- a/board/netstal/hcu4/hcu4.c +++ b/board/netstal/hcu4/hcu4.c @@ -22,7 +22,7 @@ #include <ppc4xx.h> #include <asm/processor.h> #include <asm/io.h> -#include <asm-ppc/u-boot.h> +#include <asm/u-boot.h> #include "../common/nm.h"
DECLARE_GLOBAL_DATA_PTR; diff --git a/board/netstal/mcu25/mcu25.c b/board/netstal/mcu25/mcu25.c index cc2f998..87bc45e 100644 --- a/board/netstal/mcu25/mcu25.c +++ b/board/netstal/mcu25/mcu25.c @@ -22,7 +22,7 @@ #include <ppc4xx.h> #include <asm/processor.h> #include <asm/io.h> -#include <asm-ppc/u-boot.h> +#include <asm/u-boot.h> #include "../common/nm.h"
DECLARE_GLOBAL_DATA_PTR; diff --git a/board/phytec/pcm030/pcm030.c b/board/phytec/pcm030/pcm030.c index 416d307..77ce389 100644 --- a/board/phytec/pcm030/pcm030.c +++ b/board/phytec/pcm030/pcm030.c @@ -30,7 +30,7 @@ #include <common.h> #include <mpc5xxx.h> #include <pci.h> -#include <asm-ppc/io.h> +#include <asm/io.h>
#include "mt46v32m16-75.h"
diff --git a/board/pleb2/pleb2.c b/board/pleb2/pleb2.c index dc6fac4..97c37ea 100644 --- a/board/pleb2/pleb2.c +++ b/board/pleb2/pleb2.c @@ -26,7 +26,7 @@ */
#include <common.h> -#include <asm-arm/mach-types.h> +#include <asm/mach-types.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/prodrive/alpr/fpga.c b/board/prodrive/alpr/fpga.c index 7571cd9..f3bc1fa 100644 --- a/board/prodrive/alpr/fpga.c +++ b/board/prodrive/alpr/fpga.c @@ -30,7 +30,7 @@ #include <altera.h> #include <ACEX1K.h> #include <command.h> -#include <asm-ppc/processor.h> +#include <asm/processor.h> #include <ppc440.h> #include "fpga.h"
diff --git a/board/tqc/tqm834x/tqm834x.c b/board/tqc/tqm834x/tqm834x.c index 4fd8cd6..e564879 100644 --- a/board/tqc/tqm834x/tqm834x.c +++ b/board/tqc/tqm834x/tqm834x.c @@ -28,7 +28,7 @@ #include <asm/mpc8349_pci.h> #include <i2c.h> #include <miiphy.h> -#include <asm-ppc/mmu.h> +#include <asm/mmu.h> #include <pci.h>
DECLARE_GLOBAL_DATA_PTR; diff --git a/board/xilinx/ppc440-generic/init.S b/board/xilinx/ppc440-generic/init.S index 1409467..54f2d7f 100644 --- a/board/xilinx/ppc440-generic/init.S +++ b/board/xilinx/ppc440-generic/init.S @@ -19,7 +19,7 @@
#include <ppc_asm.tmpl> #include <config.h> -#include <asm-ppc/mmu.h> +#include <asm/mmu.h>
.section .bootpg,"ax" .globl tlbtab diff --git a/cpu/ppc4xx/4xx_pcie.c b/cpu/ppc4xx/4xx_pcie.c index d9605c3..9a098ba 100644 --- a/cpu/ppc4xx/4xx_pcie.c +++ b/cpu/ppc4xx/4xx_pcie.c @@ -29,7 +29,7 @@ #include <pci.h> #include <ppc4xx.h> #include <asm/processor.h> -#include <asm-ppc/io.h> +#include <asm/io.h> #include <asm/errno.h>
#if (defined(CONFIG_440SPE) || defined(CONFIG_405EX) || \ diff --git a/cpu/ppc4xx/i2c.c b/cpu/ppc4xx/i2c.c index 7976e75..cc47d4a 100644 --- a/cpu/ppc4xx/i2c.c +++ b/cpu/ppc4xx/i2c.c @@ -30,7 +30,7 @@ #include <ppc4xx.h> #include <4xx_i2c.h> #include <i2c.h> -#include <asm-ppc/io.h> +#include <asm/io.h>
#ifdef CONFIG_HARD_I2C
diff --git a/include/asm-arm/arch-arm720t/hardware.h b/include/asm-arm/arch-arm720t/hardware.h index ec053c9..9bee19f 100644 --- a/include/asm-arm/arch-arm720t/hardware.h +++ b/include/asm-arm/arch-arm720t/hardware.h @@ -25,7 +25,7 @@ */
#if defined(CONFIG_NETARM) -#include <asm-arm/arch-arm720t/netarm_registers.h> +#include <asm/arch-arm720t/netarm_registers.h> #elif defined(CONFIG_IMPA7) /* include IMPA7 specific hardware file if there was one */ #elif defined(CONFIG_EP7312) diff --git a/include/asm-arm/arch-lpc2292/hardware.h b/include/asm-arm/arch-lpc2292/hardware.h index fd2b464..5e227e3 100644 --- a/include/asm-arm/arch-lpc2292/hardware.h +++ b/include/asm-arm/arch-lpc2292/hardware.h @@ -25,7 +25,7 @@ */
#if defined(CONFIG_LPC2292) -#include <asm-arm/arch-lpc2292/lpc2292_registers.h> +#include <asm/arch-lpc2292/lpc2292_registers.h> #else #error No hardware file defined for this configuration #endif diff --git a/nand_spl/board/freescale/p1_p2_rdb/nand_boot.c b/nand_spl/board/freescale/p1_p2_rdb/nand_boot.c index af442ea..16a756c 100644 --- a/nand_spl/board/freescale/p1_p2_rdb/nand_boot.c +++ b/nand_spl/board/freescale/p1_p2_rdb/nand_boot.c @@ -20,7 +20,7 @@ */ #include <common.h> #include <mpc85xx.h> -#include <asm-ppc/io.h> +#include <asm/io.h> #include <ns16550.h> #include <nand.h> #include <asm/mmu.h> diff --git a/nand_spl/nand_boot_fsl_nfc.c b/nand_spl/nand_boot_fsl_nfc.c index a9df2a8..a7fd416 100644 --- a/nand_spl/nand_boot_fsl_nfc.c +++ b/nand_spl/nand_boot_fsl_nfc.c @@ -26,7 +26,7 @@
#include <common.h> #include <nand.h> -#include <asm-arm/arch/mx31-regs.h> +#include <asm/arch/mx31-regs.h> #include <asm/io.h> #include <fsl_nfc.h>