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>

364 files changed, 435 insertions, 487 deletions

diff --git a/Makefile b/Makefile
index cdd8a37c06..b0cb8fa2a3 100644
--- a/Makefile
+++ b/Makefile
@@ -168,6 +168,7 @@ CROSS_COMPILE   ?=
 
 # Architecture as present in compile.h
 UTS_MACHINE := $(ARCH)
+SRCARCH 	:= $(ARCH)
 
 KCONFIG_CONFIG	?= .config
 
@@ -287,6 +288,7 @@ export MODVERDIR := $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/).tmp_ve
 # Needed to be compatible with the O= option
 LINUXINCLUDE    := -Iinclude \
                    $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include) \
+		   -I$(srctree)/arch/$(ARCH)/include \
 		   -include include/linux/autoconf.h
 
 CPPFLAGS        := -D__KERNEL__ -D__U_BOOT__ $(LINUXINCLUDE) -fno-builtin -ffreestanding
@@ -749,7 +751,9 @@ ifneq ($(KBUILD_SRC),)
 		/bin/false; \
 	fi;
 	$(Q)if [ ! -d include2 ]; then mkdir -p include2; fi;
-	$(Q)ln -fsn $(srctree)/include/asm-$(ARCH) include2/asm
+	$(Q)if [ -e $(srctree)/include/asm-$(SRCARCH)/u-boot.h ]; then  \
+	    ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm;     \
+	    fi
 endif
 
 # prepare2 creates a makefile if using a separate output directory
@@ -780,10 +784,34 @@ export CPPFLAGS_uboot.lds += -P -C -U$(ARCH)
 # hard to detect, but I suppose "make mrproper" is a good idea
 # before switching between archs anyway.
 
+define check-symlink
+	set -e;								\
+	if [ -L include/asm ]; then					\
+		asmlink=`readlink include/asm | cut -d '-' -f 2`;	\
+		if [ "$$asmlink" != "$(SRCARCH)" ]; then		\
+			echo "ERROR: the symlink $@ points to asm-$$asmlink but asm-$(SRCARCH) was expected";	\
+			echo "       set ARCH or save .config and run 'make mrproper' to fix it";		\
+			exit 1;						\
+		fi;							\
+	fi
+endef
+
+# We create the target directory of the symlink if it does
+# not exist so the test in chack-symlink works and we have a
+# directory for generated filesas used by some architectures.
+define create-symlink
+	if [ ! -L include/asm ]; then					\
+			echo '  SYMLINK $@ -> include/asm-$(SRCARCH)';	\
+			if [ ! -d include/asm-$(SRCARCH) ]; then	\
+				mkdir -p include/asm-$(SRCARCH);	\
+			fi;						\
+			ln -fsn asm-$(SRCARCH) $@;			\
+	fi
+endef
+
 include/asm:
-	@echo '  SYMLINK $@ -> include/asm-$(ARCH)'
-	$(Q)if [ ! -d include ]; then mkdir -p include; fi;
-	@ln -fsn asm-$(ARCH) $@
+	$(Q)$(check-symlink)
+	$(Q)$(create-symlink)
 
 include/config.h: include/config/auto.conf
 	@echo '  SYMLINK $@ -> board/$(board-y)/config.h'
@@ -1075,7 +1103,11 @@ define find-sources
 	       \( -name config -o -name 'asm-*' \) -prune \
 	       -o -name $1 -print; \
 	  for ARCH in $(ALLINCLUDE_ARCHS) ; do \
-	       find $(__srctree)include/asm-$${ARCH} $(RCS_FIND_IGNORE) \
+	       test -e $(__srctree)include/asm-$${arch} && \
+	         find $(__srctree)include/asm-$${arch} $(RCS_FIND_IGNORE) \
+	           -name $1 -print; \
+	      test -e $(__srctree)arch/$${arch}/include/asm && \
+	        find $(__srctree)arch/$${arch}/include/asm $(RCS_FIND_IGNORE) \
 	            -name $1 -print; \
 	  done ; \
 	  find $(__srctree)include/asm-generic $(RCS_FIND_IGNORE) \
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index fc54996848..5105d63dec 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -32,6 +32,14 @@ board-$(CONFIG_MACH_EUKREA_CPUIMX27) := eukrea_cpuimx27
 cpu-$(CONFIG_ARM920T)              := arm920t
 cpu-$(CONFIG_ARM926EJS)            := arm926ejs
 
+machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))
+
+ifeq ($(KBUILD_SRC),)
+CPPFLAGS += $(patsubst %,-I%include,$(machdirs))
+else
+CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs))
+endif
+
 TEXT_BASE = $(CONFIG_TEXT_BASE)
 
 CPPFLAGS += -mabi=apcs-gnu -DTEXT_BASE=$(TEXT_BASE) -P
@@ -42,32 +50,6 @@ CPPFLAGS += -fdata-sections -ffunction-sections
 LDFLAGS_uboot += -static --gc-sections
 endif
 
