Merge branch 'for-sascha' of git://uboot.jcrosoft.org/u-boot-v2 into from-jean

Conflicts:
	board/a9m2440/a9m2440.c
	board/pcm043/pcm043.c
	drivers/nand/nand_imx.c

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

45 files changed, 113 insertions, 113 deletions

diff --git a/board/a9m2410/a9m2410.c b/board/a9m2410/a9m2410.c
index ba3004e254..f327f82b7f 100644
--- a/board/a9m2410/a9m2410.c
+++ b/board/a9m2410/a9m2410.c
@@ -32,8 +32,8 @@
 #include <partition.h>
 #include <nand.h>
 #include <asm/io.h>
-#include <asm/arch/s3c24x0-iomap.h>
-#include <asm/arch/s3c24x0-nand.h>
+#include <mach/s3c24x0-iomap.h>
+#include <mach/s3c24x0-nand.h>
 
 static struct memory_platform_data ram_pdata = {
 	.name		= "ram0",
diff --git a/board/a9m2410/lowlevel_init.S b/board/a9m2410/lowlevel_init.S
index 1af42ddcd1..461b93c3f1 100644
--- a/board/a9m2410/lowlevel_init.S
+++ b/board/a9m2410/lowlevel_init.S
@@ -3,7 +3,7 @@
  */
 
 #include <config.h>
-#include <asm/arch/s3c24x0-iomap.h>
+#include <mach/s3c24x0-iomap.h>
 
 	.section ".text_bare_init.board_init_lowlevel","ax"
 
diff --git a/board/a9m2440/a9m2440.c b/board/a9m2440/a9m2440.c
index 228fbde9f3..2567f5ed13 100644
--- a/board/a9m2440/a9m2440.c
+++ b/board/a9m2440/a9m2440.c
@@ -32,9 +32,9 @@
 #include <partition.h>
 #include <nand.h>
 #include <asm/io.h>
-#include <asm/arch/s3c24x0-iomap.h>
-#include <asm/arch/s3c24x0-nand.h>
-#include <asm/arch/s3c24xx-generic.h>
+#include <mach/s3c24x0-iomap.h>
+#include <mach/s3c24x0-nand.h>
+#include <mach/s3c24xx-generic.h>
 
 #include "baseboards.h"
 
diff --git a/board/a9m2440/lowlevel_init.S b/board/a9m2440/lowlevel_init.S
index ff8ef07aa9..4b5c596076 100644
--- a/board/a9m2440/lowlevel_init.S
+++ b/board/a9m2440/lowlevel_init.S
@@ -3,7 +3,7 @@
  */
 
 #include <config.h>
-#include <asm/arch/s3c24x0-iomap.h>
+#include <mach/s3c24x0-iomap.h>
 
 	.section ".text_bare_init.board_init_lowlevel","ax"
 
diff --git a/board/at91sam9260ek/init.c b/board/at91sam9260ek/init.c
index d484e9b46c..bf40bc4895 100644
--- a/board/at91sam9260ek/init.c
+++ b/board/at91sam9260ek/init.c
@@ -33,9 +33,9 @@
 #include <asm/hardware.h>
 #include <nand.h>
 #include <linux/mtd/nand.h>
-#include <asm/arch/board.h>
-#include <asm/arch/at91sam9_smc.h>
-#include <asm/arch/sam9_smc.h>
+#include <mach/board.h>
+#include <mach/at91sam9_smc.h>
+#include <mach/sam9_smc.h>
 #include <gpio.h>
 
 static struct atmel_nand_data nand_pdata = {
diff --git a/board/eco920/eco920.c b/board/eco920/eco920.c
index 30d5ac02af..53041ddd4c 100644
--- a/board/eco920/eco920.c
+++ b/board/eco920/eco920.c
@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <asm/arch/AT91RM9200.h>
+#include <mach/AT91RM9200.h>
 #include <at91rm9200_net.h>
 #include <dm9161.h>
 #include <miiphy.h>
diff --git a/board/eukrea_cpuimx27/eukrea_cpuimx27.c b/board/eukrea_cpuimx27/eukrea_cpuimx27.c
index f4b278395c..6ffc40b394 100644
--- a/board/eukrea_cpuimx27/eukrea_cpuimx27.c
+++ b/board/eukrea_cpuimx27/eukrea_cpuimx27.c
@@ -25,21 +25,21 @@
 #include <cfi_flash.h>
 #include <init.h>
 #include <environment.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 #include <fec.h>
 #include <notifier.h>
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 #include <asm/armlinux.h>
 #include <asm/mach-types.h>
-#include <asm/arch/pmic.h>
+#include <mach/pmic.h>
 #include <partition.h>
 #include <fs.h>
 #include <fcntl.h>
 #include <nand.h>
 #include <command.h>
 #include <asm/io.h>
-#include <asm/arch/imx-nand.h>
-#include <asm/arch/imx-pll.h>
+#include <mach/imx-nand.h>
+#include <mach/imx-pll.h>
 
 static struct device_d cfi_dev = {
 	.name     = "cfi_flash",
diff --git a/board/eukrea_cpuimx27/lowlevel_init.S b/board/eukrea_cpuimx27/lowlevel_init.S
index 8f61721782..c7ac3410cc 100644
--- a/board/eukrea_cpuimx27/lowlevel_init.S
+++ b/board/eukrea_cpuimx27/lowlevel_init.S
@@ -1,5 +1,5 @@
 #include <config.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 
 #define writel(val, reg) \
 	ldr		r0,	=reg;	\
diff --git a/board/freescale-mx25-3-stack/3stack.c b/board/freescale-mx25-3-stack/3stack.c
index 0f770ee5ca..3acc46bd22 100644
--- a/board/freescale-mx25-3-stack/3stack.c
+++ b/board/freescale-mx25-3-stack/3stack.c
@@ -25,17 +25,17 @@
 #include <init.h>
 #include <driver.h>
 #include <environment.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 #include <asm/armlinux.h>
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 #include <asm/io.h>
 #include <partition.h>
 #include <asm/mach-types.h>
-#include <asm/arch/imx-nand.h>
+#include <mach/imx-nand.h>
 #include <fec.h>
 #include <nand.h>
-#include <asm/arch/imx25-flash-header.h>
-#include <asm/arch/iomux-mx25.h>
+#include <mach/imx25-flash-header.h>
+#include <mach/iomux-mx25.h>
 
 extern unsigned long _stext;
 
diff --git a/board/freescale-mx25-3-stack/lowlevel_init.S b/board/freescale-mx25-3-stack/lowlevel_init.S
index 9d1916469d..d622bd3628 100644
--- a/board/freescale-mx25-3-stack/lowlevel_init.S
+++ b/board/freescale-mx25-3-stack/lowlevel_init.S
@@ -21,9 +21,9 @@
  * MA 02111-1307 USA
  */
 
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/imx-pll.h>
-#include <asm/arch/esdctl.h>
+#include <mach/imx-regs.h>
+#include <mach/imx-pll.h>
+#include <mach/esdctl.h>
 #include <asm/cache-l2x0.h>
 
 #define writel(val, reg) \
diff --git a/board/freescale-mx35-3-stack/3stack.c b/board/freescale-mx35-3-stack/3stack.c
index 84b94f5abc..ade5d12f98 100644
--- a/board/freescale-mx35-3-stack/3stack.c
+++ b/board/freescale-mx35-3-stack/3stack.c
@@ -23,20 +23,20 @@
 #include <cfi_flash.h>
 #include <init.h>
 #include <environment.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 #include <fec.h>
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 #include <asm/armlinux.h>
 #include <asm/mach-types.h>
-#include <asm/arch/pmic.h>
+#include <mach/pmic.h>
 #include <partition.h>
 #include <fs.h>
 #include <fcntl.h>
 #include <nand.h>
 #include <spi/spi.h>
 #include <asm/io.h>
-#include <asm/arch/imx-nand.h>
-#include <asm/arch/iomux-mx35.h>
+#include <mach/imx-nand.h>
+#include <mach/iomux-mx35.h>
 
 static struct device_d cfi_dev = {
 	.name     = "cfi_flash",
diff --git a/board/freescale-mx35-3-stack/lowlevel_init.S b/board/freescale-mx35-3-stack/lowlevel_init.S
index 02b0326ca3..f912a3a1b0 100644
--- a/board/freescale-mx35-3-stack/lowlevel_init.S
+++ b/board/freescale-mx35-3-stack/lowlevel_init.S
@@ -5,7 +5,7 @@
  */
 
 #include <config.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 
 #define writel(val, reg) \
 	ldr		r0,	=reg;	\
diff --git a/board/imx21ads/imx21ads.c b/board/imx21ads/imx21ads.c
index 3e1f47ff3c..ba67e462ba 100644
--- a/board/imx21ads/imx21ads.c
+++ b/board/imx21ads/imx21ads.c
@@ -26,15 +26,15 @@
 #include <cfi_flash.h>
 #include <init.h>
 #include <environment.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 #include <asm/armlinux.h>
 #include <asm/io.h>
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 #include <partition.h>
 #include <fs.h>
 #include <fcntl.h>
 #include <asm/mach-types.h>
-#include <asm/arch/imx-nand.h>
+#include <mach/imx-nand.h>
 
 static struct device_d cfi_dev = {
 	.name     = "cfi_flash",
diff --git a/board/imx21ads/lowlevel_init.S b/board/imx21ads/lowlevel_init.S
index ee3b0853ce..b13ec7b3e1 100644
--- a/board/imx21ads/lowlevel_init.S
+++ b/board/imx21ads/lowlevel_init.S
@@ -4,7 +4,7 @@
  */
 
 #include <config.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 
 #define writel(val, reg) \
 	ldr		r0,	=reg;	\
diff --git a/board/imx27ads/imx27ads.c b/board/imx27ads/imx27ads.c
index d3524360a9..5f43d1b4f0 100644
--- a/board/imx27ads/imx27ads.c
+++ b/board/imx27ads/imx27ads.c
@@ -23,11 +23,11 @@
 #include <cfi_flash.h>
 #include <init.h>
 #include <environment.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 #include <asm/armlinux.h>
 #include <asm/io.h>
 #include <fec.h>
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 #include <partition.h>
 #include <fs.h>
 #include <fcntl.h>
diff --git a/board/imx27ads/lowlevel_init.S b/board/imx27ads/lowlevel_init.S
index 57b93eb6b4..2d079b6156 100644
--- a/board/imx27ads/lowlevel_init.S
+++ b/board/imx27ads/lowlevel_init.S
@@ -5,7 +5,7 @@
  */
 
 #include <config.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 
 #define writel(val, reg) \
 	ldr		r0,	=reg;	\
diff --git a/board/kp_ukd_r1_num/highlevel_init.c b/board/kp_ukd_r1_num/highlevel_init.c
index e3d9a16ce3..11b30f183c 100644
--- a/board/kp_ukd_r1_num/highlevel_init.c
+++ b/board/kp_ukd_r1_num/highlevel_init.c
@@ -24,7 +24,7 @@
 #include <common.h>
 #include <reloc.h>
 #include <config.h>
-#include <asm/arch/mcf54xx-regs.h>
+#include <mach/mcf54xx-regs.h>
 
 static void board_gpio_init(void)
 {
diff --git a/board/kp_ukd_r1_num/kp_ukd_r1_num.c b/board/kp_ukd_r1_num/kp_ukd_r1_num.c
index 7518286822..a9052e196c 100644
--- a/board/kp_ukd_r1_num/kp_ukd_r1_num.c
+++ b/board/kp_ukd_r1_num/kp_ukd_r1_num.c
@@ -24,9 +24,9 @@
 #include <driver.h>
 #include <fec.h>
 #include <environment.h>
-#include <asm/arch/mcf54xx-regs.h>
-//#include <asm/arch/gpio.h>
-#include <asm/arch/clocks.h>
+#include <mach/mcf54xx-regs.h>
+//#include <mach/gpio.h>
+#include <mach/clocks.h>
 #include <asm/io.h>
 #include <partition.h>
 
diff --git a/board/kp_ukd_r1_num/lowlevel_init.c b/board/kp_ukd_r1_num/lowlevel_init.c
index 56863afb0d..31b3bb9815 100644
--- a/board/kp_ukd_r1_num/lowlevel_init.c
+++ b/board/kp_ukd_r1_num/lowlevel_init.c
@@ -23,7 +23,7 @@
  */
 #include <common.h>
 #include <config.h>
-#include <asm/arch/mcf54xx-regs.h>
+#include <mach/mcf54xx-regs.h>
 
 /** Initialize board specific very early inits
  *
diff --git a/board/mmccpu/init.c b/board/mmccpu/init.c
index 7f519e449a..bac8ef3854 100644
--- a/board/mmccpu/init.c
+++ b/board/mmccpu/init.c
@@ -33,10 +33,10 @@
 #include <asm/hardware.h>
 #include <nand.h>
 #include <linux/mtd/nand.h>
-#include <asm/arch/at91_pmc.h>
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/io.h>
+#include <mach/at91_pmc.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
+#include <mach/io.h>
 
 static struct device_d cfi_dev = {
 	.name		= "cfi_flash",
diff --git a/board/netx/netx.c b/board/netx/netx.c
index 6f6aa78e10..5276d59753 100644
--- a/board/netx/netx.c
+++ b/board/netx/netx.c
@@ -23,13 +23,13 @@
 #include <cfi_flash.h>
 #include <init.h>
 #include <environment.h>
-#include <asm/arch/netx-regs.h>
+#include <mach/netx-regs.h>
 #include <partition.h>
 #include <asm/armlinux.h>
 #include <fs.h>
 #include <fcntl.h>
 #include <asm/mach-types.h>
-#include <asm/arch/netx-eth.h>
+#include <mach/netx-eth.h>
 
 static struct device_d cfi_dev = {
 	.name     = "cfi_flash",
diff --git a/board/omap/board-beagle.c b/board/omap/board-beagle.c
index 5da64d4997..282c532d30 100644
--- a/board/omap/board-beagle.c
+++ b/board/omap/board-beagle.c
@@ -53,13 +53,13 @@
 #include <driver.h>
 #include <asm/io.h>
 #include <ns16550.h>
-#include <asm/arch/silicon.h>
-#include <asm/arch/sdrc.h>
-#include <asm/arch/sys_info.h>
-#include <asm/arch/syslib.h>
-#include <asm/arch/control.h>
-#include <asm/arch/omap3-mux.h>
-#include <asm/arch/gpmc.h>
+#include <mach/silicon.h>
+#include <mach/sdrc.h>
+#include <mach/sys_info.h>
+#include <mach/syslib.h>
+#include <mach/control.h>
+#include <mach/omap3-mux.h>
+#include <mach/gpmc.h>
 #include "board.h"
 
 /******************** Board Boot Time *******************/
diff --git a/board/omap/board-sdp343x.c b/board/omap/board-sdp343x.c
index 2ddc5c2718..caf21087ff 100644
--- a/board/omap/board-sdp343x.c
+++ b/board/omap/board-sdp343x.c
@@ -48,13 +48,13 @@
 #include <driver.h>
 #include <asm/io.h>
 #include <ns16550.h>
-#include <asm/arch/silicon.h>
-#include <asm/arch/sdrc.h>
-#include <asm/arch/sys_info.h>
-#include <asm/arch/syslib.h>
-#include <asm/arch/control.h>
-#include <asm/arch/omap3-mux.h>
-#include <asm/arch/gpmc.h>
+#include <mach/silicon.h>
+#include <mach/sdrc.h>
+#include <mach/sys_info.h>
+#include <mach/syslib.h>
+#include <mach/control.h>
+#include <mach/omap3-mux.h>
+#include <mach/gpmc.h>
 #include "board.h"
 
 /******************** Board Boot Time *******************/
diff --git a/board/omap/devices-gpmc-nand.c b/board/omap/devices-gpmc-nand.c
index d6db8a36de..bbcceafe88 100644
--- a/board/omap/devices-gpmc-nand.c
+++ b/board/omap/devices-gpmc-nand.c
@@ -33,9 +33,9 @@
 #include <clock.h>
 #include <asm/io.h>
 
-#include <asm/arch/silicon.h>
-#include <asm/arch/gpmc.h>
-#include <asm/arch/gpmc_nand.h>
+#include <mach/silicon.h>
+#include <mach/gpmc.h>
+#include <mach/gpmc_nand.h>
 
 #ifdef CONFIG_MACH_OMAP_GPMC_GENERICNAND
 
diff --git a/board/omap/platform.S b/board/omap/platform.S
index c6ce875112..9014a8f1c7 100644
--- a/board/omap/platform.S
+++ b/board/omap/platform.S
@@ -32,7 +32,7 @@
  */
 
 #include <config.h>
-#include <asm/arch/silicon.h>
+#include <mach/silicon.h>
 
 #ifdef CONFIG_MACH_DO_LOWLEVEL_INIT
 /**
diff --git a/board/pcm030/config.h b/board/pcm030/config.h
index 16b7ba8518..a772ee6d96 100644
--- a/board/pcm030/config.h
+++ b/board/pcm030/config.h
@@ -27,7 +27,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <asm/arch/mpc5xxx.h>
+#include <mach/mpc5xxx.h>
 
 /* #define DEBUG */
 
diff --git a/board/pcm030/pcm030.c b/board/pcm030/pcm030.c
index c0c9a33a7d..23c1be3944 100644
--- a/board/pcm030/pcm030.c
+++ b/board/pcm030/pcm030.c
@@ -31,8 +31,8 @@
 #include <driver.h>
 #include <cfi_flash.h>
 #include <init.h>
-#include <asm/arch/mpc5xxx.h>
-#include <asm/arch/fec.h>
+#include <mach/mpc5xxx.h>
+#include <mach/fec.h>
 #include <types.h>
 #include <partition.h>
 #include <mem_malloc.h>
diff --git a/board/pcm037/lowlevel_init.S b/board/pcm037/lowlevel_init.S
index bbd98ce5ee..a32d375dde 100644
--- a/board/pcm037/lowlevel_init.S
+++ b/board/pcm037/lowlevel_init.S
@@ -21,8 +21,8 @@
  * MA 02111-1307 USA
  */
 
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/imx-pll.h>
+#include <mach/imx-regs.h>
+#include <mach/imx-pll.h>
 
 #define writel(val, reg) \
 	ldr		r0,	=reg;	\
diff --git a/board/pcm037/pcm037.c b/board/pcm037/pcm037.c
index 8fc5162485..8a15da47f7 100644
--- a/board/pcm037/pcm037.c
+++ b/board/pcm037/pcm037.c
@@ -27,14 +27,14 @@
 #include <driver.h>
 #include <environment.h>
 #include <usb/isp1504.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/iomux-mx31.h>
+#include <mach/imx-regs.h>
+#include <mach/iomux-mx31.h>
 #include <asm/armlinux.h>
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 #include <asm/io.h>
 #include <partition.h>
 #include <asm/mach-types.h>
-#include <asm/arch/imx-nand.h>
+#include <mach/imx-nand.h>
 
 
 /*
diff --git a/board/pcm038/lowlevel_init.S b/board/pcm038/lowlevel_init.S
index 64c55778b1..759ecd77a9 100644
--- a/board/pcm038/lowlevel_init.S
+++ b/board/pcm038/lowlevel_init.S
@@ -5,7 +5,7 @@
  */
 
 #include <config.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 
 #define writel(val, reg) \
 	ldr		r0,	=reg;	\
diff --git a/board/pcm038/pcm038.c b/board/pcm038/pcm038.c
index 995844838d..6d8358b6d5 100644
--- a/board/pcm038/pcm038.c
+++ b/board/pcm038/pcm038.c
@@ -23,13 +23,13 @@
 #include <cfi_flash.h>
 #include <init.h>
 #include <environment.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 #include <fec.h>
 #include <notifier.h>
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 #include <asm/armlinux.h>
 #include <asm/mach-types.h>
-#include <asm/arch/pmic.h>
+#include <mach/pmic.h>
 #include <partition.h>
 #include <fs.h>
 #include <fcntl.h>
@@ -37,12 +37,12 @@
 #include <command.h>
 #include <spi/spi.h>
 #include <asm/io.h>
-#include <asm/arch/imx-nand.h>
-#include <asm/arch/imx-pll.h>
-#include <asm/arch/imxfb.h>
+#include <mach/imx-nand.h>
+#include <mach/imx-pll.h>
+#include <mach/imxfb.h>
 #include <asm/mmu.h>
 #include <usb/isp1504.h>
-#include <asm/arch/spi.h>
+#include <mach/spi.h>
 
 static struct device_d cfi_dev = {
 	.name     = "cfi_flash",
diff --git a/board/pcm043/lowlevel_init.S b/board/pcm043/lowlevel_init.S
index a7cb300ad2..56ebae4335 100644
--- a/board/pcm043/lowlevel_init.S
+++ b/board/pcm043/lowlevel_init.S
@@ -21,9 +21,9 @@
  * MA 02111-1307 USA
  */
 
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/imx-pll.h>
-#include <asm/arch/esdctl.h>
+#include <mach/imx-regs.h>
+#include <mach/imx-pll.h>
+#include <mach/esdctl.h>
 #include <asm/cache-l2x0.h>
 
 #define writel(val, reg) \
diff --git a/board/pcm043/pcm043.c b/board/pcm043/pcm043.c
index 889093a9cd..a396ff70ce 100644
--- a/board/pcm043/pcm043.c
+++ b/board/pcm043/pcm043.c
@@ -29,17 +29,17 @@
 #include <driver.h>
 #include <environment.h>
 #include <fs.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/imx-pll.h>
-#include <asm/arch/iomux-mx35.h>
+#include <mach/imx-regs.h>
 #include <asm/armlinux.h>
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 #include <asm/io.h>
 #include <partition.h>
 #include <nand.h>
 #include <asm/mach-types.h>
+#include <mach/imx-nand.h>
 #include <fec.h>
-#include <asm/arch/imx-nand.h>
+#include <mach/imx-pll.h>
+#include <mach/iomux-mx35.h>
 
 #define CYG_MACRO_START
 #define CYG_MACRO_END
diff --git a/board/phycard-i.MX27/lowlevel_init.S b/board/phycard-i.MX27/lowlevel_init.S
index 64c55778b1..759ecd77a9 100644
--- a/board/phycard-i.MX27/lowlevel_init.S
+++ b/board/phycard-i.MX27/lowlevel_init.S
@@ -5,7 +5,7 @@
  */
 
 #include <config.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 
 #define writel(val, reg) \
 	ldr		r0,	=reg;	\
diff --git a/board/phycard-i.MX27/pca100.c b/board/phycard-i.MX27/pca100.c
index 317c19c9eb..fe9b894a60 100644
--- a/board/phycard-i.MX27/pca100.c
+++ b/board/phycard-i.MX27/pca100.c
@@ -23,9 +23,9 @@
 #include <cfi_flash.h>
 #include <init.h>
 #include <environment.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 #include <fec.h>
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 #include <asm/armlinux.h>
 #include <asm/mach-types.h>
 #include <partition.h>
@@ -34,8 +34,8 @@
 #include <nand.h>
 #include <spi/spi.h>
 #include <asm/io.h>
-#include <asm/arch/imx-nand.h>
-#include <asm/arch/imx-pll.h>
+#include <mach/imx-nand.h>
+#include <mach/imx-pll.h>
 #include <gpio.h>
 #include <asm/mmu.h>
 #include <usb/isp1504.h>
diff --git a/board/phycore_mcf54xx/highlevel_init.c b/board/phycore_mcf54xx/highlevel_init.c
index e3d9a16ce3..11b30f183c 100644
--- a/board/phycore_mcf54xx/highlevel_init.c
+++ b/board/phycore_mcf54xx/highlevel_init.c
@@ -24,7 +24,7 @@
 #include <common.h>
 #include <reloc.h>
 #include <config.h>
-#include <asm/arch/mcf54xx-regs.h>
+#include <mach/mcf54xx-regs.h>
 
 static void board_gpio_init(void)
 {
diff --git a/board/phycore_mcf54xx/lowlevel_init.c b/board/phycore_mcf54xx/lowlevel_init.c
index a4da9ec6e6..89ac6ff8d9 100644
--- a/board/phycore_mcf54xx/lowlevel_init.c
+++ b/board/phycore_mcf54xx/lowlevel_init.c
@@ -23,7 +23,7 @@
  */
 #include <common.h>
 #include <config.h>
-#include <asm/arch/mcf54xx-regs.h>
+#include <mach/mcf54xx-regs.h>
 
 /** Initialize board specific very early inits
  *
diff --git a/board/phycore_mcf54xx/phyCore_MCF54xx.c b/board/phycore_mcf54xx/phyCore_MCF54xx.c
index f8e96d3af3..6fe799328d 100644
--- a/board/phycore_mcf54xx/phyCore_MCF54xx.c
+++ b/board/phycore_mcf54xx/phyCore_MCF54xx.c
@@ -26,8 +26,8 @@
 #include <driver.h>
 #include <fec.h>
 #include <environment.h>
-#include <asm/arch/mcf54xx-regs.h>
-#include <asm/arch/clocks.h>
+#include <mach/mcf54xx-regs.h>
+#include <mach/clocks.h>
 #include <asm/io.h>
 #include <partition.h>
 
diff --git a/board/pm9263/init.c b/board/pm9263/init.c
index 0d3d6d9412..1060fe27a3 100644
--- a/board/pm9263/init.c
+++ b/board/pm9263/init.c
@@ -33,10 +33,10 @@
 #include <asm/hardware.h>
 #include <nand.h>
 #include <linux/mtd/nand.h>
-#include <asm/arch/at91_pmc.h>
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/io.h>
+#include <mach/at91_pmc.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
+#include <mach/io.h>
 
 static struct device_d cfi_dev = {
 	.name     = "cfi_flash",
diff --git a/board/sandbox/board.c b/board/sandbox/board.c
index a3f64983c4..84017eb50d 100644
--- a/board/sandbox/board.c
+++ b/board/sandbox/board.c
@@ -23,7 +23,7 @@
 #include <common.h>
 #include <driver.h>
 #include <malloc.h>
-#include <asm/arch/linux.h>
+#include <mach/linux.h>
 #include <init.h>
 #include <errno.h>
 
diff --git a/board/sandbox/clock.c b/board/sandbox/clock.c
index 27ae7e234c..7ad1f53e15 100644
--- a/board/sandbox/clock.c
+++ b/board/sandbox/clock.c
@@ -23,7 +23,7 @@
 #include <common.h>
 #include <init.h>
 #include <clock.h>
-#include <asm/arch/linux.h>
+#include <mach/linux.h>
 
 static uint64_t linux_clocksource_read(void)
 {
diff --git a/board/sandbox/console.c b/board/sandbox/console.c
index 7b429df8b3..094521678a 100644
--- a/board/sandbox/console.c
+++ b/board/sandbox/console.c
@@ -22,7 +22,7 @@
 
 #include <common.h>
 #include <driver.h>
-#include <asm/arch/linux.h>
+#include <mach/linux.h>
 #include <xfuncs.h>
 
 int u_boot_register_console(char *name, int stdinfd, int stdoutfd)
diff --git a/board/sandbox/hostfile.c b/board/sandbox/hostfile.c
index eb3b08ff76..f91601febb 100644
--- a/board/sandbox/hostfile.c
+++ b/board/sandbox/hostfile.c
@@ -23,10 +23,10 @@
 #include <common.h>
 #include <driver.h>
 #include <malloc.h>
-#include <asm/arch/linux.h>
+#include <mach/linux.h>
 #include <init.h>
 #include <errno.h>
-#include <asm/arch/hostfile.h>
+#include <mach/hostfile.h>
 #include <xfuncs.h>
 
 struct hf_priv {
diff --git a/board/scb9328/lowlevel_init.S b/board/scb9328/lowlevel_init.S
index 6a51f5bf9f..5b024286bb 100644
--- a/board/scb9328/lowlevel_init.S
+++ b/board/scb9328/lowlevel_init.S
@@ -18,7 +18,7 @@
  *
  */
 
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 
 #define CPU200
 
diff --git a/board/scb9328/scb9328.c b/board/scb9328/scb9328.c
index af666f2af1..6b86352e6a 100644
--- a/board/scb9328/scb9328.c
+++ b/board/scb9328/scb9328.c
@@ -24,9 +24,9 @@
 #include <init.h>
 #include <environment.h>
 #include <asm/mach-types.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 #include <asm/armlinux.h>
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 #include <asm/io.h>
 #include <partition.h>
 #include <fs.h>