Replace "#include <asm-$ARCH/$FILE>" with "#include <asm/$FILE>"

The appropriate include/asm-$ARCH directory should already by symlinked to include/asm so using the whole "asm-$ARCH" path is unnecessary. This change should 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>
2010-04-12 22:28:07 -05:00 · 2010-04-12 22:28:07 -05:00 · 61f2b38a17
commit 61f2b38a17
parent 0de71d5071
33 changed files with 36 additions and 36 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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);
--- 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>

 /*
--- 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
--- 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 */
--- 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>

 /*
--- 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>

 /*
--- 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)
--- 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
--- 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>

 /**************************************************************************
--- 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
--- a/board/m501sk/m501sk.h
+++ b/board/m501sk/m501sk.h
@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-at91/hardware.h
+ * linux/include/asm/arch-at91/hardware.h
 *
 *  Copyright (C) 2003 SAN People
 *
@ -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 */
--- 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;
--- 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;
--- 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"

--- 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;

--- 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"

--- a/board/sandburst/common/ppc440gx_i2c.c
+++ b/board/sandburst/common/ppc440gx_i2c.c
@ -31,7 +31,7 @@
 #include <i2c.h>
 #include <command.h>
 #include "ppc440gx_i2c.h"
-#include <asm-ppc/io.h>
+#include <asm/io.h>

 #ifdef CONFIG_I2C_BUS1

--- 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;
--- 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
--- 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) ||	\
--- a/drivers/i2c/ppc4xx_i2c.c
+++ b/drivers/i2c/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

--- 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)
--- 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
--- a/nand_spl/board/freescale/mpc8569mds/nand_boot.c
+++ b/nand_spl/board/freescale/mpc8569mds/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>
--- 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>
--- a/nand_spl/nand_boot_fsl_nfc.c
+++ b/nand_spl/nand_boot_fsl_nfc.c
@ -27,9 +27,9 @@
 #include <common.h>
 #include <nand.h>
 #ifdef CONFIG_MX31
-#include <asm-arm/arch/mx31-regs.h>
+#include <asm/arch/mx31-regs.h>
 #else
-#include <asm-arm/arch/imx-regs.h>
+#include <asm/arch/imx-regs.h>
 #endif
 #include <asm/io.h>
 #include <fsl_nfc.h>