-ifeq ($(incdir-y),)
-incdir-y := $(machine-y)
-endif
-INCDIR   := arch-$(incdir-y)
-
-#	Update machine arch and proc symlinks if something which affects
-#	them changed.  We use .arch to indicate when they were updated
-#	last, otherwise make uses the target directory mtime.
-
-include/asm-arm/.arch: $(wildcard include/config/arch/*.h) include/config/auto.conf
-	@echo '  SYMLINK include/asm-arm/arch -> include/asm-arm/$(INCDIR)'
-ifneq ($(KBUILD_SRC),)
-	$(Q)mkdir -p include/asm-arm
-	$(Q)ln -fsn $(srctree)/include/asm-arm/$(INCDIR) include/asm-arm/arch
-else
-	$(Q)ln -fsn $(INCDIR) include/asm-arm/arch
-endif
-	@echo '  SYMLINK include/asm-arm/proc -> include/asm-arm/proc-armv'
-ifneq ($(KBUILD_SRC),)
-	$(Q)mkdir -p include/asm-arm
-	$(Q)ln -fsn $(srctree)/include/asm-arm/proc-armv include/asm-arm/proc
-else
-	$(Q)ln -fsn proc-armv include/asm-arm/proc
-endif
-	@touch $@
-
 uboot.netx: uboot.bin
 	$(Q)scripts/gen_netx_image -i uboot.bin -o uboot.netx		\
 		--sdramctrl=$(CONFIG_NETX_SDRAM_CTRL)			\
@@ -85,7 +67,6 @@ all: $(KBUILD_IMAGE)
 archprepare: maketools
 
 PHONY += maketools
-maketools: include/asm-arm/.arch
 
 # Add architecture specific flags
 ifeq ($(CONFIG_ARMCORTEXA8),y)
@@ -111,4 +92,3 @@ lds-$(CONFIG_GENERIC_LINKER_SCRIPT)   := arch/arm/lib/u-boot.lds
 lds-$(CONFIG_BOARD_LINKER_SCRIPT)     := $(BOARD)/u-boot.lds
 
 CLEAN_FILES    += arch/arm/lib/u-boot.lds
-MRPROPER_FILES += include/asm-arm/arch include/asm-arm/proc
diff --git a/include/asm-arm/armlinux.h b/arch/arm/include/asm/armlinux.h
index cfe57f4f71..cfe57f4f71 100644
--- a/include/asm-arm/armlinux.h
+++ b/arch/arm/include/asm/armlinux.h
diff --git a/include/asm-arm/assembler.h b/arch/arm/include/asm/assembler.h
index 6116e4893c..6116e4893c 100644
--- a/include/asm-arm/assembler.h
+++ b/arch/arm/include/asm/assembler.h
diff --git a/include/asm-arm/bitops.h b/arch/arm/include/asm/bitops.h
index 138ebe2d8c..138ebe2d8c 100644
--- a/include/asm-arm/bitops.h
+++ b/arch/arm/include/asm/bitops.h
diff --git a/include/asm-arm/byteorder.h b/arch/arm/include/asm/byteorder.h
index c3489f1e1f..c3489f1e1f 100644
--- a/include/asm-arm/byteorder.h
+++ b/arch/arm/include/asm/byteorder.h
diff --git a/include/asm-arm/cache-l2x0.h b/arch/arm/include/asm/cache-l2x0.h
index 19c3ba42ae..19c3ba42ae 100644
--- a/include/asm-arm/cache-l2x0.h
+++ b/arch/arm/include/asm/cache-l2x0.h
diff --git a/include/asm-arm/common.h b/arch/arm/include/asm/common.h
index da84fa5f6b..da84fa5f6b 100644
--- a/include/asm-arm/common.h
+++ b/arch/arm/include/asm/common.h
diff --git a/include/asm-arm/elf.h b/arch/arm/include/asm/elf.h
index 724ebb0787..724ebb0787 100644
--- a/include/asm-arm/elf.h
+++ b/arch/arm/include/asm/elf.h
diff --git a/include/asm-arm/global_data.h b/arch/arm/include/asm/global_data.h
index 51d9405d65..51d9405d65 100644
--- a/include/asm-arm/global_data.h
+++ b/arch/arm/include/asm/global_data.h
diff --git a/include/asm-arm/gpio.h b/arch/arm/include/asm/gpio.h
index fff4f800ee..166a7a3e28 100644
--- a/include/asm-arm/gpio.h
+++ b/arch/arm/include/asm/gpio.h
@@ -2,6 +2,6 @@
 #define _ARCH_ARM_GPIO_H
 
 /* not all ARM platforms necessarily support this API ... */
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 
 #endif /* _ARCH_ARM_GPIO_H */
diff --git a/include/asm-arm/hardware.h b/arch/arm/include/asm/hardware.h
index 1fd1a5b650..c71c2aeab2 100644
--- a/include/asm-arm/hardware.h
+++ b/arch/arm/include/asm/hardware.h
@@ -13,6 +13,6 @@
 #ifndef __ASM_HARDWARE_H
 #define __ASM_HARDWARE_H
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #endif
diff --git a/include/asm-arm/io.h b/arch/arm/include/asm/io.h
index c7f4b62c44..c7f4b62c44 100644
--- a/include/asm-arm/io.h
+++ b/arch/arm/include/asm/io.h
diff --git a/include/asm-arm/linkage.h b/arch/arm/include/asm/linkage.h
index 5a25632b1b..5a25632b1b 100644
--- a/include/asm-arm/linkage.h
+++ b/arch/arm/include/asm/linkage.h
diff --git a/include/asm-arm/mach-types.h b/arch/arm/include/asm/mach-types.h
index f9df50a70c..f9df50a70c 100644
--- a/include/asm-arm/mach-types.h
+++ b/arch/arm/include/asm/mach-types.h
diff --git a/include/asm-arm/memory.h b/arch/arm/include/asm/memory.h
index f746bc241f..f746bc241f 100644
--- a/include/asm-arm/memory.h
+++ b/arch/arm/include/asm/memory.h
diff --git a/include/asm-arm/mmu.h b/arch/arm/include/asm/mmu.h
index 0dd3fa826c..0dd3fa826c 100644
--- a/include/asm-arm/mmu.h
+++ b/arch/arm/include/asm/mmu.h
diff --git a/include/asm-arm/module.h b/arch/arm/include/asm/module.h
index 5b4d1a3f36..5b4d1a3f36 100644
--- a/include/asm-arm/module.h
+++ b/arch/arm/include/asm/module.h
diff --git a/include/asm-arm/pgtable.h b/arch/arm/include/asm/pgtable.h
index fd1521d5cb..fd1521d5cb 100644
--- a/include/asm-arm/pgtable.h
+++ b/arch/arm/include/asm/pgtable.h
diff --git a/include/asm-arm/posix_types.h b/arch/arm/include/asm/posix_types.h
index c412486db5..c412486db5 100644
--- a/include/asm-arm/posix_types.h
+++ b/arch/arm/include/asm/posix_types.h
diff --git a/include/asm-arm/processor.h b/arch/arm/include/asm/processor.h
index d5dbab0ac2..d5dbab0ac2 100644
--- a/include/asm-arm/processor.h
+++ b/arch/arm/include/asm/processor.h
diff --git a/include/asm-arm/proc-armv/ptrace.h b/arch/arm/include/asm/ptrace.h
index a060ee67e3..b38436930d 100644
--- a/include/asm-arm/proc-armv/ptrace.h
+++ b/arch/arm/include/asm/ptrace.h
@@ -1,15 +1,28 @@
 /*
- *  linux/include/asm-arm/proc-armv/ptrace.h
+ *  arch/arm/include/asm/ptrace.h
  *
- *  Copyright (C) 1996-1999 Russell King
+ *  Copyright (C) 1996-2003 Russell King
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-#ifndef __ASM_PROC_PTRACE_H
-#define __ASM_PROC_PTRACE_H
+#ifndef __ASM_ARM_PTRACE_H
+#define __ASM_ARM_PTRACE_H
 
+#define PTRACE_GETREGS		12
+#define PTRACE_SETREGS		13
+#define PTRACE_GETFPREGS	14
+#define PTRACE_SETFPREGS	15
+
+#define PTRACE_SETOPTIONS	21
+
+/* options set using PTRACE_SETOPTIONS */
+#define PTRACE_O_TRACESYSGOOD	0x00000001
+
+/*
+ * PSR bits
+ */
 #define USR26_MODE	0x00
 #define FIQ26_MODE	0x01
 #define IRQ26_MODE	0x02
@@ -104,4 +117,21 @@ static inline int valid_user_regs(struct pt_regs *regs)
 
 #endif	/* __ASSEMBLY__ */
 
+#ifndef __ASSEMBLY__
+#define pc_pointer(v) \
+	((v) & ~PCMASK)
+
+#define instruction_pointer(regs) \
+	(pc_pointer((regs)->ARM_pc))
+
+#ifdef __KERNEL__
+extern void show_regs(struct pt_regs *);
+
+#define predicate(x)	(x & 0xf0000000)
+#define PREDICATE_ALWAYS	0xe0000000
+
+#endif
+
+#endif /* __ASSEMBLY__ */
+
 #endif
diff --git a/include/asm-arm/setup.h b/arch/arm/include/asm/setup.h
index 89df4dc708..89df4dc708 100644
--- a/include/asm-arm/setup.h
+++ b/arch/arm/include/asm/setup.h
diff --git a/include/asm-arm/string.h b/arch/arm/include/asm/string.h
index 435647abda..435647abda 100644
--- a/include/asm-arm/string.h
+++ b/arch/arm/include/asm/string.h
diff --git a/include/asm-arm/types.h b/arch/arm/include/asm/types.h
index 81bd357ada..81bd357ada 100644
--- a/include/asm-arm/types.h
+++ b/arch/arm/include/asm/types.h
diff --git a/include/asm-arm/u-boot-arm.h b/arch/arm/include/asm/u-boot-arm.h
index 539135add0..539135add0 100644
--- a/include/asm-arm/u-boot-arm.h
+++ b/arch/arm/include/asm/u-boot-arm.h
diff --git a/include/asm-arm/u-boot.h b/arch/arm/include/asm/u-boot.h
index 298f9e37b1..298f9e37b1 100644
--- a/include/asm-arm/u-boot.h
+++ b/arch/arm/include/asm/u-boot.h
diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c
index 5e321c1e7b..0cfe913f72 100644
--- a/arch/arm/mach-at91/at91sam9260_devices.c
+++ b/arch/arm/mach-at91/at91sam9260_devices.c
@@ -12,11 +12,11 @@
 #include <common.h>
 #include <asm/armlinux.h>
 #include <asm/hardware.h>
-#include <asm/arch/board.h>
-#include <asm/arch/at91_pmc.h>
-#include <asm/arch/at91sam9260_matrix.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/io.h>
+#include <mach/board.h>
+#include <mach/at91_pmc.h>
+#include <mach/at91sam9260_matrix.h>
+#include <mach/gpio.h>
+#include <mach/io.h>
 
 static struct memory_platform_data sram_pdata = {
 	.name = "sram0",
diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c
index 83b733f58b..50a63488f4 100644
--- a/arch/arm/mach-at91/at91sam9263_devices.c
+++ b/arch/arm/mach-at91/at91sam9263_devices.c
@@ -12,11 +12,11 @@
 #include <common.h>
 #include <asm/armlinux.h>
 #include <asm/hardware.h>
-#include <asm/arch/at91_pmc.h>
-#include <asm/arch/at91sam9263_matrix.h>
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/io.h>
+#include <mach/at91_pmc.h>
+#include <mach/at91sam9263_matrix.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
+#include <mach/io.h>
 
 static struct memory_platform_data ram_pdata = {
 	.name = "ram0",
diff --git a/arch/arm/mach-at91/clocksource.c b/arch/arm/mach-at91/clocksource.c
index d937e49c38..b5886f938e 100644
--- a/arch/arm/mach-at91/clocksource.c
+++ b/arch/arm/mach-at91/clocksource.c
@@ -33,10 +33,10 @@
 #include <init.h>
 #include <clock.h>
 #include <asm/hardware.h>
-#include <asm/arch/at91_pit.h>
-#include <asm/arch/at91_pmc.h>
-#include <asm/arch/at91_rstc.h>
-#include <asm/arch/io.h>
+#include <mach/at91_pit.h>
+#include <mach/at91_pmc.h>
+#include <mach/at91_rstc.h>
+#include <mach/io.h>
 #include <asm/io.h>
 
 uint64_t at91sam9_clocksource_read(void)
diff --git a/arch/arm/mach-at91/gpio.c b/arch/arm/mach-at91/gpio.c
index b479a4f83a..1cafaf7e29 100644
--- a/arch/arm/mach-at91/gpio.c
+++ b/arch/arm/mach-at91/gpio.c
@@ -24,7 +24,7 @@
 #include <common.h>
 #include <errno.h>
 #include <asm/io.h>
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 #include <gpio.h>
 
 static int gpio_banks;
diff --git a/include/asm-arm/arch-at91/at91_pio.h b/arch/arm/mach-at91/include/mach/at91_pio.h
index f6ce1f924e..f6ce1f924e 100644
--- a/include/asm-arm/arch-at91/at91_pio.h
+++ b/arch/arm/mach-at91/include/mach/at91_pio.h
diff --git a/include/asm-arm/arch-at91/at91_pit.h b/arch/arm/mach-at91/include/mach/at91_pit.h
index 94dd242a5f..94dd242a5f 100644
--- a/include/asm-arm/arch-at91/at91_pit.h
+++ b/arch/arm/mach-at91/include/mach/at91_pit.h
diff --git a/include/asm-arm/arch-at91/at91_pmc.h b/arch/arm/mach-at91/include/mach/at91_pmc.h
index ed40b8bf6a..ed40b8bf6a 100644
--- a/include/asm-arm/arch-at91/at91_pmc.h
+++ b/arch/arm/mach-at91/include/mach/at91_pmc.h
diff --git a/include/asm-arm/arch-at91/at91_rstc.h b/arch/arm/mach-at91/include/mach/at91_rstc.h
index e49caef921..e49caef921 100644
--- a/include/asm-arm/arch-at91/at91_rstc.h
+++ b/arch/arm/mach-at91/include/mach/at91_rstc.h
diff --git a/include/asm-arm/arch-at91/at91_wdt.h b/arch/arm/mach-at91/include/mach/at91_wdt.h
index 7e18537cfb..7e18537cfb 100644
--- a/include/asm-arm/arch-at91/at91_wdt.h
+++ b/arch/arm/mach-at91/include/mach/at91_wdt.h
diff --git a/include/asm-arm/arch-at91/at91sam9260.h b/arch/arm/mach-at91/include/mach/at91sam9260.h
index 7d166b7a89..7d166b7a89 100644
--- a/include/asm-arm/arch-at91/at91sam9260.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9260.h
diff --git a/include/asm-arm/arch-at91/at91sam9260_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9260_matrix.h
index 020f02ed92..020f02ed92 100644
--- a/include/asm-arm/arch-at91/at91sam9260_matrix.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9260_matrix.h
diff --git a/include/asm-arm/arch-at91/at91sam9263.h b/arch/arm/mach-at91/include/mach/at91sam9263.h
index 7bab1a4b10..7bab1a4b10 100644
--- a/include/asm-arm/arch-at91/at91sam9263.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9263.h
diff --git a/include/asm-arm/arch-at91/at91sam9263_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9263_matrix.h
index 83aaaab773..83aaaab773 100644
--- a/include/asm-arm/arch-at91/at91sam9263_matrix.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9263_matrix.h
diff --git a/include/asm-arm/arch-at91/at91sam9_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9_matrix.h
index 56600c741b..58cafd8527 100644
--- a/include/asm-arm/arch-at91/at91sam9_matrix.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9_matrix.h
@@ -12,17 +12,17 @@
 #define __ASM_ARCH_AT91SAM9_MATRIX_H
 
 #if defined(CONFIG_ARCH_AT91SAM9260) || defined(CONFIG_ARCH_AT91SAM9G20)
-#include <asm/arch/at91sam9260_matrix.h>
+#include <mach/at91sam9260_matrix.h>
 #elif defined(CONFIG_ARCH_AT91SAM9261)
-#include <asm/arch/at91sam9261_matrix.h>
+#include <mach/at91sam9261_matrix.h>
 #elif defined(CONFIG_ARCH_AT91SAM9263)
-#include <asm/arch/at91sam9263_matrix.h>
+#include <mach/at91sam9263_matrix.h>
 #elif defined(CONFIG_ARCH_AT91SAM9RL)
-#include <asm/arch/at91sam9rl_matrix.h>
+#include <mach/at91sam9rl_matrix.h>
 #elif defined(CONFIG_ARCH_AT91CAP9)
-#include <asm/arch/at91cap9_matrix.h>
+#include <mach/at91cap9_matrix.h>
 #elif defined(CONFIG_ARCH_AT91SAM9G45) || defined(CONFIG_ARCH_AT91SAM9M10G45)
-#include <asm/arch/at91sam9g45_matrix.h>
+#include <mach/at91sam9g45_matrix.h>
 #else
 #error "Unsupported AT91SAM9/CAP9 processor"
 #endif
diff --git a/include/asm-arm/arch-at91/at91sam9_sdramc.h b/arch/arm/mach-at91/include/mach/at91sam9_sdramc.h
index 5af2b54b12..5af2b54b12 100644
--- a/include/asm-arm/arch-at91/at91sam9_sdramc.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9_sdramc.h
diff --git a/include/asm-arm/arch-at91/at91sam9_smc.h b/arch/arm/mach-at91/include/mach/at91sam9_smc.h
index d64511b36d..d64511b36d 100644
--- a/include/asm-arm/arch-at91/at91sam9_smc.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9_smc.h
diff --git a/include/asm-arm/arch-at91/board.h b/arch/arm/mach-at91/include/mach/board.h
index 1ab05ade87..1ab05ade87 100644
--- a/include/asm-arm/arch-at91/board.h
+++ b/arch/arm/mach-at91/include/mach/board.h
diff --git a/include/asm-arm/arch-at91/clk.h b/arch/arm/mach-at91/include/mach/clk.h
index f67b4356d9..a9c06836b8 100644
--- a/include/asm-arm/arch-at91/clk.h
+++ b/arch/arm/mach-at91/include/mach/clk.h
@@ -24,7 +24,7 @@
 #ifndef __ASM_ARM_ARCH_CLK_H__
 #define __ASM_ARM_ARCH_CLK_H__
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 static inline unsigned long get_macb_pclk_rate(unsigned int dev_id)
 {
diff --git a/include/asm-arm/arch-at91/gpio.h b/arch/arm/mach-at91/include/mach/gpio.h
index 1b0238c4cb..76d53ba248 100644
--- a/include/asm-arm/arch-at91/gpio.h
+++ b/arch/arm/mach-at91/include/mach/gpio.h
@@ -15,8 +15,8 @@
 
 #include <asm/io.h>
 #include <asm-generic/errno.h>
-#include <asm/arch/at91_pio.h>
-#include <asm/arch/hardware.h>
+#include <mach/at91_pio.h>
+#include <mach/hardware.h>
 
 #define PIN_BASE		32
 
diff --git a/include/asm-arm/arch-at91/hardware.h b/arch/arm/mach-at91/include/mach/hardware.h
index 6f48c3439e..82b574eb0a 100644
--- a/include/asm-arm/arch-at91/hardware.h
+++ b/arch/arm/mach-at91/include/mach/hardware.h
@@ -15,21 +15,21 @@
 #define __ASM_ARCH_HARDWARE_H
 
 #if defined(CONFIG_ARCH_AT91RM9200)
-#include <asm/arch/at91rm9200.h>
+#include <mach/at91rm9200.h>
 #elif defined(CONFIG_ARCH_AT91SAM9260) || defined(CONFIG_ARCH_AT91SAM9G20)
-#include <asm/arch/at91sam9260.h>
+#include <mach/at91sam9260.h>
 #elif defined(CONFIG_ARCH_AT91SAM9261) || defined(CONFIG_ARCH_AT91SAM9G10)
-#include <asm/arch/at91sam9261.h>
+#include <mach/at91sam9261.h>
 #elif defined(CONFIG_ARCH_AT91SAM9263)
-#include <asm/arch/at91sam9263.h>
+#include <mach/at91sam9263.h>
 #elif defined(CONFIG_ARCH_AT91SAM9RL)
-#include <asm/arch/at91sam9rl.h>
+#include <mach/at91sam9rl.h>
 #elif defined(CONFIG_ARCH_AT91SAM9G45) || defined(CONFIG_ARCH_AT91SAM9M10G45)
-#include <asm/arch/at91sam9g45.h>
+#include <mach/at91sam9g45.h>
 #elif defined(CONFIG_ARCH_AT91CAP9)
-#include <asm/arch/at91cap9.h>
+#include <mach/at91cap9.h>
 #elif defined(CONFIG_ARCH_AT91X40)
-#include <asm/arch/at91x40.h>
+#include <mach/at91x40.h>
 #else
 #error "Unsupported AT91 processor"
 #endif
diff --git a/include/asm-arm/arch-at91/io.h b/arch/arm/mach-at91/include/mach/io.h
index f09b2df0e3..f09b2df0e3 100644
--- a/include/asm-arm/arch-at91/io.h
+++ b/arch/arm/mach-at91/include/mach/io.h
diff --git a/include/asm-arm/arch-at91/sam9_smc.h b/arch/arm/mach-at91/include/mach/sam9_smc.h
index bf72cfb345..bf72cfb345 100644
--- a/include/asm-arm/arch-at91/sam9_smc.h
+++ b/arch/arm/mach-at91/include/mach/sam9_smc.h
diff --git a/arch/arm/mach-at91/lowlevel_init.S b/arch/arm/mach-at91/lowlevel_init.S
index fa6577a6ab..5bd32e89b0 100644
--- a/arch/arm/mach-at91/lowlevel_init.S
+++ b/arch/arm/mach-at91/lowlevel_init.S
@@ -28,14 +28,14 @@
 
 #include <linux/autoconf.h>
 #include <config.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/at91_pmc.h>
-#include <asm/arch/at91_pio.h>
-#include <asm/arch/at91_rstc.h>
-#include <asm/arch/at91_wdt.h>
-#include <asm/arch/at91sam9_matrix.h>
-#include <asm/arch/at91sam9_sdramc.h>
-#include <asm/arch/at91sam9_smc.h>
+#include <mach/hardware.h>
+#include <mach/at91_pmc.h>
+#include <mach/at91_pio.h>
+#include <mach/at91_rstc.h>
+#include <mach/at91_wdt.h>
+#include <mach/at91sam9_matrix.h>
+#include <mach/at91sam9_sdramc.h>
+#include <mach/at91sam9_smc.h>
 
 _TEXT_BASE:
 	.word	TEXT_BASE
diff --git a/arch/arm/mach-at91/sam9_smc.c b/arch/arm/mach-at91/sam9_smc.c
index f3f885c72b..3e7de2fc58 100644
--- a/arch/arm/mach-at91/sam9_smc.c
+++ b/arch/arm/mach-at91/sam9_smc.c
@@ -10,11 +10,11 @@
 
 #include <common.h>
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/io.h>
+#include <mach/hardware.h>
+#include <mach/io.h>
 
-#include <asm/arch/at91sam9_smc.h>
-#include <asm/arch/sam9_smc.h>
+#include <mach/at91sam9_smc.h>
+#include <mach/sam9_smc.h>
 
 void sam9_smc_configure(int cs, struct sam9_smc_config* config)
 {
diff --git a/include/asm-arm/arch-at91rm9200/AT91RM9200.h b/arch/arm/mach-at91rm9200/include/mach/AT91RM9200.h
index 97d470484c..97d470484c 100644
--- a/include/asm-arm/arch-at91rm9200/AT91RM9200.h
+++ b/arch/arm/mach-at91rm9200/include/mach/AT91RM9200.h
diff --git a/include/asm-arm/arch-at91rm9200/hardware.h b/arch/arm/mach-at91rm9200/include/mach/hardware.h
index a84c60a992..a84c60a992 100644
--- a/include/asm-arm/arch-at91rm9200/hardware.h
+++ b/arch/arm/mach-at91rm9200/include/mach/hardware.h
diff --git a/arch/arm/mach-imx/clko.c b/arch/arm/mach-imx/clko.c
index 11edfb5ed2..6a8072213c 100644
--- a/arch/arm/mach-imx/clko.c
+++ b/arch/arm/mach-imx/clko.c
@@ -1,8 +1,8 @@
 #include <common.h>
 #include <command.h>
 #include <getopt.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/clock.h>
+#include <mach/imx-regs.h>
+#include <mach/clock.h>
 
 static int do_clko (cmd_tbl_t *cmdtp, int argc, char *argv[])
 {
diff --git a/arch/arm/mach-imx/clocksource.c b/arch/arm/mach-imx/clocksource.c
index 6c5cc11410..09d43183b8 100644
--- a/arch/arm/mach-imx/clocksource.c
+++ b/arch/arm/mach-imx/clocksource.c
@@ -33,8 +33,8 @@
 #include <init.h>
 #include <clock.h>
 #include <notifier.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/clock.h>
+#include <mach/imx-regs.h>
+#include <mach/clock.h>
 
 #define GPT(x) __REG(IMX_TIM1_BASE + (x))
 
diff --git a/arch/arm/mach-imx/gpio.c b/arch/arm/mach-imx/gpio.c
index 49566e41c3..2e1362c965 100644
--- a/arch/arm/mach-imx/gpio.c
+++ b/arch/arm/mach-imx/gpio.c
@@ -24,7 +24,7 @@
  */
 
 #include <common.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 
 void imx_gpio_mode(int gpio_mode)
 {
diff --git a/arch/arm/mach-imx/imx21.c b/arch/arm/mach-imx/imx21.c
index 90b1eef99c..0741f112a3 100644
--- a/arch/arm/mach-imx/imx21.c
+++ b/arch/arm/mach-imx/imx21.c
@@ -16,7 +16,7 @@
  */
 
 #include <common.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 
 int imx_silicon_revision(void)
 {
diff --git a/arch/arm/mach-imx/imx27.c b/arch/arm/mach-imx/imx27.c
index 7255a77704..c33346aaf6 100644
--- a/arch/arm/mach-imx/imx27.c
+++ b/arch/arm/mach-imx/imx27.c
@@ -16,7 +16,7 @@
  */
 
 #include <common.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 
 int imx_silicon_revision(void)
 {
diff --git a/include/asm-arm/arch-imx/clock-imx1.h b/arch/arm/mach-imx/include/mach/clock-imx1.h
index 8d456b84b2..8d456b84b2 100644
--- a/include/asm-arm/arch-imx/clock-imx1.h
+++ b/arch/arm/mach-imx/include/mach/clock-imx1.h
diff --git a/include/asm-arm/arch-imx/clock.h b/arch/arm/mach-imx/include/mach/clock.h
index c60417922b..c60417922b 100644
--- a/include/asm-arm/arch-imx/clock.h
+++ b/arch/arm/mach-imx/include/mach/clock.h
diff --git a/include/asm-arm/arch-imx/esdctl.h b/arch/arm/mach-imx/include/mach/esdctl.h
index 7f3c66fc62..7f3c66fc62 100644
--- a/include/asm-arm/arch-imx/esdctl.h
+++ b/arch/arm/mach-imx/include/mach/esdctl.h
diff --git a/include/asm-arm/arch-imx/generic.h b/arch/arm/mach-imx/include/mach/generic.h
index 99a53a49a4..99a53a49a4 100644
--- a/include/asm-arm/arch-imx/generic.h
+++ b/arch/arm/mach-imx/include/mach/generic.h
diff --git a/include/asm-arm/arch-imx/gpio.h b/arch/arm/mach-imx/include/mach/gpio.h
index 71298f4e54..71298f4e54 100644
--- a/include/asm-arm/arch-imx/gpio.h
+++ b/arch/arm/mach-imx/include/mach/gpio.h
diff --git a/include/asm-arm/arch-imx/imx-nand.h b/arch/arm/mach-imx/include/mach/imx-nand.h
index 3fdd8bf342..3fdd8bf342 100644
--- a/include/asm-arm/arch-imx/imx-nand.h
+++ b/arch/arm/mach-imx/include/mach/imx-nand.h
diff --git a/include/asm-arm/arch-imx/imx-pll.h b/arch/arm/mach-imx/include/mach/imx-pll.h
index df7e73efea..df7e73efea 100644
--- a/include/asm-arm/arch-imx/imx-pll.h
+++ b/arch/arm/mach-imx/include/mach/imx-pll.h
diff --git a/include/asm-arm/arch-imx/imx-regs.h b/arch/arm/mach-imx/include/mach/imx-regs.h
index b7a83a4e25..459714e9b4 100644
--- a/include/asm-arm/arch-imx/imx-regs.h
+++ b/arch/arm/mach-imx/include/mach/imx-regs.h
@@ -40,17 +40,17 @@
 #endif
 
 #ifdef CONFIG_ARCH_IMX1
-# include <asm/arch/imx1-regs.h>
+# include <mach/imx1-regs.h>
 #elif defined CONFIG_ARCH_IMX21
-# include <asm/arch/imx21-regs.h>
+# include <mach/imx21-regs.h>
 #elif defined CONFIG_ARCH_IMX27
-# include <asm/arch/imx27-regs.h>
+# include <mach/imx27-regs.h>
 #elif defined CONFIG_ARCH_IMX31
-# include <asm/arch/imx31-regs.h>
+# include <mach/imx31-regs.h>
 #elif defined CONFIG_ARCH_IMX35
-# include <asm/arch/imx35-regs.h>
+# include <mach/imx35-regs.h>
 #elif defined CONFIG_ARCH_IMX25
-# include <asm/arch/imx25-regs.h>
+# include <mach/imx25-regs.h>
 #else
 # error "unknown i.MX soc type"
 #endif
diff --git a/include/asm-arm/arch-imx/imx1-regs.h b/arch/arm/mach-imx/include/mach/imx1-regs.h
index 0d6fd9200e..0d6fd9200e 100644
--- a/include/asm-arm/arch-imx/imx1-regs.h
+++ b/arch/arm/mach-imx/include/mach/imx1-regs.h
diff --git a/include/asm-arm/arch-imx/imx21-regs.h b/arch/arm/mach-imx/include/mach/imx21-regs.h
index b8cb06075f..b8cb06075f 100644
--- a/include/asm-arm/arch-imx/imx21-regs.h
+++ b/arch/arm/mach-imx/include/mach/imx21-regs.h
diff --git a/include/asm-arm/arch-imx/imx25-flash-header.h b/arch/arm/mach-imx/include/mach/imx25-flash-header.h
index 59860dbda7..59860dbda7 100644
--- a/include/asm-arm/arch-imx/imx25-flash-header.h
+++ b/arch/arm/mach-imx/include/mach/imx25-flash-header.h
diff --git a/include/asm-arm/arch-imx/imx25-regs.h b/arch/arm/mach-imx/include/mach/imx25-regs.h
index 001b5157e1..001b5157e1 100644
--- a/include/asm-arm/arch-imx/imx25-regs.h
+++ b/arch/arm/mach-imx/include/mach/imx25-regs.h
diff --git a/include/asm-arm/arch-imx/imx27-regs.h b/arch/arm/mach-imx/include/mach/imx27-regs.h
index 33d67d6f50..33d67d6f50 100644
--- a/include/asm-arm/arch-imx/imx27-regs.h
+++ b/arch/arm/mach-imx/include/mach/imx27-regs.h
diff --git a/include/asm-arm/arch-imx/imx31-regs.h b/arch/arm/mach-imx/include/mach/imx31-regs.h
index 3cae3a21db..3cae3a21db 100644
--- a/include/asm-arm/arch-imx/imx31-regs.h
+++ b/arch/arm/mach-imx/include/mach/imx31-regs.h
diff --git a/include/asm-arm/arch-imx/imx35-regs.h b/arch/arm/mach-imx/include/mach/imx35-regs.h
index a9b363868d..a9b363868d 100644
--- a/include/asm-arm/arch-imx/imx35-regs.h
+++ b/arch/arm/mach-imx/include/mach/imx35-regs.h
diff --git a/include/asm-arm/arch-imx/imxfb.h b/arch/arm/mach-imx/include/mach/imxfb.h
index ca7ea32fb4..ca7ea32fb4 100644
--- a/include/asm-arm/arch-imx/imxfb.h
+++ b/arch/arm/mach-imx/include/mach/imxfb.h
diff --git a/include/asm-arm/arch-imx/iomux-mx25.h b/arch/arm/mach-imx/include/mach/iomux-mx25.h
index aaacc3e722..020b7f214f 100644
--- a/include/asm-arm/arch-imx/iomux-mx25.h
+++ b/arch/arm/mach-imx/include/mach/iomux-mx25.h
@@ -1,7 +1,7 @@
 #ifndef __MACH_IOMUX_MX25_H__
 #define __MACH_IOMUX_MX25_H__
 
-#include <asm/arch/iomux-v3.h>
+#include <mach/iomux-v3.h>
 
 #define SRE		(1 << 0)
 #define DSE_STD		(0 << 1)
diff --git a/include/asm-arm/arch-imx/iomux-mx31.h b/arch/arm/mach-imx/include/mach/iomux-mx31.h
index 16c8e51e8c..16c8e51e8c 100644
--- a/include/asm-arm/arch-imx/iomux-mx31.h
+++ b/arch/arm/mach-imx/include/mach/iomux-mx31.h
diff --git a/include/asm-arm/arch-imx/iomux-mx35.h b/arch/arm/mach-imx/include/mach/iomux-mx35.h
index 16a109a156..8a56d86791 100644
--- a/include/asm-arm/arch-imx/iomux-mx35.h
+++ b/arch/arm/mach-imx/include/mach/iomux-mx35.h
@@ -19,7 +19,7 @@
 #ifndef __MACH_IOMUX_MX35_H__
 #define __MACH_IOMUX_MX35_H__
 
-#include <asm/arch/iomux-v3.h>
+#include <mach/iomux-v3.h>
 
 /*
  * The naming convention for the pad modes is MX35_PAD_<padname>__<padmode>
diff --git a/include/asm-arm/arch-imx/iomux-v3.h b/arch/arm/mach-imx/include/mach/iomux-v3.h
index 8b2f1ae7f9..8b2f1ae7f9 100644
--- a/include/asm-arm/arch-imx/iomux-v3.h
+++ b/arch/arm/mach-imx/include/mach/iomux-v3.h
diff --git a/include/asm-arm/arch-imx/pmic.h b/arch/arm/mach-imx/include/mach/pmic.h
index e9a951bd38..e9a951bd38 100644
--- a/include/asm-arm/arch-imx/pmic.h
+++ b/arch/arm/mach-imx/include/mach/pmic.h
diff --git a/include/asm-arm/arch-imx/spi.h b/arch/arm/mach-imx/include/mach/spi.h
index 08be445e8e..08be445e8e 100644
--- a/include/asm-arm/arch-imx/spi.h
+++ b/arch/arm/mach-imx/include/mach/spi.h
diff --git a/include/asm-arm/arch-imx/u-boot.lds.h b/arch/arm/mach-imx/include/mach/u-boot.lds.h
index 52eb458f0f..52eb458f0f 100644
--- a/include/asm-arm/arch-imx/u-boot.lds.h
+++ b/arch/arm/mach-imx/include/mach/u-boot.lds.h
diff --git a/arch/arm/mach-imx/iomux-v2.c b/arch/arm/mach-imx/iomux-v2.c
index d040deeec5..abb2ebe195 100644
--- a/arch/arm/mach-imx/iomux-v2.c
+++ b/arch/arm/mach-imx/iomux-v2.c
@@ -19,8 +19,8 @@
 
 #include <common.h>
 #include <asm/io.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/iomux-mx31.h>
+#include <mach/imx-regs.h>
+#include <mach/iomux-mx31.h>
 
 /*
  * IOMUX register (base) addresses
diff --git a/arch/arm/mach-imx/iomux-v3.c b/arch/arm/mach-imx/iomux-v3.c
index 3b9416e95f..a74f942509 100644
--- a/arch/arm/mach-imx/iomux-v3.c
+++ b/arch/arm/mach-imx/iomux-v3.c
@@ -20,8 +20,8 @@
  */
 #include <common.h>
 #include <asm/io.h>
-#include <asm/arch/iomux-v3.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/iomux-v3.h>
+#include <mach/imx-regs.h>
 
 /*
  * setups a single pin:
diff --git a/arch/arm/mach-imx/speed-imx1.c b/arch/arm/mach-imx/speed-imx1.c
index 9db5d113c5..41b56deeb4 100644
--- a/arch/arm/mach-imx/speed-imx1.c
+++ b/arch/arm/mach-imx/speed-imx1.c
@@ -23,8 +23,8 @@
 
 
 #include <common.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/clock.h>
+#include <mach/imx-regs.h>
+#include <mach/clock.h>
 #include <init.h>
 #include <driver.h>
 
diff --git a/arch/arm/mach-imx/speed-imx21.c b/arch/arm/mach-imx/speed-imx21.c
index c9d6d88351..aa0a5281d8 100644
--- a/arch/arm/mach-imx/speed-imx21.c
+++ b/arch/arm/mach-imx/speed-imx21.c
@@ -16,9 +16,9 @@
  */
 
 #include <common.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/generic.h>
-#include <asm/arch/clock.h>
+#include <mach/imx-regs.h>
+#include <mach/generic.h>
+#include <mach/clock.h>
 #include <init.h>
 
 #ifndef CLK32
diff --git a/arch/arm/mach-imx/speed-imx25.c b/arch/arm/mach-imx/speed-imx25.c
index bc2af193a8..be20880b25 100644
--- a/arch/arm/mach-imx/speed-imx25.c
+++ b/arch/arm/mach-imx/speed-imx25.c
@@ -1,7 +1,7 @@
 #include <common.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 #include <asm/io.h>
-#include <asm/arch/clock.h>
+#include <mach/clock.h>
 #include <init.h>
 
 unsigned long imx_get_mpllclk(void)
diff --git a/arch/arm/mach-imx/speed-imx27.c b/arch/arm/mach-imx/speed-imx27.c
index 61fcc72bf2..deaca1eb4d 100644
--- a/arch/arm/mach-imx/speed-imx27.c
+++ b/arch/arm/mach-imx/speed-imx27.c
@@ -16,9 +16,9 @@
  */
 
 #include <common.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/generic.h>
-#include <asm/arch/clock.h>
+#include <mach/imx-regs.h>
+#include <mach/generic.h>
+#include <mach/clock.h>
 #include <init.h>
 
 #ifndef CLK32
diff --git a/arch/arm/mach-imx/speed-imx31.c b/arch/arm/mach-imx/speed-imx31.c
index 77f861053c..630c648dbf 100644
--- a/arch/arm/mach-imx/speed-imx31.c
+++ b/arch/arm/mach-imx/speed-imx31.c
@@ -17,8 +17,8 @@
 
 #include <common.h>
 #include <asm/io.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/clock.h>
+#include <mach/imx-regs.h>
+#include <mach/clock.h>
 #include <init.h>
 
 ulong imx_get_mpl_dpdgck_clk(void)
diff --git a/arch/arm/mach-imx/speed-imx35.c b/arch/arm/mach-imx/speed-imx35.c
index 43a6ddb350..8d1614f3de 100644
--- a/arch/arm/mach-imx/speed-imx35.c
+++ b/arch/arm/mach-imx/speed-imx35.c
@@ -16,9 +16,9 @@
  */
 
 #include <common.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 #include <asm/io.h>
-#include <asm/arch/clock.h>
+#include <mach/clock.h>
 #include <init.h>
 
 unsigned long imx_get_mpllclk(void)
diff --git a/arch/arm/mach-netx/clocksource.c b/arch/arm/mach-netx/clocksource.c
index b326c15532..818709df47 100644
--- a/arch/arm/mach-netx/clocksource.c
+++ b/arch/arm/mach-netx/clocksource.c
@@ -25,7 +25,7 @@
 #include <common.h>
 #include <init.h>
 #include <clock.h>
-#include <asm/arch/netx-regs.h>
+#include <mach/netx-regs.h>
 
 uint64_t netx_clocksource_read(void)
 {
diff --git a/arch/arm/mach-netx/generic.c b/arch/arm/mach-netx/generic.c
index 985f3b8cef..4af945f4d6 100644
--- a/arch/arm/mach-netx/generic.c
+++ b/arch/arm/mach-netx/generic.c
@@ -20,7 +20,7 @@
 
 #include <common.h>
 #include <command.h>
-#include <asm/arch/netx-regs.h>
+#include <mach/netx-regs.h>
 #include "eth_firmware.h"
 
 struct fw_header {
diff --git a/include/asm-arm/arch-netx/netx-cm.h b/arch/arm/mach-netx/include/mach/netx-cm.h
index 37cf76d1f9..37cf76d1f9 100644
--- a/include/asm-arm/arch-netx/netx-cm.h
+++ b/arch/arm/mach-netx/include/mach/netx-cm.h
diff --git a/include/asm-arm/arch-netx/netx-eth.h b/arch/arm/mach-netx/include/mach/netx-eth.h
index 654cfe73d3..654cfe73d3 100644
--- a/include/asm-arm/arch-netx/netx-eth.h
+++ b/arch/arm/mach-netx/include/mach/netx-eth.h
diff --git a/include/asm-arm/arch-netx/netx-regs.h b/arch/arm/mach-netx/include/mach/netx-regs.h
index c2278cdc48..c2278cdc48 100644
--- a/include/asm-arm/arch-netx/netx-regs.h
+++ b/arch/arm/mach-netx/include/mach/netx-regs.h
diff --git a/include/asm-arm/arch-netx/netx-xc.h b/arch/arm/mach-netx/include/mach/netx-xc.h
index 060a9b3b02..060a9b3b02 100644
--- a/include/asm-arm/arch-netx/netx-xc.h
+++ b/arch/arm/mach-netx/include/mach/netx-xc.h
diff --git a/arch/arm/mach-netx/interrupts.c b/arch/arm/mach-netx/interrupts.c
index d163a51fd3..af78e19bfd 100644
--- a/arch/arm/mach-netx/interrupts.c
+++ b/arch/arm/mach-netx/interrupts.c
@@ -1,6 +1,6 @@
 #include <common.h>
 
-#include <asm/arch/netx-regs.h>
+#include <mach/netx-regs.h>
 
 int timer_init (void)
 {
diff --git a/arch/arm/mach-netx/netx-cm.c b/arch/arm/mach-netx/netx-cm.c
index 2a7ac1fb9e..58b204274a 100644
--- a/arch/arm/mach-netx/netx-cm.c
+++ b/arch/arm/mach-netx/netx-cm.c
@@ -1,6 +1,6 @@
 #include <common.h>
-#include <asm/arch/netx-regs.h>
-#include <asm/arch/netx-cm.h>
+#include <mach/netx-regs.h>
+#include <mach/netx-cm.h>
 
 #define I2C_CTRL_ENABLE		(1<<0)
 #define I2C_CTRL_SPEED_25	(0<<1)
diff --git a/arch/arm/mach-omap/gpmc.c b/arch/arm/mach-omap/gpmc.c
index 4e7383ccc0..2b9964950d 100644
--- a/arch/arm/mach-omap/gpmc.c
+++ b/arch/arm/mach-omap/gpmc.c
@@ -30,10 +30,10 @@
 #include <common.h>
 #include <init.h>
 #include <asm/io.h>
-#include <asm/arch/silicon.h>
-#include <asm/arch/gpmc.h>
-#include <asm/arch/sys_info.h>
-#include <asm/arch/syslib.h>
+#include <mach/silicon.h>
+#include <mach/gpmc.h>
+#include <mach/sys_info.h>
+#include <mach/syslib.h>
 
 /**
  * @brief Do a Generic initialization of GPMC. if you choose otherwise,
diff --git a/include/asm-arm/arch-omap/clocks.h b/arch/arm/mach-omap/include/mach/clocks.h
index 042f777ac2..1221238de8 100644
--- a/include/asm-arm/arch-omap/clocks.h
+++ b/arch/arm/mach-omap/include/mach/clocks.h
@@ -42,7 +42,7 @@
 #define S38_4M		38400000
 
 #ifdef CONFIG_ARCH_OMAP3
-#include <asm/arch/omap3-clock.h>
+#include <mach/omap3-clock.h>
 #endif
 
 #endif /* __OMAP_CLOCKS_H_ */
diff --git a/include/asm-arm/arch-omap/control.h b/arch/arm/mach-omap/include/mach/control.h
index 8301ead5f0..7c1614cc24 100644
--- a/include/asm-arm/arch-omap/control.h
+++ b/arch/arm/mach-omap/include/mach/control.h
@@ -91,7 +91,7 @@
 
 /**
  * macro for Padconfig Registers @see
- * include/asm/arch-arm/arch-omap/omap3-mux.h
+ * include/mach-arm/arch-omap/omap3-mux.h
  */
 #define	CP(X) (CONTROL_PADCONF_##X)
 
diff --git a/include/asm-arm/arch-omap/gpmc.h b/arch/arm/mach-omap/include/mach/gpmc.h
index a658cf00e7..a658cf00e7 100644
--- a/include/asm-arm/arch-omap/gpmc.h
+++ b/arch/arm/mach-omap/include/mach/gpmc.h
diff --git a/include/asm-arm/arch-omap/gpmc_nand.h b/arch/arm/mach-omap/include/mach/gpmc_nand.h
index c6c51d5d52..c6c51d5d52 100644
--- a/include/asm-arm/arch-omap/gpmc_nand.h
+++ b/arch/arm/mach-omap/include/mach/gpmc_nand.h
diff --git a/include/asm-arm/arch-omap/intc.h b/arch/arm/mach-omap/include/mach/intc.h
index 48fcf3d1d6..48fcf3d1d6 100644
--- a/include/asm-arm/arch-omap/intc.h
+++ b/arch/arm/mach-omap/include/mach/intc.h
diff --git a/include/asm-arm/arch-omap/omap3-clock.h b/arch/arm/mach-omap/include/mach/omap3-clock.h
index 22694f2367..22694f2367 100644
--- a/include/asm-arm/arch-omap/omap3-clock.h
+++ b/arch/arm/mach-omap/include/mach/omap3-clock.h
diff --git a/include/asm-arm/arch-omap/omap3-mux.h b/arch/arm/mach-omap/include/mach/omap3-mux.h
index 2badc3f851..2badc3f851 100644
--- a/include/asm-arm/arch-omap/omap3-mux.h
+++ b/arch/arm/mach-omap/include/mach/omap3-mux.h
diff --git a/include/asm-arm/arch-omap/omap3-silicon.h b/arch/arm/mach-omap/include/mach/omap3-silicon.h
index dde241272f..dde241272f 100644
--- a/include/asm-arm/arch-omap/omap3-silicon.h
+++ b/arch/arm/mach-omap/include/mach/omap3-silicon.h
diff --git a/include/asm-arm/arch-omap/omap3-smx.h b/arch/arm/mach-omap/include/mach/omap3-smx.h
index 78cff95f5b..78cff95f5b 100644
--- a/include/asm-arm/arch-omap/omap3-smx.h
+++ b/arch/arm/mach-omap/include/mach/omap3-smx.h
diff --git a/include/asm-arm/arch-omap/sdrc.h b/arch/arm/mach-omap/include/mach/sdrc.h
index 9d2d2d1107..9d2d2d1107 100644
--- a/include/asm-arm/arch-omap/sdrc.h
+++ b/arch/arm/mach-omap/include/mach/sdrc.h
diff --git a/include/asm-arm/arch-omap/silicon.h b/arch/arm/mach-omap/include/mach/silicon.h
index df41a74f2f..22daa5c964 100644
--- a/include/asm-arm/arch-omap/silicon.h
+++ b/arch/arm/mach-omap/include/mach/silicon.h
@@ -23,7 +23,7 @@
 
 /* Each platform silicon header comes here */
 #ifdef CONFIG_ARCH_OMAP3
-#include <asm/arch/omap3-silicon.h>
+#include <mach/omap3-silicon.h>
 #endif
 
 /* If Architecture specific init functions are present */
diff --git a/include/asm-arm/arch-omap/sys_info.h b/arch/arm/mach-omap/include/mach/sys_info.h
index 43967209f1..43967209f1 100644
--- a/include/asm-arm/arch-omap/sys_info.h
+++ b/arch/arm/mach-omap/include/mach/sys_info.h
diff --git a/include/asm-arm/arch-omap/syslib.h b/arch/arm/mach-omap/include/mach/syslib.h
index c89f50b816..c89f50b816 100644
--- a/include/asm-arm/arch-omap/syslib.h
+++ b/arch/arm/mach-omap/include/mach/syslib.h
diff --git a/include/asm-arm/arch-omap/timers.h b/arch/arm/mach-omap/include/mach/timers.h
index a93824378c..a93824378c 100644
--- a/include/asm-arm/arch-omap/timers.h
+++ b/arch/arm/mach-omap/include/mach/timers.h
diff --git a/include/asm-arm/arch-omap/wdt.h b/arch/arm/mach-omap/include/mach/wdt.h
index 532252d080..532252d080 100644
--- a/include/asm-arm/arch-omap/wdt.h
+++ b/arch/arm/mach-omap/include/mach/wdt.h
diff --git a/arch/arm/mach-omap/omap3_clock.c b/arch/arm/mach-omap/omap3_clock.c
index ce26cb5fac..4e81ae80d4 100644
--- a/arch/arm/mach-omap/omap3_clock.c
+++ b/arch/arm/mach-omap/omap3_clock.c
@@ -40,11 +40,11 @@
 
 #include <common.h>
 #include <asm/io.h>
-#include <asm/arch/silicon.h>
-#include <asm/arch/clocks.h>
-#include <asm/arch/timers.h>
-#include <asm/arch/sys_info.h>
-#include <asm/arch/syslib.h>
+#include <mach/silicon.h>
+#include <mach/clocks.h>
+#include <mach/timers.h>
+#include <mach/sys_info.h>
+#include <mach/syslib.h>
 
 /* Following functions are exported from omap3_clock_core.S */
 #ifdef CONFIG_OMAP3_COPY_CLOCK_SRAM
diff --git a/arch/arm/mach-omap/omap3_clock_core.S b/arch/arm/mach-omap/omap3_clock_core.S
index 6e10563fb4..872ae5abcd 100644
--- a/arch/arm/mach-omap/omap3_clock_core.S
+++ b/arch/arm/mach-omap/omap3_clock_core.S
@@ -37,9 +37,9 @@
  */
 
 #include <config.h>
-#include <asm/arch/silicon.h>
-#include <asm/arch/clocks.h>
-#include <asm/arch/gpmc.h>
+#include <mach/silicon.h>
+#include <mach/clocks.h>
+#include <mach/gpmc.h>
 
 #ifdef CONFIG_OMAP3_COPY_CLOCK_SRAM
 /**
diff --git a/arch/arm/mach-omap/omap3_core.S b/arch/arm/mach-omap/omap3_core.S
index dece199fae..76f80e68ca 100644
--- a/arch/arm/mach-omap/omap3_core.S
+++ b/arch/arm/mach-omap/omap3_core.S
@@ -37,9 +37,9 @@
  */
 
 #include <config.h>
-#include <asm/arch/silicon.h>
-#include <asm/arch/wdt.h>
-#include <asm/arch/clocks.h>
+#include <mach/silicon.h>
+#include <mach/wdt.h>
+#include <mach/clocks.h>
 
 #ifdef CONFIG_ARCH_HAS_LOWLEVEL_INIT
 .globl arch_init_lowlevel
diff --git a/arch/arm/mach-omap/omap3_generic.c b/arch/arm/mach-omap/omap3_generic.c
index 3acf911251..794d2fa8f2 100644
--- a/arch/arm/mach-omap/omap3_generic.c
+++ b/arch/arm/mach-omap/omap3_generic.c
@@ -37,15 +37,15 @@
 #include <common.h>
 #include <init.h>
 #include <asm/io.h>
-#include <asm/arch/silicon.h>
-#include <asm/arch/gpmc.h>
-#include <asm/arch/sdrc.h>
-#include <asm/arch/control.h>
-#include <asm/arch/omap3-smx.h>
-#include <asm/arch/clocks.h>
-#include <asm/arch/wdt.h>
-#include <asm/arch/sys_info.h>
-#include <asm/arch/syslib.h>
+#include <mach/silicon.h>
+#include <mach/gpmc.h>
+#include <mach/sdrc.h>
+#include <mach/control.h>
+#include <mach/omap3-smx.h>
+#include <mach/clocks.h>
+#include <mach/wdt.h>
+#include <mach/sys_info.h>
+#include <mach/syslib.h>
 
 /**
  * @brief Reset the CPU
diff --git a/arch/arm/mach-omap/s32k_clksource.c b/arch/arm/mach-omap/s32k_clksource.c
index 4166d83d75..353670c583 100644
--- a/arch/arm/mach-omap/s32k_clksource.c
+++ b/arch/arm/mach-omap/s32k_clksource.c
@@ -34,11 +34,11 @@
 #include <clock.h>
 #include <init.h>
 #include <asm/io.h>
-#include <asm/arch/silicon.h>
-#include <asm/arch/clocks.h>
-#include <asm/arch/timers.h>
-#include <asm/arch/sys_info.h>
-#include <asm/arch/syslib.h>
+#include <mach/silicon.h>
+#include <mach/clocks.h>
+#include <mach/timers.h>
+#include <mach/sys_info.h>
+#include <mach/syslib.h>
 
 /**
  * @brief Provide a simple clock read
diff --git a/arch/arm/mach-omap/syslib.c b/arch/arm/mach-omap/syslib.c
index 0ca4ef21d3..51824dadb0 100644
--- a/arch/arm/mach-omap/syslib.c
+++ b/arch/arm/mach-omap/syslib.c
@@ -32,7 +32,7 @@
 
 #include <config.h>
 #include <asm/io.h>
-#include <asm/arch/syslib.h>
+#include <mach/syslib.h>
 
 /**
  * @brief simple spin loop
diff --git a/arch/arm/mach-s3c24xx/generic.c b/arch/arm/mach-s3c24xx/generic.c
index 515731a5a4..4613e59760 100644
--- a/arch/arm/mach-s3c24xx/generic.c
+++ b/arch/arm/mach-s3c24xx/generic.c
@@ -27,7 +27,7 @@
 #include <init.h>
 #include <clock.h>
 #include <asm/io.h>
-#include <asm/arch/s3c24x0-iomap.h>
+#include <mach/s3c24x0-iomap.h>
 
 /**
  * Calculate the current M-PLL clock.
diff --git a/include/asm-arm/arch-s3c24xx/s3c24x0-iomap.h b/arch/arm/mach-s3c24xx/include/mach/s3c24x0-iomap.h
index ab3dc4f20a..ab3dc4f20a 100644
--- a/include/asm-arm/arch-s3c24xx/s3c24x0-iomap.h
+++ b/arch/arm/mach-s3c24xx/include/mach/s3c24x0-iomap.h
diff --git a/include/asm-arm/arch-s3c24xx/s3c24x0-nand.h b/arch/arm/mach-s3c24xx/include/mach/s3c24x0-nand.h
index 05f9cf0fd1..05f9cf0fd1 100644
--- a/include/asm-arm/arch-s3c24xx/s3c24x0-nand.h
+++ b/arch/arm/mach-s3c24xx/include/mach/s3c24x0-nand.h
diff --git a/include/asm-arm/arch-s3c24xx/s3c24xx-generic.h b/arch/arm/mach-s3c24xx/include/mach/s3c24xx-generic.h
index b8abcf1d9c..b8abcf1d9c 100644
--- a/include/asm-arm/arch-s3c24xx/s3c24xx-generic.h
+++ b/arch/arm/mach-s3c24xx/include/mach/s3c24xx-generic.h
diff --git a/arch/arm/mach-s3c24xx/lowlevel-init.S b/arch/arm/mach-s3c24xx/lowlevel-init.S
index d27cfa5dfb..fd6b0f396d 100644
--- a/arch/arm/mach-s3c24xx/lowlevel-init.S
+++ b/arch/arm/mach-s3c24xx/lowlevel-init.S
@@ -19,7 +19,7 @@
  */
 
 #include <config.h>
-#include <asm/arch/s3c24x0-iomap.h>
+#include <mach/s3c24x0-iomap.h>
 
 	.section ".text_bare_init.s3c24x0_disable_wd","ax"
 
diff --git a/arch/blackfin/Makefile b/arch/blackfin/Makefile
index 9aa9c497b9..6199fed6f3 100644
--- a/arch/blackfin/Makefile
+++ b/arch/blackfin/Makefile
@@ -16,29 +16,9 @@ ifndef CONFIG_BFIN_BOOT_BYPASS
 all: uboot.ldr
 endif
 
-ifeq ($(incdir-y),)
-incdir-y := $(machine-y)
-endif
-INCDIR   := arch-$(incdir-y)
-
-#	Update machine arch and proc symlinks if something which affects
-#	them changed.  We use .arch to indicate when they were updated
-#	last, otherwise make uses the target directory mtime.
-
-include/asm-blackfin/.arch: $(wildcard include/config/arch/*.h) include/config/auto.conf
-	@echo '  SYMLINK include/asm-blackfin/arch -> include/asm-blackfin/$(INCDIR)'
-ifneq ($(KBUILD_SRC),)
-	$(Q)mkdir -p include/asm-blackfin
-	$(Q)ln -fsn $(srctree)/include/asm-blackfin/$(INCDIR) include/asm-blackfin/arch
-else
-	$(Q)ln -fsn $(INCDIR) include/asm-blackfin/arch
-endif
-	@touch $@
-
 archprepare: maketools
 
 PHONY += maketools
-maketools: include/asm-blackfin/.arch
 
 
 ifneq ($(board-y),)
@@ -58,8 +38,6 @@ common-y += arch/blackfin/lib/ $(CPU)
 
 lds-y += $(BOARD)/u-boot.lds
 
-MRPROPER_FILES += include/asm-blackfin/arch include/asm-blackfin/proc
-
 ifdef CONFIG_BFIN_BOOT_FLASH16
 FLASHBITS :=-B 16
 else
diff --git a/include/asm-blackfin/bitops.h b/arch/blackfin/include/asm/bitops.h
index 39410de4e6..39410de4e6 100644
--- a/include/asm-blackfin/bitops.h
+++ b/arch/blackfin/include/asm/bitops.h
diff --git a/include/asm-blackfin/blackfin.h b/arch/blackfin/include/asm/blackfin.h
index f2d1e65be7..f2d1e65be7 100644
--- a/include/asm-blackfin/blackfin.h
+++ b/arch/blackfin/include/asm/blackfin.h
diff --git a/include/asm-blackfin/blackfin_defs.h b/arch/blackfin/include/asm/blackfin_defs.h
index 2190215971..2190215971 100644
--- a/include/asm-blackfin/blackfin_defs.h
+++ b/arch/blackfin/include/asm/blackfin_defs.h
diff --git a/include/asm-blackfin/byteorder.h b/arch/blackfin/include/asm/byteorder.h
index 3b4df4e134..3b4df4e134 100644
--- a/include/asm-blackfin/byteorder.h
+++ b/arch/blackfin/include/asm/byteorder.h
diff --git a/include/asm-blackfin/common.h b/arch/blackfin/include/asm/common.h
index 2ab1954176..2ab1954176 100644
--- a/include/asm-blackfin/common.h
+++ b/arch/blackfin/include/asm/common.h
diff --git a/include/asm-blackfin/cplb.h b/arch/blackfin/include/asm/cplb.h
index 7715f645de..7715f645de 100644
--- a/include/asm-blackfin/cplb.h
+++ b/arch/blackfin/include/asm/cplb.h
diff --git a/include/asm-blackfin/cpu.h b/arch/blackfin/include/asm/cpu.h
index 586e3cf181..586e3cf181 100644
--- a/include/asm-blackfin/cpu.h
+++ b/arch/blackfin/include/asm/cpu.h
diff --git a/include/asm-blackfin/cpu/cdefBF531.h b/arch/blackfin/include/asm/cpu/cdefBF531.h
index 68d841d185..68d841d185 100644
--- a/include/asm-blackfin/cpu/cdefBF531.h
+++ b/arch/blackfin/include/asm/cpu/cdefBF531.h
diff --git a/include/asm-blackfin/cpu/cdefBF532.h b/arch/blackfin/include/asm/cpu/cdefBF532.h
index a4d422f765..a4d422f765 100644
--- a/include/asm-blackfin/cpu/cdefBF532.h
+++ b/arch/blackfin/include/asm/cpu/cdefBF532.h
diff --git a/include/asm-blackfin/cpu/cdefBF533.h b/arch/blackfin/include/asm/cpu/cdefBF533.h
index 8c751e6073..8c751e6073 100644
--- a/include/asm-blackfin/cpu/cdefBF533.h
+++ b/arch/blackfin/include/asm/cpu/cdefBF533.h
diff --git a/include/asm-blackfin/cpu/cdefBF53x.h b/arch/blackfin/include/asm/cpu/cdefBF53x.h
index db4eaa9cf2..db4eaa9cf2 100644
--- a/include/asm-blackfin/cpu/cdefBF53x.h
+++ b/arch/blackfin/include/asm/cpu/cdefBF53x.h
diff --git a/include/asm-blackfin/cpu/cdefBF561.h b/arch/blackfin/include/asm/cpu/cdefBF561.h
index 60fdf1eb79..60fdf1eb79 100644
--- a/include/asm-blackfin/cpu/cdefBF561.h
+++ b/arch/blackfin/include/asm/cpu/cdefBF561.h
diff --git a/include/asm-blackfin/cpu/cdef_LPBlackfin.h b/arch/blackfin/include/asm/cpu/cdef_LPBlackfin.h
index e6471cbcb3..e6471cbcb3 100644
--- a/include/asm-blackfin/cpu/cdef_LPBlackfin.h
+++ b/arch/blackfin/include/asm/cpu/cdef_LPBlackfin.h
diff --git a/include/asm-blackfin/cpu/defBF531.h b/arch/blackfin/include/asm/cpu/defBF531.h
index 6c7cd5a6db..6c7cd5a6db 100644
--- a/include/asm-blackfin/cpu/defBF531.h
+++ b/arch/blackfin/include/asm/cpu/defBF531.h
diff --git a/include/asm-blackfin/cpu/defBF532.h b/arch/blackfin/include/asm/cpu/defBF532.h
index 65853ed434..65853ed434 100644
--- a/include/asm-blackfin/cpu/defBF532.h
+++ b/arch/blackfin/include/asm/cpu/defBF532.h
diff --git a/include/asm-blackfin/cpu/defBF533.h b/arch/blackfin/include/asm/cpu/defBF533.h
index 90e50afa7f..90e50afa7f 100644
--- a/include/asm-blackfin/cpu/defBF533.h
+++ b/arch/blackfin/include/asm/cpu/defBF533.h
diff --git a/include/asm-blackfin/cpu/defBF533_extn.h b/arch/blackfin/include/asm/cpu/defBF533_extn.h
index a9a1c7ccbd..a9a1c7ccbd 100644
--- a/include/asm-blackfin/cpu/defBF533_extn.h
+++ b/arch/blackfin/include/asm/cpu/defBF533_extn.h
diff --git a/include/asm-blackfin/cpu/defBF561.h b/arch/blackfin/include/asm/cpu/defBF561.h
index 11de2beb62..11de2beb62 100644
--- a/include/asm-blackfin/cpu/defBF561.h
+++ b/arch/blackfin/include/asm/cpu/defBF561.h
diff --git a/include/asm-blackfin/cpu/defBF561_extn.h b/arch/blackfin/include/asm/cpu/defBF561_extn.h
index 8112c3fe1e..8112c3fe1e 100644
--- a/include/asm-blackfin/cpu/defBF561_extn.h
+++ b/arch/blackfin/include/asm/cpu/defBF561_extn.h
diff --git a/include/asm-blackfin/cpu/def_LPBlackfin.h b/arch/blackfin/include/asm/cpu/def_LPBlackfin.h
index e183b0299e..e183b0299e 100644
--- a/include/asm-blackfin/cpu/def_LPBlackfin.h
+++ b/arch/blackfin/include/asm/cpu/def_LPBlackfin.h
diff --git a/include/asm-blackfin/current.h b/arch/blackfin/include/asm/current.h
index 108c2792a0..108c2792a0 100644
--- a/include/asm-blackfin/current.h
+++ b/arch/blackfin/include/asm/current.h
diff --git a/include/asm-blackfin/elf.h b/arch/blackfin/include/asm/elf.h
index 1238a826b0..1238a826b0 100644
--- a/include/asm-blackfin/elf.h
+++ b/arch/blackfin/include/asm/elf.h
diff --git a/include/asm-blackfin/entry.h b/arch/blackfin/include/asm/entry.h
index f031c86d76..f031c86d76 100644
--- a/include/asm-blackfin/entry.h
+++ b/arch/blackfin/include/asm/entry.h
diff --git a/include/asm-blackfin/hw_irq.h b/arch/blackfin/include/asm/hw_irq.h
index 690b6f3030..690b6f3030 100644
--- a/include/asm-blackfin/hw_irq.h
+++ b/arch/blackfin/include/asm/hw_irq.h
diff --git a/include/asm-blackfin/io.h b/arch/blackfin/include/asm/io.h
index 0a8551218a..0a8551218a 100644
--- a/include/asm-blackfin/io.h
+++ b/arch/blackfin/include/asm/io.h
diff --git a/include/asm-blackfin/irq.h b/arch/blackfin/include/asm/irq.h
index 27da595425..27da595425 100644
--- a/include/asm-blackfin/irq.h
+++ b/arch/blackfin/include/asm/irq.h
diff --git a/include/asm-blackfin/linkage.h b/arch/blackfin/include/asm/linkage.h
index 7a3166037c..7a3166037c 100644
--- a/include/asm-blackfin/linkage.h
+++ b/arch/blackfin/include/asm/linkage.h
diff --git a/include/asm-blackfin/mem_init.h b/arch/blackfin/include/asm/mem_init.h
index 1a13d908e0..1a13d908e0 100644
--- a/include/asm-blackfin/mem_init.h
+++ b/arch/blackfin/include/asm/mem_init.h
diff --git a/include/asm-blackfin/module.h b/arch/blackfin/include/asm/module.h
index 99c8848e68..99c8848e68 100644
--- a/include/asm-blackfin/module.h
+++ b/arch/blackfin/include/asm/module.h
diff --git a/include/asm-blackfin/page.h b/arch/blackfin/include/asm/page.h
index bf90cd56c6..bf90cd56c6 100644
--- a/include/asm-blackfin/page.h
+++ b/arch/blackfin/include/asm/page.h
diff --git a/include/asm-blackfin/page_offset.h b/arch/blackfin/include/asm/page_offset.h
index 1b9ee01982..1b9ee01982 100644
--- a/include/asm-blackfin/page_offset.h
+++ b/arch/blackfin/include/asm/page_offset.h
diff --git a/include/asm-blackfin/posix_types.h b/arch/blackfin/include/asm/posix_types.h
index f1f2b5ffc2..f1f2b5ffc2 100644
--- a/include/asm-blackfin/posix_types.h
+++ b/arch/blackfin/include/asm/posix_types.h
diff --git a/include/asm-blackfin/processor.h b/arch/blackfin/include/asm/processor.h
index 7095e95626..7095e95626 100644
--- a/include/asm-blackfin/processor.h
+++ b/arch/blackfin/include/asm/processor.h
diff --git a/include/asm-blackfin/ptrace.h b/arch/blackfin/include/asm/ptrace.h
index afd57773ac..afd57773ac 100644
--- a/include/asm-blackfin/ptrace.h
+++ b/arch/blackfin/include/asm/ptrace.h
diff --git a/include/asm-blackfin/segment.h b/arch/blackfin/include/asm/segment.h
index 9e6d817fc7..9e6d817fc7 100644
--- a/include/asm-blackfin/segment.h
+++ b/arch/blackfin/include/asm/segment.h
diff --git a/include/asm-blackfin/setup.h b/arch/blackfin/include/asm/setup.h
index 440aaf9d9c..440aaf9d9c 100644
--- a/include/asm-blackfin/setup.h
+++ b/arch/blackfin/include/asm/setup.h
diff --git a/include/asm-blackfin/string.h b/arch/blackfin/include/asm/string.h
index 883009ae0d..883009ae0d 100644
--- a/include/asm-blackfin/string.h
+++ b/arch/blackfin/include/asm/string.h
diff --git a/include/asm-blackfin/system.h b/arch/blackfin/include/asm/system.h
index d84b6365bc..d84b6365bc 100644
--- a/include/asm-blackfin/system.h
+++ b/arch/blackfin/include/asm/system.h
diff --git a/include/asm-blackfin/traps.h b/arch/blackfin/include/asm/traps.h
index b1dde4aba4..b1dde4aba4 100644
--- a/include/asm-blackfin/traps.h
+++ b/arch/blackfin/include/asm/traps.h
diff --git a/include/asm-blackfin/types.h b/arch/blackfin/include/asm/types.h
index 6058908e25..6058908e25 100644
--- a/include/asm-blackfin/types.h
+++ b/arch/blackfin/include/asm/types.h
diff --git a/include/asm-blackfin/u-boot.h b/arch/blackfin/include/asm/u-boot.h
index ec39338039..ec39338039 100644
--- a/include/asm-blackfin/u-boot.h
+++ b/arch/blackfin/include/asm/u-boot.h
diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index d30b335d1d..0f2c4f324d 100644
--- a/arch/m68k/Makefile
+++ b/arch/m68k/Makefile
@@ -46,31 +46,13 @@ CFLAGS += -msoft-float -mcfv4e -gdwarf-2 -feliminate-unused-debug-types \
 LDFLAGS_uboot  :=-L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc
 #  --verbose --stats
 
-ifeq ($(incdir-y),)
-incdir-y := $(machine-y)
-endif
-INCDIR   := arch-$(incdir-y)
-
-#	Update machine arch and proc symlinks if something which affects
-#	them changed.  We use .arch to indicate when they were updated
-#	last, otherwise make uses the target directory mtime.
+machdirs := $(patsubst %,arch/m68k/mach-%/,$(machine-y))
 
-include/asm-m68k/.arch: $(wildcard include/config/arch/*.h) include/config/auto.conf
-	@echo '  SYMLINK include/asm-m68k/arch -> include/asm-m68k/$(INCDIR)'
-ifneq ($(KBUILD_SRC),)
-	$(Q)mkdir -p include/asm-m68k
-	$(Q)ln -fsn $(srctree)/include/asm-m68k/$(INCDIR) include/asm-m68k/arch
-else
-	$(Q)ln -fsn $(INCDIR) include/asm-m68k/arch
-endif
-	@echo '  SYMLINK include/asm-m68k/proc -> include/asm-m68k/proc-mcfv4e'
-ifneq ($(KBUILD_SRC),)
-	$(Q)mkdir -p include/asm-m68k
-	$(Q)ln -fsn $(srctree)/include/asm-m68k/proc-mcfv4e include/asm-m68k/proc
+ifeq ($(KBUILD_SRC),)
+CPPFLAGS += $(patsubst %,-I%include,$(machdirs))
 else
-	$(Q)ln -fsn proc-mcfv4e include/asm-m68k/proc
+CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs))
 endif
-	@touch $@
 
 
 all: $(KBUILD_IMAGE)
@@ -78,7 +60,6 @@ all: $(KBUILD_IMAGE)
 archprepare: maketools
 
 PHONY += maketools
-maketools: include/asm-m68k/.arch
 
 
 ifneq ($(board-y),)
@@ -100,4 +81,3 @@ lds-$(CONFIG_GENERIC_LINKER_SCRIPT)   := arch/m68k/lib/u-boot.lds
 lds-$(CONFIG_BOARD_LINKER_SCRIPT)     := $(BOARD)/u-boot.lds
 
 CLEAN_FILES    += arch/m68k/lib/u-boot.lds
-MRPROPER_FILES += include/asm-m68k/arch include/asm-m68k/proc
diff --git a/arch/m68k/cpu/cpu.c b/arch/m68k/cpu/cpu.c
index 5c48add8d9..c27d089018 100644
--- a/arch/m68k/cpu/cpu.c
+++ b/arch/m68k/cpu/cpu.c
@@ -24,8 +24,8 @@
 #include <common.h>
 #include <command.h>
 #include <init.h>
-#include <asm/proc/processor.h> // FIXME -stup place
-#include <asm/arch/mcf54xx-regs.h>
+#include <proc/processor.h> // FIXME -stup place
+#include <mach/mcf54xx-regs.h>
 
 static uint32_t CACR_shadow = MCF5XXX_CACR_BEC;
 
diff --git a/arch/m68k/cpu/interrupts.c b/arch/m68k/cpu/interrupts.c
index 16aac38ad5..9fc64a1248 100644
--- a/arch/m68k/cpu/interrupts.c
+++ b/arch/m68k/cpu/interrupts.c
@@ -23,7 +23,7 @@
  */
 #include <common.h>
 #include <asm/ptrace.h>
-#include <asm/arch/mcf54xx-regs.h>
+#include <mach/mcf54xx-regs.h>
 
 #ifdef CONFIG_USE_IRQ
 void enable_interrupts(void)
diff --git a/include/asm-m68k/atomic.h b/arch/m68k/include/asm/atomic.h
index be3fa3f195..be3fa3f195 100644
--- a/include/asm-m68k/atomic.h
+++ b/arch/m68k/include/asm/atomic.h
diff --git a/include/asm-m68k/bitops.h b/arch/m68k/include/asm/bitops.h
index bfc3054155..bfc3054155 100644
--- a/include/asm-m68k/bitops.h
+++ b/arch/m68k/include/asm/bitops.h
diff --git a/include/asm-m68k/bootinfo.h b/arch/m68k/include/asm/bootinfo.h
index 8b18fda350..8b18fda350 100644
--- a/include/asm-m68k/bootinfo.h
+++ b/arch/m68k/include/asm/bootinfo.h
diff --git a/include/asm-m68k/byteorder.h b/arch/m68k/include/asm/byteorder.h
index 779fca00f0..779fca00f0 100644
--- a/include/asm-m68k/byteorder.h
+++ b/arch/m68k/include/asm/byteorder.h
diff --git a/include/asm-m68k/coldfire/mcf548x.h b/arch/m68k/include/asm/coldfire/mcf548x.h
index 6b3eff3826..6b3eff3826 100644
--- a/include/asm-m68k/coldfire/mcf548x.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x.h
diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_can.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_can.h
index 1956f0d760..1956f0d760 100644
--- a/include/asm-m68k/coldfire/mcf548x/mcf548x_can.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_can.h
diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_ctm.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_ctm.h
index c4982668c5..c4982668c5 100644
--- a/include/asm-m68k/coldfire/mcf548x/mcf548x_ctm.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_ctm.h
diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_dma.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_dma.h
index 73abc07a43..73abc07a43 100644
--- a/include/asm-m68k/coldfire/mcf548x/mcf548x_dma.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_dma.h
diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_dma_ereq.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_dma_ereq.h
index 309689f464..309689f464 100644
--- a/include/asm-m68k/coldfire/mcf548x/mcf548x_dma_ereq.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_dma_ereq.h
diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_dspi.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_dspi.h
index 4d8f33142e..4d8f33142e 100644
--- a/include/asm-m68k/coldfire/mcf548x/mcf548x_dspi.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_dspi.h
diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_eport.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_eport.h
index bb07f7c3b0..bb07f7c3b0 100644
--- a/include/asm-m68k/coldfire/mcf548x/mcf548x_eport.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_eport.h
diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_fbcs.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_fbcs.h
index e7e4712bc6..e7e4712bc6 100644
--- a/include/asm-m68k/coldfire/mcf548x/mcf548x_fbcs.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_fbcs.h
diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_fec.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_fec.h
index 29ac249025..29ac249025 100644
--- a/include/asm-m68k/coldfire/mcf548x/mcf548x_fec.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_fec.h
diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_gpio.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_gpio.h
index 5d494a9d49..5d494a9d49 100644
--- a/include/asm-m68k/coldfire/mcf548x/mcf548x_gpio.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_gpio.h
diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_gpt.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_gpt.h
index b7fcfced99..b7fcfced99 100644
--- a/include/asm-m68k/coldfire/mcf548x/mcf548x_gpt.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_gpt.h
diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_i2c.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_i2c.h
index 3879c0dbb4..3879c0dbb4 100644
--- a/include/asm-m68k/coldfire/mcf548x/mcf548x_i2c.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_i2c.h
diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_intc.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_intc.h
index 52bf7452fa..52bf7452fa 100644
--- a/include/asm-m68k/coldfire/mcf548x/mcf548x_intc.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_intc.h
diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_pci.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_pci.h
index 031e50945e..031e50945e 100644
--- a/include/asm-m68k/coldfire/mcf548x/mcf548x_pci.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_pci.h
diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_pciarb.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_pciarb.h
index a15554384a..a15554384a 100644
--- a/include/asm-m68k/coldfire/mcf548x/mcf548x_pciarb.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_pciarb.h
diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_psc.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_psc.h
index 44f920bcbe..44f920bcbe 100644
--- a/include/asm-m68k/coldfire/mcf548x/mcf548x_psc.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_psc.h
diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_sdramc.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_sdramc.h
index 1f41f32310..1f41f32310 100644
--- a/include/asm-m68k/coldfire/mcf548x/mcf548x_sdramc.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_sdramc.h
diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_sec.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_sec.h
index f4a65320c4..f4a65320c4 100644
--- a/include/asm-m68k/coldfire/mcf548x/mcf548x_sec.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_sec.h
diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_siu.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_siu.h
index e663ec726f..e663ec726f 100644
--- a/include/asm-m68k/coldfire/mcf548x/mcf548x_siu.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_siu.h
diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_slt.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_slt.h
index 6e472f2288..6e472f2288 100644
--- a/include/asm-m68k/coldfire/mcf548x/mcf548x_slt.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_slt.h
diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_sram.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_sram.h
index d5eb4642c3..d5eb4642c3 100644
--- a/include/asm-m68k/coldfire/mcf548x/mcf548x_sram.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_sram.h
diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_uart.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_uart.h
index 8f46f1c3ec..8f46f1c3ec 100644
--- a/include/asm-m68k/coldfire/mcf548x/mcf548x_uart.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_uart.h
diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_usb.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_usb.h
index 0c8e92cdad..0c8e92cdad 100644
--- a/include/asm-m68k/coldfire/mcf548x/mcf548x_usb.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_usb.h
diff --git a/include/asm-m68k/coldfire/mcf548x/mcf548x_xlbarb.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_xlbarb.h
index 08c83765f5..08c83765f5 100644
--- a/include/asm-m68k/coldfire/mcf548x/mcf548x_xlbarb.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_xlbarb.h
diff --git a/include/asm-m68k/coldfire/mcf5xxx.h b/arch/m68k/include/asm/coldfire/mcf5xxx.h
index 4e239a31d3..4e239a31d3 100644
--- a/include/asm-m68k/coldfire/mcf5xxx.h
+++ b/arch/m68k/include/asm/coldfire/mcf5xxx.h
diff --git a/include/asm-m68k/common.h b/arch/m68k/include/asm/common.h
index 4cd02ad752..4cd02ad752 100644
--- a/include/asm-m68k/common.h
+++ b/arch/m68k/include/asm/common.h
diff --git a/include/asm-m68k/elf.h b/arch/m68k/include/asm/elf.h
index 310179d71d..310179d71d 100644
--- a/include/asm-m68k/elf.h
+++ b/arch/m68k/include/asm/elf.h
diff --git a/include/asm-m68k/hardware.h b/arch/m68k/include/asm/hardware.h
index 54cec0ee20..616a4feeb5 100644
--- a/include/asm-m68k/hardware.h
+++ b/arch/m68k/include/asm/hardware.h
@@ -25,6 +25,6 @@
 #ifndef __M68K_HARDWARE_H
 #define __M68K_HARDWARE_H
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #endif
diff --git a/include/asm-m68k/io.h b/arch/m68k/include/asm/io.h
index 7bbd2fe0f9..7bbd2fe0f9 100644
--- a/include/asm-m68k/io.h
+++ b/arch/m68k/include/asm/io.h
diff --git a/include/asm-m68k/mach-types.h b/arch/m68k/include/asm/mach-types.h
index d221fcc892..d221fcc892 100644
--- a/include/asm-m68k/mach-types.h
+++ b/arch/m68k/include/asm/mach-types.h
diff --git a/include/asm-m68k/memory.h b/arch/m68k/include/asm/memory.h
index cb60515a71..cb60515a71 100644
--- a/include/asm-m68k/memory.h
+++ b/arch/m68k/include/asm/memory.h
diff --git a/include/asm-m68k/module.h b/arch/m68k/include/asm/module.h
index 7036a4e12e..7036a4e12e 100644
--- a/include/asm-m68k/module.h
+++ b/arch/m68k/include/asm/module.h
diff --git a/include/asm-m68k/posix_types.h b/arch/m68k/include/asm/posix_types.h
index 2e85033384..2e85033384 100644
--- a/include/asm-m68k/posix_types.h
+++ b/arch/m68k/include/asm/posix_types.h
diff --git a/include/asm-m68k/processor.h b/arch/m68k/include/asm/processor.h
index 75086d5409..75086d5409 100644
--- a/include/asm-m68k/processor.h
+++ b/arch/m68k/include/asm/processor.h
diff --git a/include/asm-m68k/ptrace.h b/arch/m68k/include/asm/ptrace.h
index fb0f3314d8..96ea849385 100644
--- a/include/asm-m68k/ptrace.h
+++ b/arch/m68k/include/asm/ptrace.h
@@ -33,7 +33,7 @@
 #define PTRACE_SETOPTIONS	21
 
 
-#include <asm/proc/ptrace.h>
+#include <proc/ptrace.h>
 
 #ifndef __ASSEMBLY__
 
diff --git a/include/asm-m68k/setup.h b/arch/m68k/include/asm/setup.h
index 8fad34434f..8fad34434f 100644
--- a/include/asm-m68k/setup.h
+++ b/arch/m68k/include/asm/setup.h
diff --git a/include/asm-m68k/string.h b/arch/m68k/include/asm/string.h
index 193ec54a1a..193ec54a1a 100644
--- a/include/asm-m68k/string.h
+++ b/arch/m68k/include/asm/string.h
diff --git a/include/asm-m68k/types.h b/arch/m68k/include/asm/types.h
index 7ce94a176b..7ce94a176b 100644
--- a/include/asm-m68k/types.h
+++ b/arch/m68k/include/asm/types.h
diff --git a/include/asm-m68k/u-boot-m68k.h b/arch/m68k/include/asm/u-boot-m68k.h
index 51cacae6e2..51cacae6e2 100644
--- a/include/asm-m68k/u-boot-m68k.h
+++ b/arch/m68k/include/asm/u-boot-m68k.h
diff --git a/include/asm-m68k/u-boot.h b/arch/m68k/include/asm/u-boot.h
index 34deaf10d0..34deaf10d0 100644
--- a/include/asm-m68k/u-boot.h
+++ b/arch/m68k/include/asm/u-boot.h
diff --git a/arch/m68k/mach-mcfv4e/dma_utils.c b/arch/m68k/mach-mcfv4e/dma_utils.c
index 15b520abc2..adeefea3b1 100644
--- a/arch/m68k/mach-mcfv4e/dma_utils.c
+++ b/arch/m68k/mach-mcfv4e/dma_utils.c
@@ -10,10 +10,10 @@
 #include <common.h>
 #include <init.h>
 #include <linux/types.h>
-#include <asm/arch/mcf54xx-regs.h>
-#include <asm/proc/mcdapi/MCD_dma.h>
+#include <mach/mcf54xx-regs.h>
+#include <proc/mcdapi/MCD_dma.h>
 
-#include <asm/proc/dma_utils.h>
+#include <proc/dma_utils.h>
 
 /*
  * This global keeps track of which initiators have been
diff --git a/arch/m68k/mach-mcfv4e/fec.c b/arch/m68k/mach-mcfv4e/fec.c
index 551f00f005..7619283f86 100644
--- a/arch/m68k/mach-mcfv4e/fec.c
+++ b/arch/m68k/mach-mcfv4e/fec.c
@@ -7,12 +7,12 @@
 #include <common.h>
 #include <linux/types.h>
 
-#include <asm/arch/mcf54xx-regs.h>
-#include <asm/proc/mcdapi/MCD_dma.h>
-#include <asm/proc/net/net.h>
-#include <asm/proc/fecbd.h>
-#include <asm/proc/fec.h>
-#include <asm/proc/dma_utils.h>
+#include <mach/mcf54xx-regs.h>
+#include <proc/mcdapi/MCD_dma.h>
+#include <proc/net/net.h>
+#include <proc/fecbd.h>
+#include <proc/fec.h>
+#include <proc/dma_utils.h>
 
 
 #define TRUE 1
diff --git a/arch/m68k/mach-mcfv4e/fecbd.c b/arch/m68k/mach-mcfv4e/fecbd.c
index 26fb16d98d..a8e732b3ac 100644
--- a/arch/m68k/mach-mcfv4e/fecbd.c
+++ b/arch/m68k/mach-mcfv4e/fecbd.c
@@ -7,12 +7,12 @@
 #include <common.h>
 #include <linux/types.h>
 
-#include <asm/arch/mcf54xx-regs.h>
-#include <asm/proc/mcdapi/MCD_dma.h>
-#include <asm/proc/net/net.h>
-#include <asm/proc/fecbd.h>
-#include <asm/proc/fec.h>
-#include <asm/proc/dma_utils.h>
+#include <mach/mcf54xx-regs.h>
+#include <proc/mcdapi/MCD_dma.h>
+#include <proc/net/net.h>
+#include <proc/fecbd.h>
+#include <proc/fec.h>
+#include <proc/dma_utils.h>
 
 #define ASSERT(x) if (!(x)) hang();
 
diff --git a/include/asm-m68k/arch-mcfv4e/clocks.h b/arch/m68k/mach-mcfv4e/include/mach/clocks.h
index 50124b1948..50124b1948 100644
--- a/include/asm-m68k/arch-mcfv4e/clocks.h
+++ b/arch/m68k/mach-mcfv4e/include/mach/clocks.h
diff --git a/include/asm-m68k/arch-mcfv4e/debug_ll.h b/arch/m68k/mach-mcfv4e/include/mach/debug_ll.h
index 064961d925..064961d925 100644
--- a/include/asm-m68k/arch-mcfv4e/debug_ll.h
+++ b/arch/m68k/mach-mcfv4e/include/mach/debug_ll.h
diff --git a/include/asm-m68k/arch-mcfv4e/hardware.h b/arch/m68k/mach-mcfv4e/include/mach/hardware.h
index 46dc08897f..46dc08897f 100644
--- a/include/asm-m68k/arch-mcfv4e/hardware.h
+++ b/arch/m68k/mach-mcfv4e/include/mach/hardware.h
diff --git a/include/asm-m68k/arch-mcfv4e/mcf54xx-regs.h b/arch/m68k/mach-mcfv4e/include/mach/mcf54xx-regs.h
index e1b17d55e4..e1b17d55e4 100644
--- a/include/asm-m68k/arch-mcfv4e/mcf54xx-regs.h
+++ b/arch/m68k/mach-mcfv4e/include/mach/mcf54xx-regs.h
diff --git a/include/asm-m68k/proc-mcfv4e/dma_utils.h b/arch/m68k/mach-mcfv4e/include/proc/dma_utils.h
index 4ebdd558c1..4ebdd558c1 100644
--- a/include/asm-m68k/proc-mcfv4e/dma_utils.h
+++ b/arch/m68k/mach-mcfv4e/include/proc/dma_utils.h
diff --git a/include/asm-m68k/proc-mcfv4e/fec.h b/arch/m68k/mach-mcfv4e/include/proc/fec.h
index 4c94774381..4c94774381 100644
--- a/include/asm-m68k/proc-mcfv4e/fec.h
+++ b/arch/m68k/mach-mcfv4e/include/proc/fec.h
diff --git a/include/asm-m68k/proc-mcfv4e/fecbd.h b/arch/m68k/mach-mcfv4e/include/proc/fecbd.h
index 92195490c8..92195490c8 100644
--- a/include/asm-m68k/proc-mcfv4e/fecbd.h
+++ b/arch/m68k/mach-mcfv4e/include/proc/fecbd.h
diff --git a/include/asm-m68k/proc-mcfv4e/mcdapi/MCD_dma.h b/arch/m68k/mach-mcfv4e/include/proc/mcdapi/MCD_dma.h
index 09adf8272a..09adf8272a 100644
--- a/include/asm-m68k/proc-mcfv4e/mcdapi/MCD_dma.h
+++ b/arch/m68k/mach-mcfv4e/include/proc/mcdapi/MCD_dma.h
diff --git a/include/asm-m68k/proc-mcfv4e/mcdapi/MCD_progCheck.h b/arch/m68k/mach-mcfv4e/include/proc/mcdapi/MCD_progCheck.h
index f90600c7cd..f90600c7cd 100644
--- a/include/asm-m68k/proc-mcfv4e/mcdapi/MCD_progCheck.h
+++ b/arch/m68k/mach-mcfv4e/include/proc/mcdapi/MCD_progCheck.h
diff --git a/include/asm-m68k/proc-mcfv4e/mcdapi/MCD_tasksInit.h b/arch/m68k/mach-mcfv4e/include/proc/mcdapi/MCD_tasksInit.h
index bc6ec91f98..bc6ec91f98 100644
--- a/include/asm-m68k/proc-mcfv4e/mcdapi/MCD_tasksInit.h
+++ b/arch/m68k/mach-mcfv4e/include/proc/mcdapi/MCD_tasksInit.h
diff --git a/include/asm-m68k/proc-mcfv4e/net/eth.h b/arch/m68k/mach-mcfv4e/include/proc/net/eth.h
index 5240c0c945..5240c0c945 100644
--- a/include/asm-m68k/proc-mcfv4e/net/eth.h
+++ b/arch/m68k/mach-mcfv4e/include/proc/net/eth.h
diff --git a/include/asm-m68k/proc-mcfv4e/net/nbuf.h b/arch/m68k/mach-mcfv4e/include/proc/net/nbuf.h
index bc3a7a6924..bc3a7a6924 100644
--- a/include/asm-m68k/proc-mcfv4e/net/nbuf.h
+++ b/arch/m68k/mach-mcfv4e/include/proc/net/nbuf.h
diff --git a/include/asm-m68k/proc-mcfv4e/net/net.h b/arch/m68k/mach-mcfv4e/include/proc/net/net.h
index a2ccd76510..a2ccd76510 100644
--- a/include/asm-m68k/proc-mcfv4e/net/net.h
+++ b/arch/m68k/mach-mcfv4e/include/proc/net/net.h
diff --git a/include/asm-m68k/proc-mcfv4e/net/queue.h b/arch/m68k/mach-mcfv4e/include/proc/net/queue.h
index c9da1c83a5..c9da1c83a5 100644
--- a/include/asm-m68k/proc-mcfv4e/net/queue.h
+++ b/arch/m68k/mach-mcfv4e/include/proc/net/queue.h
diff --git a/include/asm-m68k/proc-mcfv4e/processor.h b/arch/m68k/mach-mcfv4e/include/proc/processor.h
index f49b65d97b..f49b65d97b 100644
--- a/include/asm-m68k/proc-mcfv4e/processor.h
+++ b/arch/m68k/mach-mcfv4e/include/proc/processor.h
diff --git a/include/asm-m68k/proc-mcfv4e/ptrace.h b/arch/m68k/mach-mcfv4e/include/proc/ptrace.h
index dd124291d6..dd124291d6 100644
--- a/include/asm-m68k/proc-mcfv4e/ptrace.h
+++ b/arch/m68k/mach-mcfv4e/include/proc/ptrace.h
diff --git a/arch/m68k/mach-mcfv4e/mcdapi/MCD_dmaApi.c b/arch/m68k/mach-mcfv4e/mcdapi/MCD_dmaApi.c
index b4d7f28470..60e2b6dd76 100644
--- a/arch/m68k/mach-mcfv4e/mcdapi/MCD_dmaApi.c
+++ b/arch/m68k/mach-mcfv4e/mcdapi/MCD_dmaApi.c
@@ -6,9 +6,9 @@
  */
 
 #include <asm/types.h>
-#include <asm/proc/mcdapi/MCD_dma.h>
-#include <asm/proc/mcdapi/MCD_tasksInit.h>
-#include <asm/proc/mcdapi/MCD_progCheck.h>
+#include <proc/mcdapi/MCD_dma.h>
+#include <proc/mcdapi/MCD_tasksInit.h>
+#include <proc/mcdapi/MCD_progCheck.h>
 
 /*
  * This is an API-internal pointer to the DMA's registers
diff --git a/arch/m68k/mach-mcfv4e/mcdapi/MCD_tasks.c b/arch/m68k/mach-mcfv4e/mcdapi/MCD_tasks.c
index 3bfed232d7..812120dd7a 100644
--- a/arch/m68k/mach-mcfv4e/mcdapi/MCD_tasks.c
+++ b/arch/m68k/mach-mcfv4e/mcdapi/MCD_tasks.c
@@ -5,7 +5,7 @@
  * Notes:
  */
 #include <asm/types.h>
-#include <asm/proc/mcdapi/MCD_dma.h>
+#include <proc/mcdapi/MCD_dma.h>
 
 u32 MCD_varTab0[];
 u32 MCD_varTab1[];
diff --git a/arch/m68k/mach-mcfv4e/mcdapi/MCD_tasksInit.c b/arch/m68k/mach-mcfv4e/mcdapi/MCD_tasksInit.c
index 14104f7185..8d82b471f9 100644
--- a/arch/m68k/mach-mcfv4e/mcdapi/MCD_tasksInit.c
+++ b/arch/m68k/mach-mcfv4e/mcdapi/MCD_tasksInit.c
@@ -11,7 +11,7 @@
  */
 
 #include <asm/types.h>
-#include <asm/proc/mcdapi/MCD_dma.h>
+#include <proc/mcdapi/MCD_dma.h>
 
 extern dmaRegs *MCD_dmaBar;
 
diff --git a/arch/m68k/mach-mcfv4e/mcf_clocksource.c b/arch/m68k/mach-mcfv4e/mcf_clocksource.c
index 1278bf83ec..926a592158 100644
--- a/arch/m68k/mach-mcfv4e/mcf_clocksource.c
+++ b/arch/m68k/mach-mcfv4e/mcf_clocksource.c
@@ -24,9 +24,9 @@
 #include <common.h>
 #include <init.h>
 #include <clock.h>
-#include <asm/arch/mcf54xx-regs.h>
-#include <asm/arch/clocks.h>
-#include <asm/proc/processor.h> //FIXME - move to other file
+#include <mach/mcf54xx-regs.h>
+#include <mach/clocks.h>
+#include <proc/processor.h> //FIXME - move to other file
 
 #ifdef CONFIG_USE_IRQ
 
diff --git a/arch/m68k/mach-mcfv4e/mcf_reset_cpu.c b/arch/m68k/mach-mcfv4e/mcf_reset_cpu.c
index 5a3368f901..dc04a270d1 100644
--- a/arch/m68k/mach-mcfv4e/mcf_reset_cpu.c
+++ b/arch/m68k/mach-mcfv4e/mcf_reset_cpu.c
@@ -22,7 +22,7 @@
  *  Implements a watchdog triggered reset for V4e Coldfire cores
  */
 #include <common.h>
-#include <asm/arch/mcf54xx-regs.h>
+#include <mach/mcf54xx-regs.h>
 
 /**
  * Reset the cpu by setting up the watchdog timer and let it time out
diff --git a/arch/m68k/mach-mcfv4e/multichannel_dma.c b/arch/m68k/mach-mcfv4e/multichannel_dma.c
index 11aceeb9b9..494fc68bde 100644
--- a/arch/m68k/mach-mcfv4e/multichannel_dma.c
+++ b/arch/m68k/mach-mcfv4e/multichannel_dma.c
@@ -25,9 +25,9 @@
  */
 #include <common.h>
 #include <init.h>
-#include <asm/arch/mcf54xx-regs.h>
-#include <asm/proc/mcdapi/MCD_dma.h>
-#include <asm/proc/dma_utils.h>
+#include <mach/mcf54xx-regs.h>
+#include <proc/mcdapi/MCD_dma.h>
+#include <proc/dma_utils.h>
 
 
 static int mcdapi_init(void)
diff --git a/arch/m68k/mach-mcfv4e/net/nbuf.c b/arch/m68k/mach-mcfv4e/net/nbuf.c
index d7ae921bed..5dc6027e0e 100644
--- a/arch/m68k/mach-mcfv4e/net/nbuf.c
+++ b/arch/m68k/mach-mcfv4e/net/nbuf.c
@@ -26,10 +26,10 @@
 #include <malloc.h>
 #include <linux/types.h>
 
-#include <asm/proc/net/queue.h>
-#include <asm/proc/net/net.h>
+#include <proc/net/queue.h>
+#include <proc/net/net.h>
 
-#include <asm/arch/mcf54xx-regs.h>
+#include <mach/mcf54xx-regs.h>
 
 
 #define ASSERT(x)
diff --git a/arch/m68k/mach-mcfv4e/net/net.c b/arch/m68k/mach-mcfv4e/net/net.c
index 76e28531b6..1bc089bdd3 100644
--- a/arch/m68k/mach-mcfv4e/net/net.c
+++ b/arch/m68k/mach-mcfv4e/net/net.c
@@ -26,14 +26,14 @@
 #include <malloc.h>
 #include <linux/types.h>
 
-#include <asm/arch/mcf54xx-regs.h>
-#include <asm/proc/mcdapi/MCD_dma.h>
-#include <asm/proc/net/net.h>
-#include <asm/proc/fecbd.h>
-#include <asm/proc/fec.h>
-#include <asm/proc/dma_utils.h>
-
-#include <asm/proc/processor.h> //FIXME - move to other file
+#include <mach/mcf54xx-regs.h>
+#include <proc/mcdapi/MCD_dma.h>
+#include <proc/net/net.h>
+#include <proc/fecbd.h>
+#include <proc/fec.h>
+#include <proc/dma_utils.h>
+
+#include <proc/processor.h> //FIXME - move to other file
 
 int netif_init(int channel)
 {
diff --git a/arch/m68k/mach-mcfv4e/net/queue.c b/arch/m68k/mach-mcfv4e/net/queue.c
index 55f938af3e..e573fcfd58 100644
--- a/arch/m68k/mach-mcfv4e/net/queue.c
+++ b/arch/m68k/mach-mcfv4e/net/queue.c
@@ -25,7 +25,7 @@
  * @todo Replace by u-boot standard list functions
  */
 #include <linux/types.h>
-#include <asm/proc/net/queue.h>
+#include <proc/net/queue.h>
 
 /** Initialize the specified queue to an empty state
  *
diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile
index ab79a6506d..72eb36bad2 100644
--- a/arch/ppc/Makefile
+++ b/arch/ppc/Makefile
@@ -21,29 +21,17 @@ ifndef CONFIG_MODULE
 CPPFLAGS += -fdata-sections -ffunction-sections
 endif
 
-ifeq ($(incdir-y),)
-incdir-y := $(machine-y)
-endif
-INCDIR   := arch-$(incdir-y)
-
-#	Update machine arch and proc symlinks if something which affects
-#	them changed.  We use .arch to indicate when they were updated
-#	last, otherwise make uses the target directory mtime.
+machdirs := $(patsubst %,arch/ppc/mach-%/,$(cpu-y))
 
-include/asm-ppc/.arch: $(wildcard include/config/arch/*.h) include/config/auto.conf
-	@echo '  SYMLINK include/asm-ppc/arch -> include/asm-ppc/$(INCDIR)'
-ifneq ($(KBUILD_SRC),)
-	$(Q)mkdir -p include/asm-ppc
-	$(Q)ln -fsn $(srctree)/include/asm-ppc/$(INCDIR) include/asm-ppc/arch
+ifeq ($(KBUILD_SRC),)
+CPPFLAGS += $(patsubst %,-I%include,$(machdirs))
 else
-	$(Q)ln -fsn $(INCDIR) include/asm-ppc/arch
+CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs))
 endif
-	@touch $@
 
 archprepare: maketools
 
 PHONY += maketools
-maketools: include/asm-ppc/.arch
 
 
 ifneq ($(board-y),)
@@ -62,5 +50,3 @@ common-y += $(BOARD) $(CPU)
 common-y += arch/ppc/lib/
 
 lds-y += $(BOARD)/u-boot.lds
-
-MRPROPER_FILES += include/asm-ppc/arch
diff --git a/include/asm-ppc/atomic.h b/arch/ppc/include/asm/atomic.h
index 23f22df1b7..23f22df1b7 100644
--- a/include/asm-ppc/atomic.h
+++ b/arch/ppc/include/asm/atomic.h
diff --git a/include/asm-ppc/bitops.h b/arch/ppc/include/asm/bitops.h
index e83f0e90d2..e83f0e90d2 100644
--- a/include/asm-ppc/bitops.h
+++ b/arch/ppc/include/asm/bitops.h
diff --git a/include/asm-ppc/byteorder.h b/arch/ppc/include/asm/byteorder.h
index d3e719b8a5..d3e719b8a5 100644
--- a/include/asm-ppc/byteorder.h
+++ b/arch/ppc/include/asm/byteorder.h
diff --git a/include/asm-ppc/cache.h b/arch/ppc/include/asm/cache.h
index f37af97c07..f37af97c07 100644
--- a/include/asm-ppc/cache.h
+++ b/arch/ppc/include/asm/cache.h
diff --git a/include/asm-ppc/common.h b/arch/ppc/include/asm/common.h
index 843bcf71ed..843bcf71ed 100644
--- a/include/asm-ppc/common.h
+++ b/arch/ppc/include/asm/common.h
diff --git a/include/asm-ppc/e300.h b/arch/ppc/include/asm/e300.h
index 79dcae416f..79dcae416f 100644
--- a/include/asm-ppc/e300.h
+++ b/arch/ppc/include/asm/e300.h
diff --git a/include/asm-ppc/elf.h b/arch/ppc/include/asm/elf.h
index 2fb48ecbcf..2fb48ecbcf 100644
--- a/include/asm-ppc/elf.h
+++ b/arch/ppc/include/asm/elf.h
diff --git a/include/asm-ppc/fsl_i2c.h b/arch/ppc/include/asm/fsl_i2c.h
index 4f71341327..4f71341327 100644
--- a/include/asm-ppc/fsl_i2c.h
+++ b/arch/ppc/include/asm/fsl_i2c.h
diff --git a/include/asm-ppc/global_data.h b/arch/ppc/include/asm/global_data.h
index 482c100d89..482c100d89 100644
--- a/include/asm-ppc/global_data.h
+++ b/arch/ppc/include/asm/global_data.h
diff --git a/include/asm-ppc/io.h b/arch/ppc/include/asm/io.h
index 052ae152e9..052ae152e9 100644
--- a/include/asm-ppc/io.h
+++ b/arch/ppc/include/asm/io.h
diff --git a/include/asm-ppc/mc146818rtc.h b/arch/ppc/include/asm/mc146818rtc.h
index 5f806c4ec2..5f806c4ec2 100644
--- a/include/asm-ppc/mc146818rtc.h
+++ b/arch/ppc/include/asm/mc146818rtc.h
diff --git a/include/asm-ppc/mmu.h b/arch/ppc/include/asm/mmu.h
index 1667041a8c..1667041a8c 100644
--- a/include/asm-ppc/mmu.h
+++ b/arch/ppc/include/asm/mmu.h
diff --git a/include/asm-ppc/module.h b/arch/ppc/include/asm/module.h
index 09c04402c5..09c04402c5 100644
--- a/include/asm-ppc/module.h
+++ b/arch/ppc/include/asm/module.h
diff --git a/include/asm-ppc/pci_io.h b/arch/ppc/include/asm/pci_io.h
index 9b738c383f..9b738c383f 100644
--- a/include/asm-ppc/pci_io.h
+++ b/arch/ppc/include/asm/pci_io.h
diff --git a/include/asm-ppc/posix_types.h b/arch/ppc/include/asm/posix_types.h
index 9170728117..9170728117 100644
--- a/include/asm-ppc/posix_types.h
+++ b/arch/ppc/include/asm/posix_types.h
diff --git a/include/asm-ppc/ppc_asm.tmpl b/arch/ppc/include/asm/ppc_asm.tmpl
index 3e47e82aba..3e47e82aba 100644
--- a/include/asm-ppc/ppc_asm.tmpl
+++ b/arch/ppc/include/asm/ppc_asm.tmpl
diff --git a/include/asm-ppc/ppc_defs.h b/arch/ppc/include/asm/ppc_defs.h
index 8b2b3b5fd7..8b2b3b5fd7 100644
--- a/include/asm-ppc/ppc_defs.h
+++ b/arch/ppc/include/asm/ppc_defs.h
diff --git a/include/asm-ppc/processor.h b/arch/ppc/include/asm/processor.h
index b336f48b78..b336f48b78 100644
--- a/include/asm-ppc/processor.h
+++ b/arch/ppc/include/asm/processor.h
diff --git a/include/asm-ppc/ptrace.h b/arch/ppc/include/asm/ptrace.h
index b4d599f43b..b4d599f43b 100644
--- a/include/asm-ppc/ptrace.h
+++ b/arch/ppc/include/asm/ptrace.h
diff --git a/include/asm-ppc/sigcontext.h b/arch/ppc/include/asm/sigcontext.h
index 4bd66a707d..4bd66a707d 100644
--- a/include/asm-ppc/sigcontext.h
+++ b/arch/ppc/include/asm/sigcontext.h
diff --git a/include/asm-ppc/signal.h b/arch/ppc/include/asm/signal.h
index b11a28efd1..b11a28efd1 100644
--- a/include/asm-ppc/signal.h
+++ b/arch/ppc/include/asm/signal.h
diff --git a/include/asm-ppc/status_led.h b/arch/ppc/include/asm/status_led.h
index eb81f371c9..eb81f371c9 100644
--- a/include/asm-ppc/status_led.h
+++ b/arch/ppc/include/asm/status_led.h
diff --git a/include/asm-ppc/string.h b/arch/ppc/include/asm/string.h
index d912a6b5fe..d912a6b5fe 100644
--- a/include/asm-ppc/string.h
+++ b/arch/ppc/include/asm/string.h
diff --git a/include/asm-ppc/types.h b/arch/ppc/include/asm/types.h
index 4ebbb9e028..4ebbb9e028 100644
--- a/include/asm-ppc/types.h
+++ b/arch/ppc/include/asm/types.h
diff --git a/include/asm-ppc/u-boot.h b/arch/ppc/include/asm/u-boot.h
index 30b44e3d22..30b44e3d22 100644
--- a/include/asm-ppc/u-boot.h
+++ b/arch/ppc/include/asm/u-boot.h
diff --git a/arch/ppc/lib/time.c b/arch/ppc/lib/time.c
index 9db04601c0..ee6cbdf676 100644
--- a/arch/ppc/lib/time.c
+++ b/arch/ppc/lib/time.c
@@ -24,7 +24,7 @@
 #include <common.h>
 #include <clock.h>
 #include <init.h>
-#include <asm/arch/clocks.h>
+#include <mach/clocks.h>
 #include <asm/common.h>
 
 /* ------------------------------------------------------------------------- */
diff --git a/arch/ppc/mach-mpc5xxx/cpu.c b/arch/ppc/mach-mpc5xxx/cpu.c
index eebe53e83f..59b1538cd0 100644
--- a/arch/ppc/mach-mpc5xxx/cpu.c
+++ b/arch/ppc/mach-mpc5xxx/cpu.c
@@ -27,12 +27,12 @@
 
 #include <common.h>
 #include <command.h>
-#include <asm/arch/mpc5xxx.h>
+#include <mach/mpc5xxx.h>
 #include <asm/processor.h>
 #include <asm/byteorder.h>
 #include <init.h>
 #include <types.h>
-#include <asm/arch/clocks.h>
+#include <mach/clocks.h>
 
 #if defined(CONFIG_OF_FLAT_TREE)
 #include <ft_build.h>
diff --git a/arch/ppc/mach-mpc5xxx/cpu_init.c b/arch/ppc/mach-mpc5xxx/cpu_init.c
index 8eb00f05f3..fc5db0ec3e 100644
--- a/arch/ppc/mach-mpc5xxx/cpu_init.c
+++ b/arch/ppc/mach-mpc5xxx/cpu_init.c
@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <asm/arch/mpc5xxx.h>
+#include <mach/mpc5xxx.h>
 #include <types.h>
 #include <reloc.h>
 
diff --git a/include/asm-ppc/arch-mpc5200/clocks.h b/arch/ppc/mach-mpc5xxx/include/mach/clocks.h
index 4e1a903e79..4e1a903e79 100644
--- a/include/asm-ppc/arch-mpc5200/clocks.h
+++ b/arch/ppc/mach-mpc5xxx/include/mach/clocks.h
diff --git a/include/asm-ppc/arch-mpc5200/fec.h b/arch/ppc/mach-mpc5xxx/include/mach/fec.h
index a3e04b4e9d..a3e04b4e9d 100644
--- a/include/asm-ppc/arch-mpc5200/fec.h
+++ b/arch/ppc/mach-mpc5xxx/include/mach/fec.h
diff --git a/include/asm-ppc/arch-mpc5200/mpc5xxx.h b/arch/ppc/mach-mpc5xxx/include/mach/mpc5xxx.h
index 0638df157c..d7d081137b 100644
--- a/include/asm-ppc/arch-mpc5200/mpc5xxx.h
+++ b/arch/ppc/mach-mpc5xxx/include/mach/mpc5xxx.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-ppc/mpc5xxx.h
+ * arch/ppc/mach-mpc5xxx/include/mach/mpc5xxx.h
  *
  * Prototypes, etc. for the Motorola MGT5xxx/MPC5xxx
  * embedded cpu chips
diff --git a/include/asm-ppc/arch-mpc5200/sdma.h b/arch/ppc/mach-mpc5xxx/include/mach/sdma.h
index 17f22f0add..5e7ff5fffa 100644
--- a/include/asm-ppc/arch-mpc5200/sdma.h
+++ b/arch/ppc/mach-mpc5xxx/include/mach/sdma.h
@@ -12,7 +12,7 @@
 #define __MPC5XXX_SDMA_H
 
 #include <common.h>
-#include <asm/arch/mpc5xxx.h>
+#include <mach/mpc5xxx.h>
 
 /* Task number assignment */
 #define FEC_RECV_TASK_NO            0
diff --git a/arch/ppc/mach-mpc5xxx/interrupts.c b/arch/ppc/mach-mpc5xxx/interrupts.c
index 8665a066b0..58f4530dc4 100644
--- a/arch/ppc/mach-mpc5xxx/interrupts.c
+++ b/arch/ppc/mach-mpc5xxx/interrupts.c
@@ -41,9 +41,9 @@
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <command.h>
-#include <asm/arch/sdma.h>
+#include <mach/sdma.h>
 #include <asm/bitops.h>
-#include <asm/arch/clocks.h>
+#include <mach/clocks.h>
 
 struct irq_action {
 	interrupt_handler_t *handler;
diff --git a/arch/ppc/mach-mpc5xxx/loadtask.c b/arch/ppc/mach-mpc5xxx/loadtask.c
index 77ba8c89d2..1458cf7218 100644
--- a/arch/ppc/mach-mpc5xxx/loadtask.c
+++ b/arch/ppc/mach-mpc5xxx/loadtask.c
@@ -7,7 +7,7 @@
  */
 
 #include <common.h>
-#include <asm/arch/mpc5xxx.h>
+#include <mach/mpc5xxx.h>
 #include <types.h>
 
 /* BestComm/SmartComm microcode */
diff --git a/arch/ppc/mach-mpc5xxx/reginfo.c b/arch/ppc/mach-mpc5xxx/reginfo.c
index 130e0357d6..92a1b59512 100644
--- a/arch/ppc/mach-mpc5xxx/reginfo.c
+++ b/arch/ppc/mach-mpc5xxx/reginfo.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <config.h>
-#include <asm/arch/mpc5xxx.h>
+#include <mach/mpc5xxx.h>
 
 void reginfo(void)
 {
diff --git a/arch/ppc/mach-mpc5xxx/speed.c b/arch/ppc/mach-mpc5xxx/speed.c
index 7207016831..46efc6c24f 100644
--- a/arch/ppc/mach-mpc5xxx/speed.c
+++ b/arch/ppc/mach-mpc5xxx/speed.c
@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <asm/arch/mpc5xxx.h>
+#include <mach/mpc5xxx.h>
 #include <init.h>
 #include <asm/processor.h>
 #include <types.h>
diff --git a/arch/sandbox/Makefile b/arch/sandbox/Makefile
index 5501b104ba..57fac202f6 100644
--- a/arch/sandbox/Makefile
+++ b/arch/sandbox/Makefile
@@ -1,7 +1,7 @@
 
 CPPFLAGS += -fno-strict-aliasing
 
-machine-y	   := sandbox
+machine-y := sandbox
 
 board-y := sandbox
 lds-y   := board/sandbox/u-boot.lds
@@ -22,10 +22,13 @@ CFLAGS += -Dmalloc=u_boot_malloc \
 		-Dglob=u_boot_glob -Dglobfree=u_boot_globfree \
 		-Dioctl=u_boot_ioctl
 
-ifeq ($(incdir-y),)
-incdir-y := $(machine-y)
+machdirs := $(patsubst %,arch/sandbox/mach-%/,$(machine-y))
+
+ifeq ($(KBUILD_SRC),)
+CPPFLAGS += $(patsubst %,-I%include,$(machdirs))
+else
+CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs))
 endif
-INCDIR   := arch-$(incdir-y)
 
 SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
 				  -e s/arm.*/arm/ -e s/sa110/arm/ \
@@ -50,24 +53,10 @@ endif
 
 CPPFLAGS += -DELF_CLASS="$(ELF_CLASS)"
 export ELF_FORMAT ELF_ARCH SUBARCH ELF_CLASS
-#	Update machine arch and proc symlinks if something which affects
-#	them changed.  We use .arch to indicate when they were updated
-#	last, otherwise make uses the target directory mtime.
-
-include/asm-sandbox/.arch: $(wildcard include/config/arch/*.h) include/config/auto.conf
-	@echo '  SYMLINK include/asm-sandbox/arch -> include/asm-sandbox/$(INCDIR)'
-ifneq ($(KBUILD_SRC),)
-	$(Q)mkdir -p include/asm-sandbox
-	$(Q)ln -fsn $(srctree)/include/asm-sandbox/$(INCDIR) include/asm-sandbox/arch
-else
-	$(Q)ln -fsn $(INCDIR) include/asm-sandbox/arch
-endif
-	@touch $@
 
 archprepare: maketools
 
 PHONY += maketools
-maketools: include/asm-sandbox/.arch
 
 cmd_uboot__ = $(CC) -o $@ -Wl,-T,$(uboot-lds) \
 	-Wl,--start-group $(uboot-common) -Wl,--end-group \
@@ -76,4 +65,3 @@ cmd_uboot__ = $(CC) -o $@ -Wl,-T,$(uboot-lds) \
 common-y += board/sandbox/ arch/sandbox/os/
 
 CLEAN_FILES += board/sandbox/u-boot.lds
-MRPROPER_FILES += include/asm-sandbox/arch
diff --git a/include/asm-sandbox/bitops.h b/arch/sandbox/include/asm/bitops.h
index 94646d4d0d..94646d4d0d 100644
--- a/include/asm-sandbox/bitops.h
+++ b/arch/sandbox/include/asm/bitops.h
diff --git a/include/asm-sandbox/byteorder.h b/arch/sandbox/include/asm/byteorder.h
index 37316f2371..37316f2371 100644
--- a/include/asm-sandbox/byteorder.h
+++ b/arch/sandbox/include/asm/byteorder.h
diff --git a/include/asm-sandbox/common.h b/arch/sandbox/include/asm/common.h
index 9b8bd2d94c..9b8bd2d94c 100644
--- a/include/asm-sandbox/common.h
+++ b/arch/sandbox/include/asm/common.h
diff --git a/include/asm-sandbox/elf.h b/arch/sandbox/include/asm/elf.h
index b60d24890c..b60d24890c 100644
--- a/include/asm-sandbox/elf.h
+++ b/arch/sandbox/include/asm/elf.h
diff --git a/include/asm-sandbox/global_data.h b/arch/sandbox/include/asm/global_data.h
index 51d9405d65..51d9405d65 100644
--- a/include/asm-sandbox/global_data.h
+++ b/arch/sandbox/include/asm/global_data.h
diff --git a/include/asm-sandbox/posix_types.h b/arch/sandbox/include/asm/posix_types.h
index 5dcc842ab7..5dcc842ab7 100644
--- a/include/asm-sandbox/posix_types.h
+++ b/arch/sandbox/include/asm/posix_types.h
diff --git a/include/asm-sandbox/processor.h b/arch/sandbox/include/asm/processor.h
index 5dedba82ca..5dedba82ca 100644
--- a/include/asm-sandbox/processor.h
+++ b/arch/sandbox/include/asm/processor.h
diff --git a/include/asm-sandbox/ptrace.h b/arch/sandbox/include/asm/ptrace.h
index 2997587d82..2997587d82 100644
--- a/include/asm-sandbox/ptrace.h
+++ b/arch/sandbox/include/asm/ptrace.h
diff --git a/include/asm-sandbox/string.h b/arch/sandbox/include/asm/string.h
index 2997587d82..2997587d82 100644
--- a/include/asm-sandbox/string.h
+++ b/arch/sandbox/include/asm/string.h
diff --git a/include/asm-sandbox/types.h b/arch/sandbox/include/asm/types.h
index a9872194d9..a9872194d9 100644
--- a/include/asm-sandbox/types.h
+++ b/arch/sandbox/include/asm/types.h
diff --git a/include/asm-sandbox/u-boot.h b/arch/sandbox/include/asm/u-boot.h
index 2997587d82..2997587d82 100644
--- a/include/asm-sandbox/u-boot.h
+++ b/arch/sandbox/include/asm/u-boot.h
diff --git a/include/asm-sandbox/arch-sandbox/hostfile.h b/arch/sandbox/mach-sandbox/include/mach/hostfile.h
index 30f9499c03..30f9499c03 100644
--- a/include/asm-sandbox/arch-sandbox/hostfile.h
+++ b/arch/sandbox/mach-sandbox/include/mach/hostfile.h
diff --git a/include/asm-sandbox/arch-sandbox/linux.h b/arch/sandbox/mach-sandbox/include/mach/linux.h
index 09376413e9..09376413e9 100644
--- a/include/asm-sandbox/arch-sandbox/linux.h
+++ b/arch/sandbox/mach-sandbox/include/mach/linux.h
diff --git a/arch/sandbox/os/Makefile b/arch/sandbox/os/Makefile
index 117f05eba0..2980301e15 100644
--- a/arch/sandbox/os/Makefile
+++ b/arch/sandbox/os/Makefile
@@ -1,4 +1,14 @@
-CPPFLAGS := -Iinclude/asm/arch -P
+machine-y := sandbox
+
+machdirs := $(patsubst %,arch/sandbox/mach-%/,$(machine-y))
+
+ifeq ($(KBUILD_SRC),)
+CPPFLAGS := $(patsubst %,-I%include,$(machdirs))
+else
+CPPFLAGS = $(patsubst %,-I$(srctree)/%include,$(machdirs))
+endif
+
+CPPFLAGS += -P
 CFLAGS := -Wall
 NOSTDINC_FLAGS :=
 
diff --git a/arch/sandbox/os/common.c b/arch/sandbox/os/common.c
index 72e4c8d702..e89d8a6d36 100644
--- a/arch/sandbox/os/common.c
+++ b/arch/sandbox/os/common.c
@@ -47,8 +47,8 @@
 /*
  * ...except the ones needed to connect with U-Boot
  */
-#include <linux.h>
-#include <hostfile.h>
+#include <mach/linux.h>
+#include <mach/hostfile.h>
 
 static struct termios term_orig, term_vi;
 static char erase_char;	/* the users erase character */
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>
diff --git a/drivers/nand/atmel_nand.c b/drivers/nand/atmel_nand.c
index 9481990b8b..e8f85fc621 100644
--- a/drivers/nand/atmel_nand.c
+++ b/drivers/nand/atmel_nand.c
@@ -32,7 +32,7 @@
 #include <linux/mtd/nand.h>
 
 #include <asm/io.h>
-#include <asm/arch/board.h>
+#include <mach/board.h>
 
 #include <errno.h>
 
diff --git a/drivers/nand/nand_imx.c b/drivers/nand/nand_imx.c
index 5434f0c023..1a708e9527 100644
--- a/drivers/nand/nand_imx.c
+++ b/drivers/nand/nand_imx.c
@@ -24,9 +24,9 @@
 #include <init.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
-#include <asm/arch/imx-nand.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/generic.h>
+#include <mach/generic.h>
+#include <mach/imx-nand.h>
+#include <mach/imx-regs.h>
 #include <asm/io.h>
 #include <errno.h>
 
diff --git a/drivers/nand/nand_imx_v2.c b/drivers/nand/nand_imx_v2.c
index fcdfb79f7f..32e3564204 100644
--- a/drivers/nand/nand_imx_v2.c
+++ b/drivers/nand/nand_imx_v2.c
@@ -17,8 +17,8 @@
 #include <init.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
-#include <asm/arch/imx-nand.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-nand.h>
+#include <mach/imx-regs.h>
 #include <asm/io.h>
 #include <errno.h>
 
diff --git a/drivers/nand/nand_omap_gpmc.c b/drivers/nand/nand_omap_gpmc.c
index cc365bc3cf..c6647e56ed 100644
--- a/drivers/nand/nand_omap_gpmc.c
+++ b/drivers/nand/nand_omap_gpmc.c
@@ -72,9 +72,9 @@
 #include <linux/mtd/nand.h>
 #include <linux/mtd/nand_ecc.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>
 
 /* Enable me to get tons of debug messages -for use without jtag */
 #if 0
diff --git a/drivers/nand/nand_s3c2410.c b/drivers/nand/nand_s3c2410.c
index 6423f85b63..b1fe377bef 100644
--- a/drivers/nand/nand_s3c2410.c
+++ b/drivers/nand/nand_s3c2410.c
@@ -30,9 +30,9 @@
 #include <init.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
-#include <asm/arch/s3c24xx-generic.h>
-#include <asm/arch/s3c24x0-iomap.h>
-#include <asm/arch/s3c24x0-nand.h>
+#include <mach/s3c24xx-generic.h>
+#include <mach/s3c24x0-iomap.h>
+#include <mach/s3c24x0-nand.h>
 #include <asm/io.h>
 #include <asm-generic/errno.h>
 
diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c
index 6591b7b06b..9d8b8c75c5 100644
--- a/drivers/net/fec_imx.c
+++ b/drivers/net/fec_imx.c
@@ -29,9 +29,9 @@
 
 #include <asm/mmu.h>
 #include <asm/io.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 #include <clock.h>
-#include <asm/arch/clock.h>
+#include <mach/clock.h>
 #include <xfuncs.h>
 
 #include "fec_imx.h"
diff --git a/drivers/net/fec_mpc5200.c b/drivers/net/fec_mpc5200.c
index 05f63d7801..d803ddf603 100644
--- a/drivers/net/fec_mpc5200.c
+++ b/drivers/net/fec_mpc5200.c
@@ -7,15 +7,15 @@
  */
 
 #include <common.h>
-#include <asm/arch/mpc5xxx.h>
+#include <mach/mpc5xxx.h>
 #include <malloc.h>
 #include <net.h>
 #include <init.h>
 #include <miiphy.h>
 #include <driver.h>
-#include <asm/arch/sdma.h>
-#include <asm/arch/fec.h>
-#include <asm/arch/clocks.h>
+#include <mach/sdma.h>
+#include <mach/fec.h>
+#include <mach/clocks.h>
 #include <miiphy.h>
 #include "fec_mpc5200.h"
 
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index fabb4fa8f3..693e64f278 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -47,8 +47,8 @@
 #include <miiphy.h>
 #include <errno.h>
 #include <asm/io.h>
-#include <asm/arch/board.h>
-#include <asm/arch/clk.h>
+#include <mach/board.h>
+#include <mach/clk.h>
 
 #include "macb.h"
 
diff --git a/drivers/net/netx_eth.c b/drivers/net/netx_eth.c
index 6c52fb790c..e29f69ccb5 100644
--- a/drivers/net/netx_eth.c
+++ b/drivers/net/netx_eth.c
@@ -3,9 +3,9 @@
 #include <net.h>
 #include <asm/io.h>
 #include <miiphy.h>
-#include <asm/arch/netx-xc.h>
-#include <asm/arch/netx-eth.h>
-#include <asm/arch/netx-regs.h>
+#include <mach/netx-xc.h>
+#include <mach/netx-eth.h>
+#include <mach/netx-regs.h>
 #include <xfuncs.h>
 #include <miiphy.h>
 #include <init.h>
diff --git a/drivers/net/tap.c b/drivers/net/tap.c
index e09c136ecf..7070cc6b41 100644
--- a/drivers/net/tap.c
+++ b/drivers/net/tap.c
@@ -25,7 +25,7 @@
 #include <malloc.h>
 #include <net.h>
 #include <init.h>
-#include <asm/arch/linux.h>
+#include <mach/linux.h>
 
 struct tap_priv {
 	int fd;
diff --git a/drivers/serial/atmel.c b/drivers/serial/atmel.c
index 3901835c16..e9e8116619 100644
--- a/drivers/serial/atmel.c
+++ b/drivers/serial/atmel.c
@@ -22,7 +22,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <asm/io.h>
-#include <asm/arch/clk.h>
+#include <mach/clk.h>
 
 /* USART3 register offsets */
 #define USART3_CR				0x0000
diff --git a/drivers/serial/linux_console.c b/drivers/serial/linux_console.c
index 39ff862729..c792b501a0 100644
--- a/drivers/serial/linux_console.c
+++ b/drivers/serial/linux_console.c
@@ -23,7 +23,7 @@
 #include <common.h>
 #include <driver.h>
 #include <init.h>
-#include <asm/arch/linux.h>
+#include <mach/linux.h>
 #include <malloc.h>
 #include <console.h>
 #include <xfuncs.h>
diff --git a/drivers/serial/serial_at91rm9200.c b/drivers/serial/serial_at91rm9200.c
index 7f00b30ad6..f5546aa758 100644
--- a/drivers/serial/serial_at91rm9200.c
+++ b/drivers/serial/serial_at91rm9200.c
@@ -31,7 +31,7 @@
 
 #include <common.h>
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #if !defined(CONFIG_DBGU) && !defined(CONFIG_USART0) && !defined(CONFIG_USART1)
 #error must define one of CONFIG_DBGU or CONFIG_USART0 or CONFIG_USART1
diff --git a/drivers/serial/serial_imx.c b/drivers/serial/serial_imx.c
index 89f1c4a9af..91d3b188cc 100644
--- a/drivers/serial/serial_imx.c
+++ b/drivers/serial/serial_imx.c
@@ -18,8 +18,8 @@
  */
 
 #include <common.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/clock.h>
+#include <mach/imx-regs.h>
+#include <mach/clock.h>
 #include <driver.h>
 #include <init.h>
 #include <malloc.h>
diff --git a/drivers/serial/serial_mpc5xxx.c b/drivers/serial/serial_mpc5xxx.c
index a86c655bc8..2509708863 100644
--- a/drivers/serial/serial_mpc5xxx.c
+++ b/drivers/serial/serial_mpc5xxx.c
@@ -34,13 +34,13 @@
  */
 
 #include <common.h>
-#include <asm/arch/mpc5xxx.h>
+#include <mach/mpc5xxx.h>
 #include <driver.h>
 #include <init.h>
 #include <console.h>
 #include <xfuncs.h>
 #include <reloc.h>
-#include <asm/arch/clocks.h>
+#include <mach/clocks.h>
 
 static int __mpc5xxx_serial_setbaudrate(struct mpc5xxx_psc *psc, int baudrate)
 {
diff --git a/drivers/serial/serial_netx.c b/drivers/serial/serial_netx.c
index 68b4d20751..7c095197fd 100644
--- a/drivers/serial/serial_netx.c
+++ b/drivers/serial/serial_netx.c
@@ -22,7 +22,7 @@
  */
 
 #include <common.h>
-#include <asm/arch/netx-regs.h>
+#include <mach/netx-regs.h>
 #include <driver.h>
 #include <init.h>
 #include <malloc.h>
diff --git a/drivers/serial/serial_s3c24x0.c b/drivers/serial/serial_s3c24x0.c
index 92e9fa9b0c..fedddd33b3 100644
--- a/drivers/serial/serial_s3c24x0.c
+++ b/drivers/serial/serial_s3c24x0.c
@@ -25,8 +25,8 @@
 #include <init.h>
 #include <malloc.h>
 #include <asm/io.h>
-#include <asm/arch/s3c24xx-generic.h>
-#include <asm/arch/s3c24x0-iomap.h>
+#include <mach/s3c24xx-generic.h>
+#include <mach/s3c24x0-iomap.h>
 
 /* Note: Offsets are for little endian access */
 #define ULCON 0x00		/* line control */
diff --git a/drivers/spi/imx_spi.c b/drivers/spi/imx_spi.c
index 8a483082ef..5c9791978a 100644
--- a/drivers/spi/imx_spi.c
+++ b/drivers/spi/imx_spi.c
@@ -25,7 +25,7 @@
 #include <xfuncs.h>
 #include <asm/io.h>
 #include <gpio.h>
-#include <asm/arch/spi.h>
+#include <mach/spi.h>
 
 #define MXC_CSPIRXDATA		0x00
 #define MXC_CSPITXDATA		0x04
diff --git a/drivers/spi/mc13783.c b/drivers/spi/mc13783.c
index 1cded4b783..19e2780920 100644
--- a/drivers/spi/mc13783.c
+++ b/drivers/spi/mc13783.c
@@ -24,7 +24,7 @@
 #include <spi/spi.h>
 #include <xfuncs.h>
 #include <errno.h>
-#include <asm/arch/pmic.h>
+#include <mach/pmic.h>
 
 #define REG_INTERRUPT_STATUS_0			0x0
 #define	REG_INTERRUPT_MASK			0x1
diff --git a/drivers/video/imx.c b/drivers/video/imx.c
index 10aaa80cf3..9a30ca46f3 100644
--- a/drivers/video/imx.c
+++ b/drivers/video/imx.c
@@ -17,14 +17,14 @@
 #include <common.h>
 #include <fb.h>
 #include <asm/io.h>
-#include <asm/arch/imxfb.h>
+#include <mach/imxfb.h>
 #include <driver.h>
 #include <malloc.h>
 #include <errno.h>
 #include <init.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 #include <asm-generic/div64.h>
-#include <asm/arch/clock.h>
+#include <mach/clock.h>
 
 #define LCDC_SSA	0x00
 
diff --git a/include/asm-arm/.gitignore b/include/asm-arm/.gitignore
deleted file mode 100644
index 673849bfc9..0000000000
--- a/include/asm-arm/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-arch
-proc
diff --git a/include/asm-arm/ptrace.h b/include/asm-arm/ptrace.h
deleted file mode 100644
index 73c9087b50..0000000000
--- a/include/asm-arm/ptrace.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef __ASM_ARM_PTRACE_H
-#define __ASM_ARM_PTRACE_H
-
-#define PTRACE_GETREGS		12
-#define PTRACE_SETREGS		13
-#define PTRACE_GETFPREGS	14
-#define PTRACE_SETFPREGS	15
-
-#define PTRACE_SETOPTIONS	21
-
-/* options set using PTRACE_SETOPTIONS */
-#define PTRACE_O_TRACESYSGOOD	0x00000001
-
-#include <asm/proc/ptrace.h>
-
-#ifndef __ASSEMBLY__
-#define pc_pointer(v) \
-	((v) & ~PCMASK)
-
-#define instruction_pointer(regs) \
-	(pc_pointer((regs)->ARM_pc))
-
-#ifdef __KERNEL__
-extern void show_regs(struct pt_regs *);
-
-#define predicate(x)	(x & 0xf0000000)
-#define PREDICATE_ALWAYS	0xe0000000
-
-#endif
-
-#endif /* __ASSEMBLY__ */
-
-#endif
diff --git a/include/asm-generic/u-boot.lds.h b/include/asm-generic/u-boot.lds.h
index 4982ce03db..1a5f2f7753 100644
--- a/include/asm-generic/u-boot.lds.h
+++ b/include/asm-generic/u-boot.lds.h
@@ -1,6 +1,6 @@
 
 #ifdef CONFIG_ARCH_IMX25
-#include <asm/arch/u-boot.lds.h>
+#include <mach/u-boot.lds.h>
 #endif
 
 #ifndef PRE_IMAGE
diff --git a/include/asm-ppc/.gitignore b/include/asm-ppc/.gitignore
deleted file mode 100644
index aca8da44fb..0000000000
--- a/include/asm-ppc/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-arch
\ No newline at end of file
diff --git a/include/debug_ll.h b/include/debug_ll.h
index f06fa6e57a..e99ae7d207 100644
--- a/include/debug_ll.h
+++ b/include/debug_ll.h
@@ -26,7 +26,7 @@
 #define   __INCLUDE_DEBUG_LL_H__
 
 #if defined (CONFIG_DEBUG_LL)
-# include <asm/arch/debug_ll.h>
+# include <mach/debug_ll.h>
 
 #define PUTC_LL(x) putc(x)
 # define PUTHEX_LL(value)  ({ unsigned long v = (unsigned long) (value); \