320 files changed, 65 insertions, 64 deletions

diff --git a/Documentation/barebox-main.dox b/Documentation/barebox-main.dox
index 01c45c1d26..fb780e6364 100644
--- a/Documentation/barebox-main.dox
+++ b/Documentation/barebox-main.dox
@@ -117,9 +117,9 @@ If everything goes well, the result is a file called @p barebox:
 
 @a barebox usually needs an environment for storing the configuration data.
 You can generate an environment using the example environment contained
-in board/sandbox/env:
+in arch/sanbox/board/env:
 
-@code # ./scripts/bareboxenv -s -p 0x10000 board/sandbox/env/ env.bin @endcode
+@code # ./scripts/bareboxenv -s -p 0x10000 arch/sanbox/board/env/ env.bin @endcode
 
 To get some files to play with you can generate a cramfs image:
 
diff --git a/Makefile b/Makefile
index 43818cb66e..f2695d0d8c 100644
--- a/Makefile
+++ b/Makefile
@@ -851,11 +851,11 @@ include/asm:
 	$(Q)$(create-symlink)
 
 include/config.h: include/config/auto.conf
-	@echo '  SYMLINK $@ -> board/$(board-y)/config.h'
+	@echo '  SYMLINK $@ -> $(BOARD)/config.h'
 ifneq ($(KBUILD_SRC),)
-	$(Q)ln -fsn $(srctree)/board/$(board-y)/config.h $@
+	$(Q)ln -fsn $(srctree)/$(BOARD)/config.h $@
 else
-	@ln -fsn ../board/$(board-y)/config.h $@
+	@ln -fsn ../$(BOARD)/config.h $@
 endif
 
 # Generate some files
diff --git a/TODO b/TODO
index 08a7d995eb..6350799e67 100644
--- a/TODO
+++ b/TODO
@@ -33,7 +33,6 @@ TODO
 [-] Cleanup cpu/*. Many functions there are not cpu specific. For example the
     cache functions for arm are common for most arm processors. (done for ARM)
     (I will check this for m68k arch - csc 21.03.2008 19:56:24)
-[ ] Board support should go to arch/*/boards/*
 [ ] Move SoC specific header files from include/ to include/asm/arch/
 [ ] Several .c/.h files do not have GNU/copyright headers.
 [ ] The cramfs driver currently uses direct memory accesses instead of read().
@@ -108,4 +107,4 @@ DONE
     be any key, ctrl-c or a certain string. Maybe like this:
     countdown -m msg -t timeout -x [ctrl-c|anykey|string]
     If done, remove the corresponding stuff from common/main.c
-
+[X] Board support should go to arch/*/boards/*
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index ac8459c7d7..8b4d64c268 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -118,7 +118,7 @@ maketools:
 PHONY += maketools
 
 ifneq ($(board-y),)
-BOARD := board/$(board-y)/
+BOARD := arch/arm/boards/$(board-y)/
 else
 BOARD :=
 endif
diff --git a/board/a9m2410/Makefile b/arch/arm/boards/a9m2410/Makefile
index 63026f08b2..63026f08b2 100644
--- a/board/a9m2410/Makefile
+++ b/arch/arm/boards/a9m2410/Makefile
diff --git a/board/a9m2410/a9m2410.c b/arch/arm/boards/a9m2410/a9m2410.c
index f327f82b7f..f327f82b7f 100644
--- a/board/a9m2410/a9m2410.c
+++ b/arch/arm/boards/a9m2410/a9m2410.c
diff --git a/board/a9m2410/config.h b/arch/arm/boards/a9m2410/config.h
index 87b05fc55d..87b05fc55d 100644
--- a/board/a9m2410/config.h
+++ b/arch/arm/boards/a9m2410/config.h
diff --git a/board/a9m2410/env/bin/_update b/arch/arm/boards/a9m2410/env/bin/_update
index 014bce3512..014bce3512 100644
--- a/board/a9m2410/env/bin/_update
+++ b/arch/arm/boards/a9m2410/env/bin/_update
diff --git a/board/a9m2410/env/bin/boot b/arch/arm/boards/a9m2410/env/bin/boot
index 59fa60e4e9..59fa60e4e9 100644
--- a/board/a9m2410/env/bin/boot
+++ b/arch/arm/boards/a9m2410/env/bin/boot
diff --git a/board/a9m2410/env/bin/hush_hack b/arch/arm/boards/a9m2410/env/bin/hush_hack
index 5fffa92ecd..5fffa92ecd 100644
--- a/board/a9m2410/env/bin/hush_hack
+++ b/arch/arm/boards/a9m2410/env/bin/hush_hack
diff --git a/board/a9m2410/env/bin/init b/arch/arm/boards/a9m2410/env/bin/init
index 5ae44dd455..5ae44dd455 100644
--- a/board/a9m2410/env/bin/init
+++ b/arch/arm/boards/a9m2410/env/bin/init
diff --git a/board/a9m2410/env/bin/update_kernel b/arch/arm/boards/a9m2410/env/bin/update_kernel
index c43a55785b..c43a55785b 100644
--- a/board/a9m2410/env/bin/update_kernel
+++ b/arch/arm/boards/a9m2410/env/bin/update_kernel
diff --git a/board/a9m2410/env/bin/update_root b/arch/arm/boards/a9m2410/env/bin/update_root
index 34139e5dce..34139e5dce 100644
--- a/board/a9m2410/env/bin/update_root
+++ b/arch/arm/boards/a9m2410/env/bin/update_root
diff --git a/board/a9m2410/env/config b/arch/arm/boards/a9m2410/env/config
index 79150ce017..79150ce017 100644
--- a/board/a9m2410/env/config
+++ b/arch/arm/boards/a9m2410/env/config
diff --git a/board/a9m2410/lowlevel_init.S b/arch/arm/boards/a9m2410/lowlevel_init.S
index 461b93c3f1..461b93c3f1 100644
--- a/board/a9m2410/lowlevel_init.S
+++ b/arch/arm/boards/a9m2410/lowlevel_init.S
diff --git a/board/a9m2440/Makefile b/arch/arm/boards/a9m2440/Makefile
index 779e83dc03..779e83dc03 100644
--- a/board/a9m2440/Makefile
+++ b/arch/arm/boards/a9m2440/Makefile
diff --git a/board/a9m2440/a9m2410dev.c b/arch/arm/boards/a9m2440/a9m2410dev.c
index 1220bd9777..1220bd9777 100644
--- a/board/a9m2440/a9m2410dev.c
+++ b/arch/arm/boards/a9m2440/a9m2410dev.c
diff --git a/board/a9m2440/a9m2440.c b/arch/arm/boards/a9m2440/a9m2440.c
index 2567f5ed13..2567f5ed13 100644
--- a/board/a9m2440/a9m2440.c
+++ b/arch/arm/boards/a9m2440/a9m2440.c
diff --git a/board/a9m2440/baseboards.h b/arch/arm/boards/a9m2440/baseboards.h
index ec80312b69..ec80312b69 100644
--- a/board/a9m2440/baseboards.h
+++ b/arch/arm/boards/a9m2440/baseboards.h
diff --git a/board/a9m2440/config.h b/arch/arm/boards/a9m2440/config.h
index 43cb6ab934..43cb6ab934 100644
--- a/board/a9m2440/config.h
+++ b/arch/arm/boards/a9m2440/config.h
diff --git a/board/a9m2440/env/bin/_update b/arch/arm/boards/a9m2440/env/bin/_update
index b10682ece4..b10682ece4 100644
--- a/board/a9m2440/env/bin/_update
+++ b/arch/arm/boards/a9m2440/env/bin/_update
diff --git a/board/a9m2440/env/bin/boot b/arch/arm/boards/a9m2440/env/bin/boot
index 86e22cf9ff..86e22cf9ff 100644
--- a/board/a9m2440/env/bin/boot
+++ b/arch/arm/boards/a9m2440/env/bin/boot
diff --git a/board/a9m2440/env/bin/hush_hack b/arch/arm/boards/a9m2440/env/bin/hush_hack
index 5fffa92ecd..5fffa92ecd 100644
--- a/board/a9m2440/env/bin/hush_hack
+++ b/arch/arm/boards/a9m2440/env/bin/hush_hack
diff --git a/board/a9m2440/env/bin/init b/arch/arm/boards/a9m2440/env/bin/init
index 5ae44dd455..5ae44dd455 100644
--- a/board/a9m2440/env/bin/init
+++ b/arch/arm/boards/a9m2440/env/bin/init
diff --git a/board/a9m2440/env/bin/update_kernel b/arch/arm/boards/a9m2440/env/bin/update_kernel
index c43a55785b..c43a55785b 100644
--- a/board/a9m2440/env/bin/update_kernel
+++ b/arch/arm/boards/a9m2440/env/bin/update_kernel
diff --git a/board/a9m2440/env/bin/update_root b/arch/arm/boards/a9m2440/env/bin/update_root
index 46cbca5beb..46cbca5beb 100644
--- a/board/a9m2440/env/bin/update_root
+++ b/arch/arm/boards/a9m2440/env/bin/update_root
diff --git a/board/a9m2440/env/config b/arch/arm/boards/a9m2440/env/config
index 936c35f9a9..936c35f9a9 100644
--- a/board/a9m2440/env/config
+++ b/arch/arm/boards/a9m2440/env/config
diff --git a/board/a9m2440/lowlevel_init.S b/arch/arm/boards/a9m2440/lowlevel_init.S
index 4b5c596076..4b5c596076 100644
--- a/board/a9m2440/lowlevel_init.S
+++ b/arch/arm/boards/a9m2440/lowlevel_init.S
diff --git a/board/at91sam9260ek/Makefile b/arch/arm/boards/at91sam9260ek/Makefile
index 73ef72e210..73ef72e210 100644
--- a/board/at91sam9260ek/Makefile
+++ b/arch/arm/boards/at91sam9260ek/Makefile
diff --git a/board/at91sam9260ek/config.h b/arch/arm/boards/at91sam9260ek/config.h
index afd8563212..afd8563212 100644
--- a/board/at91sam9260ek/config.h
+++ b/arch/arm/boards/at91sam9260ek/config.h
diff --git a/board/at91sam9260ek/env/bin/_update b/arch/arm/boards/at91sam9260ek/env/bin/_update
index 014bce3512..014bce3512 100644
--- a/board/at91sam9260ek/env/bin/_update
+++ b/arch/arm/boards/at91sam9260ek/env/bin/_update
diff --git a/board/at91sam9260ek/env/bin/boot b/arch/arm/boards/at91sam9260ek/env/bin/boot
index ed6f11a108..ed6f11a108 100644
--- a/board/at91sam9260ek/env/bin/boot
+++ b/arch/arm/boards/at91sam9260ek/env/bin/boot
diff --git a/board/at91sam9260ek/env/bin/init b/arch/arm/boards/at91sam9260ek/env/bin/init
index b8d8399842..b8d8399842 100644
--- a/board/at91sam9260ek/env/bin/init
+++ b/arch/arm/boards/at91sam9260ek/env/bin/init
diff --git a/board/at91sam9260ek/env/bin/pcidmaloop b/arch/arm/boards/at91sam9260ek/env/bin/pcidmaloop
index 24e76cbed7..24e76cbed7 100644
--- a/board/at91sam9260ek/env/bin/pcidmaloop
+++ b/arch/arm/boards/at91sam9260ek/env/bin/pcidmaloop
diff --git a/board/at91sam9260ek/env/bin/pciloop b/arch/arm/boards/at91sam9260ek/env/bin/pciloop
index 4a804f9f31..4a804f9f31 100644
--- a/board/at91sam9260ek/env/bin/pciloop
+++ b/arch/arm/boards/at91sam9260ek/env/bin/pciloop
diff --git a/board/at91sam9260ek/env/bin/update_kernel b/arch/arm/boards/at91sam9260ek/env/bin/update_kernel
index 1ad95fc5d6..1ad95fc5d6 100644
--- a/board/at91sam9260ek/env/bin/update_kernel
+++ b/arch/arm/boards/at91sam9260ek/env/bin/update_kernel
diff --git a/board/at91sam9260ek/env/bin/update_root b/arch/arm/boards/at91sam9260ek/env/bin/update_root
index b757a5b922..b757a5b922 100644
--- a/board/at91sam9260ek/env/bin/update_root
+++ b/arch/arm/boards/at91sam9260ek/env/bin/update_root
diff --git a/board/at91sam9260ek/env/config b/arch/arm/boards/at91sam9260ek/env/config
index 71d6f88cfe..71d6f88cfe 100644
--- a/board/at91sam9260ek/env/config
+++ b/arch/arm/boards/at91sam9260ek/env/config
diff --git a/board/at91sam9260ek/init.c b/arch/arm/boards/at91sam9260ek/init.c
index 9fd75256c6..9fd75256c6 100644
--- a/board/at91sam9260ek/init.c
+++ b/arch/arm/boards/at91sam9260ek/init.c
diff --git a/board/at91sam9260ek/lowlevel_init.S b/arch/arm/boards/at91sam9260ek/lowlevel_init.S
index 4961682322..4961682322 100644
--- a/board/at91sam9260ek/lowlevel_init.S
+++ b/arch/arm/boards/at91sam9260ek/lowlevel_init.S
diff --git a/board/at91sam9263ek/Makefile b/arch/arm/boards/at91sam9263ek/Makefile
index eb072c0161..eb072c0161 100644
--- a/board/at91sam9263ek/Makefile
+++ b/arch/arm/boards/at91sam9263ek/Makefile
diff --git a/board/at91sam9263ek/config.h b/arch/arm/boards/at91sam9263ek/config.h
index 9cc8af2e1d..9cc8af2e1d 100644
--- a/board/at91sam9263ek/config.h
+++ b/arch/arm/boards/at91sam9263ek/config.h
diff --git a/board/at91sam9263ek/env/bin/_update b/arch/arm/boards/at91sam9263ek/env/bin/_update
index 014bce3512..014bce3512 100644
--- a/board/at91sam9263ek/env/bin/_update
+++ b/arch/arm/boards/at91sam9263ek/env/bin/_update
diff --git a/board/at91sam9263ek/env/bin/boot b/arch/arm/boards/at91sam9263ek/env/bin/boot
index 533dea7618..533dea7618 100644
--- a/board/at91sam9263ek/env/bin/boot
+++ b/arch/arm/boards/at91sam9263ek/env/bin/boot
diff --git a/board/at91sam9263ek/env/bin/hush_hack b/arch/arm/boards/at91sam9263ek/env/bin/hush_hack
index 5fffa92ecd..5fffa92ecd 100644
--- a/board/at91sam9263ek/env/bin/hush_hack
+++ b/arch/arm/boards/at91sam9263ek/env/bin/hush_hack
diff --git a/board/at91sam9263ek/env/bin/init b/arch/arm/boards/at91sam9263ek/env/bin/init
index eaa298d651..eaa298d651 100644
--- a/board/at91sam9263ek/env/bin/init
+++ b/arch/arm/boards/at91sam9263ek/env/bin/init
diff --git a/board/at91sam9263ek/env/bin/update_barebox_xmodem b/arch/arm/boards/at91sam9263ek/env/bin/update_barebox_xmodem
index 39818b585c..39818b585c 100644
--- a/board/at91sam9263ek/env/bin/update_barebox_xmodem
+++ b/arch/arm/boards/at91sam9263ek/env/bin/update_barebox_xmodem
diff --git a/board/at91sam9263ek/env/bin/update_kernel b/arch/arm/boards/at91sam9263ek/env/bin/update_kernel
index 05c822d860..05c822d860 100644
--- a/board/at91sam9263ek/env/bin/update_kernel
+++ b/arch/arm/boards/at91sam9263ek/env/bin/update_kernel
diff --git a/board/at91sam9263ek/env/bin/update_root b/arch/arm/boards/at91sam9263ek/env/bin/update_root
index a75137237b..a75137237b 100644
--- a/board/at91sam9263ek/env/bin/update_root
+++ b/arch/arm/boards/at91sam9263ek/env/bin/update_root
diff --git a/board/at91sam9263ek/env/config b/arch/arm/boards/at91sam9263ek/env/config
index 4b322ad4df..4b322ad4df 100644
--- a/board/at91sam9263ek/env/config
+++ b/arch/arm/boards/at91sam9263ek/env/config
diff --git a/board/at91sam9263ek/init.c b/arch/arm/boards/at91sam9263ek/init.c
index 21803ca3b5..21803ca3b5 100644
--- a/board/at91sam9263ek/init.c
+++ b/arch/arm/boards/at91sam9263ek/init.c
diff --git a/board/edb93xx/Makefile b/arch/arm/boards/edb93xx/Makefile
index e19cd7b4c2..e19cd7b4c2 100644
--- a/board/edb93xx/Makefile
+++ b/arch/arm/boards/edb93xx/Makefile
diff --git a/board/edb93xx/config.h b/arch/arm/boards/edb93xx/config.h
index 6ae9a40e19..6ae9a40e19 100644
--- a/board/edb93xx/config.h
+++ b/arch/arm/boards/edb93xx/config.h
diff --git a/board/edb93xx/early_udelay.h b/arch/arm/boards/edb93xx/early_udelay.h
index 185283d98d..185283d98d 100644
--- a/board/edb93xx/early_udelay.h
+++ b/arch/arm/boards/edb93xx/early_udelay.h
diff --git a/board/edb93xx/edb93xx.c b/arch/arm/boards/edb93xx/edb93xx.c
index b0078a5227..b0078a5227 100644
--- a/board/edb93xx/edb93xx.c
+++ b/arch/arm/boards/edb93xx/edb93xx.c
diff --git a/board/edb93xx/edb93xx.dox b/arch/arm/boards/edb93xx/edb93xx.dox
index 3964d55367..3964d55367 100644
--- a/board/edb93xx/edb93xx.dox
+++ b/arch/arm/boards/edb93xx/edb93xx.dox
diff --git a/board/edb93xx/edb93xx.h b/arch/arm/boards/edb93xx/edb93xx.h
index 5e5c6f518c..5e5c6f518c 100644
--- a/board/edb93xx/edb93xx.h
+++ b/arch/arm/boards/edb93xx/edb93xx.h
diff --git a/board/edb93xx/env/bin/boot b/arch/arm/boards/edb93xx/env/bin/boot
index 143f3d018d..143f3d018d 100644
--- a/board/edb93xx/env/bin/boot
+++ b/arch/arm/boards/edb93xx/env/bin/boot
diff --git a/board/edb93xx/env/bin/flash_partition b/arch/arm/boards/edb93xx/env/bin/flash_partition
index ded40aa8a3..ded40aa8a3 100644
--- a/board/edb93xx/env/bin/flash_partition
+++ b/arch/arm/boards/edb93xx/env/bin/flash_partition
diff --git a/board/edb93xx/env/bin/init b/arch/arm/boards/edb93xx/env/bin/init
index c6b5aed271..c6b5aed271 100644
--- a/board/edb93xx/env/bin/init
+++ b/arch/arm/boards/edb93xx/env/bin/init
diff --git a/board/edb93xx/env/bin/set_nor_parts b/arch/arm/boards/edb93xx/env/bin/set_nor_parts
index 38321fa8cc..38321fa8cc 100644
--- a/board/edb93xx/env/bin/set_nor_parts
+++ b/arch/arm/boards/edb93xx/env/bin/set_nor_parts
diff --git a/board/edb93xx/env/bin/update_kernel b/arch/arm/boards/edb93xx/env/bin/update_kernel
index 3e4b9b0b8e..3e4b9b0b8e 100644
--- a/board/edb93xx/env/bin/update_kernel
+++ b/arch/arm/boards/edb93xx/env/bin/update_kernel
diff --git a/board/edb93xx/env/bin/update_rootfs b/arch/arm/boards/edb93xx/env/bin/update_rootfs
index 52a3699fd0..52a3699fd0 100644
--- a/board/edb93xx/env/bin/update_rootfs
+++ b/arch/arm/boards/edb93xx/env/bin/update_rootfs
diff --git a/board/edb93xx/env/config b/arch/arm/boards/edb93xx/env/config
index 47ab209d82..47ab209d82 100644
--- a/board/edb93xx/env/config
+++ b/arch/arm/boards/edb93xx/env/config
diff --git a/board/edb93xx/flash_cfg.c b/arch/arm/boards/edb93xx/flash_cfg.c
index 91a6a4ea96..91a6a4ea96 100644
--- a/board/edb93xx/flash_cfg.c
+++ b/arch/arm/boards/edb93xx/flash_cfg.c
diff --git a/board/edb93xx/pll_cfg.c b/arch/arm/boards/edb93xx/pll_cfg.c
index a687af0a01..a687af0a01 100644
--- a/board/edb93xx/pll_cfg.c
+++ b/arch/arm/boards/edb93xx/pll_cfg.c
diff --git a/board/edb93xx/pll_cfg.h b/arch/arm/boards/edb93xx/pll_cfg.h
index 503507aa17..503507aa17 100644
--- a/board/edb93xx/pll_cfg.h
+++ b/arch/arm/boards/edb93xx/pll_cfg.h
diff --git a/board/edb93xx/sdram_cfg.c b/arch/arm/boards/edb93xx/sdram_cfg.c
index 3d4fe08e19..3d4fe08e19 100644
--- a/board/edb93xx/sdram_cfg.c
+++ b/arch/arm/boards/edb93xx/sdram_cfg.c
diff --git a/board/edb93xx/sdram_cfg.h b/arch/arm/boards/edb93xx/sdram_cfg.h
index c57b76ef18..c57b76ef18 100644
--- a/board/edb93xx/sdram_cfg.h
+++ b/arch/arm/boards/edb93xx/sdram_cfg.h
diff --git a/board/eukrea_cpuimx25/Makefile b/arch/arm/boards/eukrea_cpuimx25/Makefile
index 406c6f32f7..406c6f32f7 100644
--- a/board/eukrea_cpuimx25/Makefile
+++ b/arch/arm/boards/eukrea_cpuimx25/Makefile
diff --git a/board/eukrea_cpuimx25/config.h b/arch/arm/boards/eukrea_cpuimx25/config.h
index efff909eed..efff909eed 100644
--- a/board/eukrea_cpuimx25/config.h
+++ b/arch/arm/boards/eukrea_cpuimx25/config.h
diff --git a/board/eukrea_cpuimx25/env/bin/_update b/arch/arm/boards/eukrea_cpuimx25/env/bin/_update
index 014bce3512..014bce3512 100644
--- a/board/eukrea_cpuimx25/env/bin/_update
+++ b/arch/arm/boards/eukrea_cpuimx25/env/bin/_update
diff --git a/board/eukrea_cpuimx25/env/bin/boot b/arch/arm/boards/eukrea_cpuimx25/env/bin/boot
index 2d9b3af01c..2d9b3af01c 100644
--- a/board/eukrea_cpuimx25/env/bin/boot
+++ b/arch/arm/boards/eukrea_cpuimx25/env/bin/boot
diff --git a/board/eukrea_cpuimx25/env/bin/hush_hack b/arch/arm/boards/eukrea_cpuimx25/env/bin/hush_hack
index 5fffa92ecd..5fffa92ecd 100644
--- a/board/eukrea_cpuimx25/env/bin/hush_hack
+++ b/arch/arm/boards/eukrea_cpuimx25/env/bin/hush_hack
diff --git a/board/eukrea_cpuimx25/env/bin/init b/arch/arm/boards/eukrea_cpuimx25/env/bin/init
index 335d7ae579..335d7ae579 100644
--- a/board/eukrea_cpuimx25/env/bin/init
+++ b/arch/arm/boards/eukrea_cpuimx25/env/bin/init
diff --git a/board/eukrea_cpuimx25/env/bin/update_kernel b/arch/arm/boards/eukrea_cpuimx25/env/bin/update_kernel
index c2d2cc3fa9..c2d2cc3fa9 100644
--- a/board/eukrea_cpuimx25/env/bin/update_kernel
+++ b/arch/arm/boards/eukrea_cpuimx25/env/bin/update_kernel
diff --git a/board/eukrea_cpuimx25/env/bin/update_root b/arch/arm/boards/eukrea_cpuimx25/env/bin/update_root
index dd89a5afad..dd89a5afad 100644
--- a/board/eukrea_cpuimx25/env/bin/update_root
+++ b/arch/arm/boards/eukrea_cpuimx25/env/bin/update_root
diff --git a/board/eukrea_cpuimx25/env/config b/arch/arm/boards/eukrea_cpuimx25/env/config
index 9217ca17be..9217ca17be 100644
--- a/board/eukrea_cpuimx25/env/config
+++ b/arch/arm/boards/eukrea_cpuimx25/env/config
diff --git a/board/eukrea_cpuimx25/eukrea_cpuimx25.c b/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c
index caeb46e872..caeb46e872 100644
--- a/board/eukrea_cpuimx25/eukrea_cpuimx25.c
+++ b/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c
diff --git a/board/eukrea_cpuimx25/lowlevel.c b/arch/arm/boards/eukrea_cpuimx25/lowlevel.c
index b9d3ce57bb..b9d3ce57bb 100644
--- a/board/eukrea_cpuimx25/lowlevel.c
+++ b/arch/arm/boards/eukrea_cpuimx25/lowlevel.c
diff --git a/board/eukrea_cpuimx27/Makefile b/arch/arm/boards/eukrea_cpuimx27/Makefile
index 5d958fa9aa..5d958fa9aa 100644
--- a/board/eukrea_cpuimx27/Makefile
+++ b/arch/arm/boards/eukrea_cpuimx27/Makefile
diff --git a/board/eukrea_cpuimx27/config.h b/arch/arm/boards/eukrea_cpuimx27/config.h
index ec6f2123bf..ec6f2123bf 100644
--- a/board/eukrea_cpuimx27/config.h
+++ b/arch/arm/boards/eukrea_cpuimx27/config.h
diff --git a/board/eukrea_cpuimx27/env/bin/_update b/arch/arm/boards/eukrea_cpuimx27/env/bin/_update
index 014bce3512..014bce3512 100644
--- a/board/eukrea_cpuimx27/env/bin/_update
+++ b/arch/arm/boards/eukrea_cpuimx27/env/bin/_update
diff --git a/board/eukrea_cpuimx27/env/bin/boot b/arch/arm/boards/eukrea_cpuimx27/env/bin/boot
index 7272e56763..7272e56763 100644
--- a/board/eukrea_cpuimx27/env/bin/boot
+++ b/arch/arm/boards/eukrea_cpuimx27/env/bin/boot
diff --git a/board/eukrea_cpuimx27/env/bin/hush_hack b/arch/arm/boards/eukrea_cpuimx27/env/bin/hush_hack
index 5fffa92ecd..5fffa92ecd 100644
--- a/board/eukrea_cpuimx27/env/bin/hush_hack
+++ b/arch/arm/boards/eukrea_cpuimx27/env/bin/hush_hack
diff --git a/board/eukrea_cpuimx27/env/bin/init b/arch/arm/boards/eukrea_cpuimx27/env/bin/init
index 3bfd194913..3bfd194913 100644
--- a/board/eukrea_cpuimx27/env/bin/init
+++ b/arch/arm/boards/eukrea_cpuimx27/env/bin/init
diff --git a/board/eukrea_cpuimx27/env/bin/update_kernel b/arch/arm/boards/eukrea_cpuimx27/env/bin/update_kernel
index 05c822d860..05c822d860 100644
--- a/board/eukrea_cpuimx27/env/bin/update_kernel
+++ b/arch/arm/boards/eukrea_cpuimx27/env/bin/update_kernel
diff --git a/board/eukrea_cpuimx27/env/bin/update_root b/arch/arm/boards/eukrea_cpuimx27/env/bin/update_root
index eaf36ebcea..eaf36ebcea 100644
--- a/board/eukrea_cpuimx27/env/bin/update_root
+++ b/arch/arm/boards/eukrea_cpuimx27/env/bin/update_root
diff --git a/board/eukrea_cpuimx27/env/config b/arch/arm/boards/eukrea_cpuimx27/env/config
index 505ada39c7..505ada39c7 100644
--- a/board/eukrea_cpuimx27/env/config
+++ b/arch/arm/boards/eukrea_cpuimx27/env/config
diff --git a/board/eukrea_cpuimx27/eukrea_cpuimx27.c b/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c
index 1937d21c85..1937d21c85 100644
--- a/board/eukrea_cpuimx27/eukrea_cpuimx27.c
+++ b/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c
diff --git a/board/eukrea_cpuimx27/eukrea_cpuimx27.dox b/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.dox
index 6c2bfede22..6c2bfede22 100644
--- a/board/eukrea_cpuimx27/eukrea_cpuimx27.dox
+++ b/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.dox
diff --git a/board/eukrea_cpuimx27/lowlevel_init.S b/arch/arm/boards/eukrea_cpuimx27/lowlevel_init.S
index 5295a8a227..5295a8a227 100644
--- a/board/eukrea_cpuimx27/lowlevel_init.S
+++ b/arch/arm/boards/eukrea_cpuimx27/lowlevel_init.S
diff --git a/board/eukrea_cpuimx35/Makefile b/arch/arm/boards/eukrea_cpuimx35/Makefile
index 32ffe42cb1..32ffe42cb1 100644
--- a/board/eukrea_cpuimx35/Makefile
+++ b/arch/arm/boards/eukrea_cpuimx35/Makefile
diff --git a/board/eukrea_cpuimx35/config.h b/arch/arm/boards/eukrea_cpuimx35/config.h
index bfd3b3964e..bfd3b3964e 100644
--- a/board/eukrea_cpuimx35/config.h
+++ b/arch/arm/boards/eukrea_cpuimx35/config.h
diff --git a/board/eukrea_cpuimx35/env/bin/_update b/arch/arm/boards/eukrea_cpuimx35/env/bin/_update
index 014bce3512..014bce3512 100644
--- a/board/eukrea_cpuimx35/env/bin/_update
+++ b/arch/arm/boards/eukrea_cpuimx35/env/bin/_update
diff --git a/board/eukrea_cpuimx35/env/bin/boot b/arch/arm/boards/eukrea_cpuimx35/env/bin/boot
index fca5b8cc19..fca5b8cc19 100644
--- a/board/eukrea_cpuimx35/env/bin/boot
+++ b/arch/arm/boards/eukrea_cpuimx35/env/bin/boot
diff --git a/board/eukrea_cpuimx35/env/bin/hush_hack b/arch/arm/boards/eukrea_cpuimx35/env/bin/hush_hack
index 5fffa92ecd..5fffa92ecd 100644
--- a/board/eukrea_cpuimx35/env/bin/hush_hack
+++ b/arch/arm/boards/eukrea_cpuimx35/env/bin/hush_hack
diff --git a/board/eukrea_cpuimx35/env/bin/init b/arch/arm/boards/eukrea_cpuimx35/env/bin/init
index 49e54c5fdd..49e54c5fdd 100644
--- a/board/eukrea_cpuimx35/env/bin/init
+++ b/arch/arm/boards/eukrea_cpuimx35/env/bin/init
diff --git a/board/eukrea_cpuimx35/env/bin/update_kernel b/arch/arm/boards/eukrea_cpuimx35/env/bin/update_kernel
index c2d2cc3fa9..c2d2cc3fa9 100644
--- a/board/eukrea_cpuimx35/env/bin/update_kernel
+++ b/arch/arm/boards/eukrea_cpuimx35/env/bin/update_kernel
diff --git a/board/eukrea_cpuimx35/env/bin/update_root b/arch/arm/boards/eukrea_cpuimx35/env/bin/update_root
index dd89a5afad..dd89a5afad 100644
--- a/board/eukrea_cpuimx35/env/bin/update_root
+++ b/arch/arm/boards/eukrea_cpuimx35/env/bin/update_root
diff --git a/board/eukrea_cpuimx35/env/config b/arch/arm/boards/eukrea_cpuimx35/env/config
index df2079fa58..df2079fa58 100644
--- a/board/eukrea_cpuimx35/env/config
+++ b/arch/arm/boards/eukrea_cpuimx35/env/config
diff --git a/board/eukrea_cpuimx35/eukrea_cpuimx35.c b/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c
index 7f1c782f1e..7f1c782f1e 100644
--- a/board/eukrea_cpuimx35/eukrea_cpuimx35.c
+++ b/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c
diff --git a/board/eukrea_cpuimx35/eukrea_cpuimx35.dox b/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.dox
index cbdf69db35..cbdf69db35 100644
--- a/board/eukrea_cpuimx35/eukrea_cpuimx35.dox
+++ b/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.dox
diff --git a/board/eukrea_cpuimx35/flash_header.c b/arch/arm/boards/eukrea_cpuimx35/flash_header.c
index a0ccf5c8f7..a0ccf5c8f7 100644
--- a/board/eukrea_cpuimx35/flash_header.c
+++ b/arch/arm/boards/eukrea_cpuimx35/flash_header.c
diff --git a/board/eukrea_cpuimx35/lowlevel.c b/arch/arm/boards/eukrea_cpuimx35/lowlevel.c
index 44f3cf0725..44f3cf0725 100644
--- a/board/eukrea_cpuimx35/lowlevel.c
+++ b/arch/arm/boards/eukrea_cpuimx35/lowlevel.c
diff --git a/board/freescale-mx25-3-stack/3stack.c b/arch/arm/boards/freescale-mx25-3-stack/3stack.c
index a77a02d498..a77a02d498 100644
--- a/board/freescale-mx25-3-stack/3stack.c
+++ b/arch/arm/boards/freescale-mx25-3-stack/3stack.c
diff --git a/board/freescale-mx25-3-stack/Makefile b/arch/arm/boards/freescale-mx25-3-stack/Makefile
index ab853e0d6b..ab853e0d6b 100644
--- a/board/freescale-mx25-3-stack/Makefile
+++ b/arch/arm/boards/freescale-mx25-3-stack/Makefile
diff --git a/board/freescale-mx25-3-stack/config.h b/arch/arm/boards/freescale-mx25-3-stack/config.h
index f35e8a0557..f35e8a0557 100644
--- a/board/freescale-mx25-3-stack/config.h
+++ b/arch/arm/boards/freescale-mx25-3-stack/config.h
diff --git a/board/freescale-mx25-3-stack/env/bin/_update b/arch/arm/boards/freescale-mx25-3-stack/env/bin/_update
index 014bce3512..014bce3512 100644
--- a/board/freescale-mx25-3-stack/env/bin/_update
+++ b/arch/arm/boards/freescale-mx25-3-stack/env/bin/_update
diff --git a/board/freescale-mx25-3-stack/env/bin/boot b/arch/arm/boards/freescale-mx25-3-stack/env/bin/boot
index 7bbff2d1f6..7bbff2d1f6 100644
--- a/board/freescale-mx25-3-stack/env/bin/boot
+++ b/arch/arm/boards/freescale-mx25-3-stack/env/bin/boot
diff --git a/board/freescale-mx25-3-stack/env/bin/hush_hack b/arch/arm/boards/freescale-mx25-3-stack/env/bin/hush_hack
index 5fffa92ecd..5fffa92ecd 100644
--- a/board/freescale-mx25-3-stack/env/bin/hush_hack
+++ b/arch/arm/boards/freescale-mx25-3-stack/env/bin/hush_hack
diff --git a/board/freescale-mx25-3-stack/env/bin/init b/arch/arm/boards/freescale-mx25-3-stack/env/bin/init
index 0600b9e661..0600b9e661 100644
--- a/board/freescale-mx25-3-stack/env/bin/init
+++ b/arch/arm/boards/freescale-mx25-3-stack/env/bin/init
diff --git a/board/freescale-mx25-3-stack/env/bin/update_kernel b/arch/arm/boards/freescale-mx25-3-stack/env/bin/update_kernel
index 05c822d860..05c822d860 100644
--- a/board/freescale-mx25-3-stack/env/bin/update_kernel
+++ b/arch/arm/boards/freescale-mx25-3-stack/env/bin/update_kernel
diff --git a/board/freescale-mx25-3-stack/env/bin/update_root b/arch/arm/boards/freescale-mx25-3-stack/env/bin/update_root
index eaf36ebcea..eaf36ebcea 100644
--- a/board/freescale-mx25-3-stack/env/bin/update_root
+++ b/arch/arm/boards/freescale-mx25-3-stack/env/bin/update_root
diff --git a/board/freescale-mx25-3-stack/env/config b/arch/arm/boards/freescale-mx25-3-stack/env/config
index a5e492e339..a5e492e339 100644
--- a/board/freescale-mx25-3-stack/env/config
+++ b/arch/arm/boards/freescale-mx25-3-stack/env/config
diff --git a/board/freescale-mx25-3-stack/lowlevel_init.S b/arch/arm/boards/freescale-mx25-3-stack/lowlevel_init.S
index 73bb14723e..73bb14723e 100644
--- a/board/freescale-mx25-3-stack/lowlevel_init.S
+++ b/arch/arm/boards/freescale-mx25-3-stack/lowlevel_init.S
diff --git a/board/freescale-mx35-3-stack/3stack.c b/arch/arm/boards/freescale-mx35-3-stack/3stack.c
index 9a66976f9d..9a66976f9d 100644
--- a/board/freescale-mx35-3-stack/3stack.c
+++ b/arch/arm/boards/freescale-mx35-3-stack/3stack.c
diff --git a/board/freescale-mx35-3-stack/3stack.dox b/arch/arm/boards/freescale-mx35-3-stack/3stack.dox
index 15c5b6e1ff..15c5b6e1ff 100644
--- a/board/freescale-mx35-3-stack/3stack.dox
+++ b/arch/arm/boards/freescale-mx35-3-stack/3stack.dox
diff --git a/board/freescale-mx35-3-stack/Makefile b/arch/arm/boards/freescale-mx35-3-stack/Makefile
index a8ea4a3d66..a8ea4a3d66 100644
--- a/board/freescale-mx35-3-stack/Makefile
+++ b/arch/arm/boards/freescale-mx35-3-stack/Makefile
diff --git a/board/freescale-mx35-3-stack/board-mx35_3stack.h b/arch/arm/boards/freescale-mx35-3-stack/board-mx35_3stack.h
index c18066ad9c..c18066ad9c 100644
--- a/board/freescale-mx35-3-stack/board-mx35_3stack.h
+++ b/arch/arm/boards/freescale-mx35-3-stack/board-mx35_3stack.h
diff --git a/board/freescale-mx35-3-stack/config.h b/arch/arm/boards/freescale-mx35-3-stack/config.h
index c724a57bd0..c724a57bd0 100644
--- a/board/freescale-mx35-3-stack/config.h
+++ b/arch/arm/boards/freescale-mx35-3-stack/config.h
diff --git a/board/freescale-mx35-3-stack/env/bin/_update b/arch/arm/boards/freescale-mx35-3-stack/env/bin/_update
index ddd6b84f72..ddd6b84f72 100644
--- a/board/freescale-mx35-3-stack/env/bin/_update
+++ b/arch/arm/boards/freescale-mx35-3-stack/env/bin/_update
diff --git a/board/freescale-mx35-3-stack/env/bin/boot b/arch/arm/boards/freescale-mx35-3-stack/env/bin/boot
index fb2fe614d4..fb2fe614d4 100644
--- a/board/freescale-mx35-3-stack/env/bin/boot
+++ b/arch/arm/boards/freescale-mx35-3-stack/env/bin/boot
diff --git a/board/freescale-mx35-3-stack/env/bin/hush_hack b/arch/arm/boards/freescale-mx35-3-stack/env/bin/hush_hack
index 5fffa92ecd..5fffa92ecd 100644
--- a/board/freescale-mx35-3-stack/env/bin/hush_hack
+++ b/arch/arm/boards/freescale-mx35-3-stack/env/bin/hush_hack
diff --git a/board/freescale-mx35-3-stack/env/bin/init b/arch/arm/boards/freescale-mx35-3-stack/env/bin/init
index c982f22a86..c982f22a86 100644
--- a/board/freescale-mx35-3-stack/env/bin/init
+++ b/arch/arm/boards/freescale-mx35-3-stack/env/bin/init
diff --git a/board/freescale-mx35-3-stack/env/bin/update_kernel b/arch/arm/boards/freescale-mx35-3-stack/env/bin/update_kernel
index 63ad11aaed..63ad11aaed 100644
--- a/board/freescale-mx35-3-stack/env/bin/update_kernel
+++ b/arch/arm/boards/freescale-mx35-3-stack/env/bin/update_kernel
diff --git a/board/freescale-mx35-3-stack/env/bin/update_rootfs b/arch/arm/boards/freescale-mx35-3-stack/env/bin/update_rootfs
index 53dd2ca575..53dd2ca575 100644
--- a/board/freescale-mx35-3-stack/env/bin/update_rootfs
+++ b/arch/arm/boards/freescale-mx35-3-stack/env/bin/update_rootfs
diff --git a/board/freescale-mx35-3-stack/env/config b/arch/arm/boards/freescale-mx35-3-stack/env/config
index 51195f7404..51195f7404 100644
--- a/board/freescale-mx35-3-stack/env/config
+++ b/arch/arm/boards/freescale-mx35-3-stack/env/config
diff --git a/board/freescale-mx35-3-stack/flash_header.c b/arch/arm/boards/freescale-mx35-3-stack/flash_header.c
index 171c499a6d..171c499a6d 100644
--- a/board/freescale-mx35-3-stack/flash_header.c
+++ b/arch/arm/boards/freescale-mx35-3-stack/flash_header.c
diff --git a/board/freescale-mx35-3-stack/lowlevel_init.S b/arch/arm/boards/freescale-mx35-3-stack/lowlevel_init.S
index 1680579b51..1680579b51 100644
--- a/board/freescale-mx35-3-stack/lowlevel_init.S
+++ b/arch/arm/boards/freescale-mx35-3-stack/lowlevel_init.S
diff --git a/board/guf-neso/Makefile b/arch/arm/boards/guf-neso/Makefile
index 2b6eb02595..2b6eb02595 100644
--- a/board/guf-neso/Makefile
+++ b/arch/arm/boards/guf-neso/Makefile
diff --git a/board/guf-neso/board.c b/arch/arm/boards/guf-neso/board.c
index 2f53d34556..2f53d34556 100644
--- a/board/guf-neso/board.c
+++ b/arch/arm/boards/guf-neso/board.c
diff --git a/board/guf-neso/config.h b/arch/arm/boards/guf-neso/config.h
index c2f5e7cc58..c2f5e7cc58 100644
--- a/board/guf-neso/config.h
+++ b/arch/arm/boards/guf-neso/config.h
diff --git a/board/guf-neso/env/config b/arch/arm/boards/guf-neso/env/config
index 6327e69217..6327e69217 100644
--- a/board/guf-neso/env/config
+++ b/arch/arm/boards/guf-neso/env/config
diff --git a/board/guf-neso/lowlevel.c b/arch/arm/boards/guf-neso/lowlevel.c
index 0c376f2fae..0c376f2fae 100644
--- a/board/guf-neso/lowlevel.c
+++ b/arch/arm/boards/guf-neso/lowlevel.c
diff --git a/board/guf-neso/pll_init.S b/arch/arm/boards/guf-neso/pll_init.S
index 87e5312fb4..87e5312fb4 100644
--- a/board/guf-neso/pll_init.S
+++ b/arch/arm/boards/guf-neso/pll_init.S
diff --git a/board/imx21ads/Makefile b/arch/arm/boards/imx21ads/Makefile
index 7993fdef8a..7993fdef8a 100644
--- a/board/imx21ads/Makefile
+++ b/arch/arm/boards/imx21ads/Makefile
diff --git a/board/imx21ads/config.h b/arch/arm/boards/imx21ads/config.h
index edfb29ffb0..edfb29ffb0 100644
--- a/board/imx21ads/config.h
+++ b/arch/arm/boards/imx21ads/config.h
diff --git a/board/imx21ads/env/bin/init b/arch/arm/boards/imx21ads/env/bin/init
index 224a6b40be..224a6b40be 100644
--- a/board/imx21ads/env/bin/init
+++ b/arch/arm/boards/imx21ads/env/bin/init
diff --git a/board/imx21ads/imx21ads.c b/arch/arm/boards/imx21ads/imx21ads.c
index 5e88af4fd8..5e88af4fd8 100644
--- a/board/imx21ads/imx21ads.c
+++ b/arch/arm/boards/imx21ads/imx21ads.c
diff --git a/board/imx21ads/imx21ads.dox b/arch/arm/boards/imx21ads/imx21ads.dox
index 9f11ffaa6e..9f11ffaa6e 100644
--- a/board/imx21ads/imx21ads.dox
+++ b/arch/arm/boards/imx21ads/imx21ads.dox
diff --git a/board/imx21ads/lowlevel_init.S b/arch/arm/boards/imx21ads/lowlevel_init.S
index 607da27476..607da27476 100644
--- a/board/imx21ads/lowlevel_init.S
+++ b/arch/arm/boards/imx21ads/lowlevel_init.S
diff --git a/board/imx27ads/Makefile b/arch/arm/boards/imx27ads/Makefile
index bdc905f0ef..bdc905f0ef 100644
--- a/board/imx27ads/Makefile
+++ b/arch/arm/boards/imx27ads/Makefile
diff --git a/board/imx27ads/config.h b/arch/arm/boards/imx27ads/config.h
index b54a3c53d4..b54a3c53d4 100644
--- a/board/imx27ads/config.h
+++ b/arch/arm/boards/imx27ads/config.h
diff --git a/board/imx27ads/env/bin/_update b/arch/arm/boards/imx27ads/env/bin/_update
index 014bce3512..014bce3512 100644
--- a/board/imx27ads/env/bin/_update
+++ b/arch/arm/boards/imx27ads/env/bin/_update
diff --git a/board/imx27ads/env/bin/boot b/arch/arm/boards/imx27ads/env/bin/boot
index 3859dc113b..3859dc113b 100644
--- a/board/imx27ads/env/bin/boot
+++ b/arch/arm/boards/imx27ads/env/bin/boot
diff --git a/board/imx27ads/env/bin/init b/arch/arm/boards/imx27ads/env/bin/init
index 48e2139f7d..48e2139f7d 100644
--- a/board/imx27ads/env/bin/init
+++ b/arch/arm/boards/imx27ads/env/bin/init
diff --git a/board/imx27ads/env/bin/update_kernel b/arch/arm/boards/imx27ads/env/bin/update_kernel
index 1ad95fc5d6..1ad95fc5d6 100644
--- a/board/imx27ads/env/bin/update_kernel
+++ b/arch/arm/boards/imx27ads/env/bin/update_kernel
diff --git a/board/imx27ads/env/bin/update_root b/arch/arm/boards/imx27ads/env/bin/update_root
index b757a5b922..b757a5b922 100644
--- a/board/imx27ads/env/bin/update_root
+++ b/arch/arm/boards/imx27ads/env/bin/update_root
diff --git a/board/imx27ads/env/config b/arch/arm/boards/imx27ads/env/config
index f18a86b7c1..f18a86b7c1 100644
--- a/board/imx27ads/env/config
+++ b/arch/arm/boards/imx27ads/env/config
diff --git a/board/imx27ads/imx27ads.c b/arch/arm/boards/imx27ads/imx27ads.c
index 6f31520ffa..6f31520ffa 100644
--- a/board/imx27ads/imx27ads.c
+++ b/arch/arm/boards/imx27ads/imx27ads.c
diff --git a/board/imx27ads/imx27ads.dox b/arch/arm/boards/imx27ads/imx27ads.dox
index e14d8e3fab..e14d8e3fab 100644
--- a/board/imx27ads/imx27ads.dox
+++ b/arch/arm/boards/imx27ads/imx27ads.dox
diff --git a/board/imx27ads/lowlevel_init.S b/arch/arm/boards/imx27ads/lowlevel_init.S
index df12aead00..df12aead00 100644
--- a/board/imx27ads/lowlevel_init.S
+++ b/arch/arm/boards/imx27ads/lowlevel_init.S
diff --git a/board/mmccpu/Makefile b/arch/arm/boards/mmccpu/Makefile
index eb072c0161..eb072c0161 100644
--- a/board/mmccpu/Makefile
+++ b/arch/arm/boards/mmccpu/Makefile
diff --git a/board/mmccpu/config.h b/arch/arm/boards/mmccpu/config.h
index 1133b8f040..1133b8f040 100644
--- a/board/mmccpu/config.h
+++ b/arch/arm/boards/mmccpu/config.h
diff --git a/board/kp_ukd_r1_num/env/bin/_update b/arch/arm/boards/mmccpu/env/bin/_update
index 014bce3512..014bce3512 100644
--- a/board/kp_ukd_r1_num/env/bin/_update
+++ b/arch/arm/boards/mmccpu/env/bin/_update
diff --git a/board/mmccpu/env/bin/boot b/arch/arm/boards/mmccpu/env/bin/boot
index 533dea7618..533dea7618 100644
--- a/board/mmccpu/env/bin/boot
+++ b/arch/arm/boards/mmccpu/env/bin/boot
diff --git a/board/mmccpu/env/bin/hush_hack b/arch/arm/boards/mmccpu/env/bin/hush_hack
index 5fffa92ecd..5fffa92ecd 100644
--- a/board/mmccpu/env/bin/hush_hack
+++ b/arch/arm/boards/mmccpu/env/bin/hush_hack
diff --git a/board/mmccpu/env/bin/init b/arch/arm/boards/mmccpu/env/bin/init
index ac84bd596f..ac84bd596f 100644
--- a/board/mmccpu/env/bin/init
+++ b/arch/arm/boards/mmccpu/env/bin/init
diff --git a/board/mmccpu/env/bin/update_kernel b/arch/arm/boards/mmccpu/env/bin/update_kernel
index 05c822d860..05c822d860 100644
--- a/board/mmccpu/env/bin/update_kernel
+++ b/arch/arm/boards/mmccpu/env/bin/update_kernel
diff --git a/board/mmccpu/env/bin/update_root b/arch/arm/boards/mmccpu/env/bin/update_root
index a75137237b..a75137237b 100644
--- a/board/mmccpu/env/bin/update_root
+++ b/arch/arm/boards/mmccpu/env/bin/update_root
diff --git a/board/mmccpu/env/config b/arch/arm/boards/mmccpu/env/config
index 5367cd9f56..5367cd9f56 100644
--- a/board/mmccpu/env/config
+++ b/arch/arm/boards/mmccpu/env/config
diff --git a/board/mmccpu/init.c b/arch/arm/boards/mmccpu/init.c
index e010a83104..e010a83104 100644
--- a/board/mmccpu/init.c
+++ b/arch/arm/boards/mmccpu/init.c
diff --git a/board/netx/Makefile b/arch/arm/boards/netx/Makefile
index 8b33fec316..8b33fec316 100644
--- a/board/netx/Makefile
+++ b/arch/arm/boards/netx/Makefile
diff --git a/board/netx/config.h b/arch/arm/boards/netx/config.h
index ca15136817..ca15136817 100644
--- a/board/netx/config.h
+++ b/arch/arm/boards/netx/config.h
diff --git a/board/netx/netx.c b/arch/arm/boards/netx/netx.c
index d6bfcca54d..d6bfcca54d 100644
--- a/board/netx/netx.c
+++ b/arch/arm/boards/netx/netx.c
diff --git a/board/netx/netx.dox b/arch/arm/boards/netx/netx.dox
index e22c5e8554..e22c5e8554 100644
--- a/board/netx/netx.dox
+++ b/arch/arm/boards/netx/netx.dox
diff --git a/board/netx/platform.S b/arch/arm/boards/netx/platform.S
index 4961682322..4961682322 100644
--- a/board/netx/platform.S
+++ b/arch/arm/boards/netx/platform.S
diff --git a/board/omap/Kconfig b/arch/arm/boards/omap/Kconfig
index d612064710..d612064710 100644
--- a/board/omap/Kconfig
+++ b/arch/arm/boards/omap/Kconfig
diff --git a/board/omap/Makefile b/arch/arm/boards/omap/Makefile
index 1e74e241b4..1e74e241b4 100644
--- a/board/omap/Makefile
+++ b/arch/arm/boards/omap/Makefile
diff --git a/board/omap/board-beagle.c b/arch/arm/boards/omap/board-beagle.c
index 78c0ef9728..a4cbf313b8 100644
--- a/board/omap/board-beagle.c
+++ b/arch/arm/boards/omap/board-beagle.c
@@ -27,7 +27,7 @@
 /**
  * @page ti_beagle Texas Instruments Beagle Board
  *
- * FileName: board/omap/board-beagle.c
+ * FileName: arch/arm/boards/omap/board-beagle.c
  *
  * Beagle Board from Texas Instruments as described here:
  * http://www.beagleboard.org
@@ -49,7 +49,7 @@
  * Run time initialization includes
  * @li serial @ref serial_ns16550.c driver device definition
  *
- * Originally from board/omap/board-sdp343x.c
+ * Originally from arch/arm/boards/omap/board-sdp343x.c
  */
 
 #include <common.h>
diff --git a/board/omap/board-omap3evm.c b/arch/arm/boards/omap/board-omap3evm.c
index fdea0ff3c5..619ea94485 100644
--- a/board/omap/board-omap3evm.c
+++ b/arch/arm/boards/omap/board-omap3evm.c
@@ -2,7 +2,7 @@
  * @file
  * @brief Board Initialization routines for OMAP3EVM.
  *
- * FileName: board/omap/board-omap3evm.c
+ * FileName: arch/arm/boards/omap/board-omap3evm.c
  *
  * This board is based on OMAP3530.
  * More on OMAP3530 (including documentation can be found here):
@@ -21,7 +21,7 @@
  * Run time initialization includes
  * @li serial @ref serial_ns16550.c driver device definition
  *
- * Originally from board/omap/board-beagle.c
+ * Originally from arch/arm/boards/omap/board-beagle.c
  */
 
 /*
diff --git a/board/omap/board-sdp343x.c b/arch/arm/boards/omap/board-sdp343x.c
index fe95fc0235..32d1a4235c 100644
--- a/board/omap/board-sdp343x.c
+++ b/arch/arm/boards/omap/board-sdp343x.c
@@ -27,7 +27,7 @@
 /**
  * @page ti_SDP3430 Texas Instruments SDP3430
  *
- * FileName: board/omap/board-sdp343x.c
+ * FileName: arch/arm/boards/omap/board-sdp343x.c
  *
  * SDP3430 from Texas Instruments as described here:
  * http://www.ti.com/omap3430_devplatform
diff --git a/board/omap/board.h b/arch/arm/boards/omap/board.h
index ee3e25e76f..cf231a208e 100644
--- a/board/omap/board.h
+++ b/arch/arm/boards/omap/board.h
@@ -2,7 +2,7 @@
  * @file
  * @brief exported generic APIs which various board files implement
  *
- * FileName: board/omap/board.h
+ * FileName: arch/arm/boards/omap/board.h
  *
  * This file will not contain any board specific implementations.
  */
diff --git a/board/omap/config.h b/arch/arm/boards/omap/config.h
index 707b3c4343..29d2ee2317 100644
--- a/board/omap/config.h
+++ b/arch/arm/boards/omap/config.h
@@ -2,7 +2,7 @@
  * @file
  * @brief provide a wrapper for standard malloc and stack size defines
  *
- * FileName: board/omap/config.h
+ * FileName: arch/arm/boards/omap/config.h
  *
  * Standard defines should be configurable for us to move Stack and malloc
  * areas around this defines some basics for that
diff --git a/board/omap/devices-gpmc-nand.c b/arch/arm/boards/omap/devices-gpmc-nand.c
index e8b34caf4d..ac23e9d036 100644
--- a/board/omap/devices-gpmc-nand.c
+++ b/arch/arm/boards/omap/devices-gpmc-nand.c
@@ -2,7 +2,7 @@
  * @file
  * @brief GPMC specific NAND devices
  *
- * FileName: board/omap/devices-gpmc-nand.c
+ * FileName: arch/arm/boards/omap/devices-gpmc-nand.c
  *
  * GPMC NAND Devices such as those from Micron, Samsung are listed here
  */
diff --git a/board/omap/env/bin/init b/arch/arm/boards/omap/env/bin/init
index 224a6b40be..224a6b40be 100644
--- a/board/omap/env/bin/init
+++ b/arch/arm/boards/omap/env/bin/init
diff --git a/board/omap/platform.S b/arch/arm/boards/omap/platform.S
index 9014a8f1c7..77b7eed906 100644
--- a/board/omap/platform.S
+++ b/arch/arm/boards/omap/platform.S
@@ -2,7 +2,7 @@
  * @file
  * @brief Wrapper to call board level initialization routine
  *
- * FileName: board/omap/platform.S
+ * FileName: arch/arm/boards/omap/platform.S
  *
  * board_init_lowlevel is defined here. This calls board_init which
  * is linked to the binary - the board_init only has a SRAM stack.
diff --git a/board/pcm037/Makefile b/arch/arm/boards/pcm037/Makefile
index 7d36b77df0..7d36b77df0 100644
--- a/board/pcm037/Makefile
+++ b/arch/arm/boards/pcm037/Makefile
diff --git a/board/pcm037/config.h b/arch/arm/boards/pcm037/config.h
index 5495d0309c..5495d0309c 100644
--- a/board/pcm037/config.h
+++ b/arch/arm/boards/pcm037/config.h
diff --git a/board/pcm037/env/config b/arch/arm/boards/pcm037/env/config
index bf15620057..bf15620057 100644
--- a/board/pcm037/env/config
+++ b/arch/arm/boards/pcm037/env/config
diff --git a/board/pcm037/lowlevel_init.S b/arch/arm/boards/pcm037/lowlevel_init.S
index 8988db23a2..8988db23a2 100644
--- a/board/pcm037/lowlevel_init.S
+++ b/arch/arm/boards/pcm037/lowlevel_init.S
diff --git a/board/pcm037/pcm037.c b/arch/arm/boards/pcm037/pcm037.c
index 2e6968b844..2e6968b844 100644
--- a/board/pcm037/pcm037.c
+++ b/arch/arm/boards/pcm037/pcm037.c
diff --git a/board/pcm037/pcm037.dox b/arch/arm/boards/pcm037/pcm037.dox
index b2afdd6acd..b2afdd6acd 100644
--- a/board/pcm037/pcm037.dox
+++ b/arch/arm/boards/pcm037/pcm037.dox
diff --git a/board/pcm038/Makefile b/arch/arm/boards/pcm038/Makefile
index a681ddafb9..a681ddafb9 100644
--- a/board/pcm038/Makefile
+++ b/arch/arm/boards/pcm038/Makefile
diff --git a/board/pcm038/config.h b/arch/arm/boards/pcm038/config.h
index c2f5e7cc58..c2f5e7cc58 100644
--- a/board/pcm038/config.h
+++ b/arch/arm/boards/pcm038/config.h
diff --git a/board/pcm038/env/config b/arch/arm/boards/pcm038/env/config
index a8be5c924d..a8be5c924d 100644
--- a/board/pcm038/env/config
+++ b/arch/arm/boards/pcm038/env/config
diff --git a/board/pcm038/lowlevel.c b/arch/arm/boards/pcm038/lowlevel.c
index 0c376f2fae..0c376f2fae 100644
--- a/board/pcm038/lowlevel.c
+++ b/arch/arm/boards/pcm038/lowlevel.c
diff --git a/board/pcm038/pcm038.c b/arch/arm/boards/pcm038/pcm038.c
index 03794fc13d..03794fc13d 100644
--- a/board/pcm038/pcm038.c
+++ b/arch/arm/boards/pcm038/pcm038.c
diff --git a/board/pcm038/pcm038.dox b/arch/arm/boards/pcm038/pcm038.dox
index 9b17674a21..9b17674a21 100644
--- a/board/pcm038/pcm038.dox
+++ b/arch/arm/boards/pcm038/pcm038.dox
diff --git a/board/pcm038/pll_init.S b/arch/arm/boards/pcm038/pll_init.S
index 0c1ff13415..0c1ff13415 100644
--- a/board/pcm038/pll_init.S
+++ b/arch/arm/boards/pcm038/pll_init.S
diff --git a/board/pcm043/Makefile b/arch/arm/boards/pcm043/Makefile
index 6753bbe81a..6753bbe81a 100644
--- a/board/pcm043/Makefile
+++ b/arch/arm/boards/pcm043/Makefile
diff --git a/board/pcm043/config.h b/arch/arm/boards/pcm043/config.h
index 0e3b175a62..0e3b175a62 100644
--- a/board/pcm043/config.h
+++ b/arch/arm/boards/pcm043/config.h
diff --git a/board/pcm043/env/config b/arch/arm/boards/pcm043/env/config
index 212b6a9cd8..212b6a9cd8 100644
--- a/board/pcm043/env/config
+++ b/arch/arm/boards/pcm043/env/config
diff --git a/board/pcm043/lowlevel.c b/arch/arm/boards/pcm043/lowlevel.c
index 9eff5a6713..9eff5a6713 100644
--- a/board/pcm043/lowlevel.c
+++ b/arch/arm/boards/pcm043/lowlevel.c
diff --git a/board/pcm043/pcm043.c b/arch/arm/boards/pcm043/pcm043.c
index dd178ed787..dd178ed787 100644
--- a/board/pcm043/pcm043.c
+++ b/arch/arm/boards/pcm043/pcm043.c
diff --git a/board/pcm043/pcm043.dox b/arch/arm/boards/pcm043/pcm043.dox
index c6715fffcf..c6715fffcf 100644
--- a/board/pcm043/pcm043.dox
+++ b/arch/arm/boards/pcm043/pcm043.dox
diff --git a/board/phycard-i.MX27/Makefile b/arch/arm/boards/phycard-i.MX27/Makefile
index fd52350fbb..fd52350fbb 100644
--- a/board/phycard-i.MX27/Makefile
+++ b/arch/arm/boards/phycard-i.MX27/Makefile
diff --git a/board/phycard-i.MX27/config.h b/arch/arm/boards/phycard-i.MX27/config.h
index c2f5e7cc58..c2f5e7cc58 100644
--- a/board/phycard-i.MX27/config.h
+++ b/arch/arm/boards/phycard-i.MX27/config.h
diff --git a/board/phycard-i.MX27/env/config b/arch/arm/boards/phycard-i.MX27/env/config
index d0670dec2c..d0670dec2c 100644
--- a/board/phycard-i.MX27/env/config
+++ b/arch/arm/boards/phycard-i.MX27/env/config
diff --git a/board/phycard-i.MX27/lowlevel_init.S b/arch/arm/boards/phycard-i.MX27/lowlevel_init.S
index 9349581165..9349581165 100644
--- a/board/phycard-i.MX27/lowlevel_init.S
+++ b/arch/arm/boards/phycard-i.MX27/lowlevel_init.S
diff --git a/board/phycard-i.MX27/pca100.c b/arch/arm/boards/phycard-i.MX27/pca100.c
index ce59960e22..ce59960e22 100644
--- a/board/phycard-i.MX27/pca100.c
+++ b/arch/arm/boards/phycard-i.MX27/pca100.c
diff --git a/board/phycard-i.MX27/pca100.dox b/arch/arm/boards/phycard-i.MX27/pca100.dox
index 9b17674a21..9b17674a21 100644
--- a/board/phycard-i.MX27/pca100.dox
+++ b/arch/arm/boards/phycard-i.MX27/pca100.dox
diff --git a/board/pm9263/Makefile b/arch/arm/boards/pm9263/Makefile
index eb072c0161..eb072c0161 100644
--- a/board/pm9263/Makefile
+++ b/arch/arm/boards/pm9263/Makefile
diff --git a/board/pm9263/config.h b/arch/arm/boards/pm9263/config.h
index 9a9c5cdcb7..9a9c5cdcb7 100644
--- a/board/pm9263/config.h
+++ b/arch/arm/boards/pm9263/config.h
diff --git a/board/mmccpu/env/bin/_update b/arch/arm/boards/pm9263/env/bin/_update
index 014bce3512..014bce3512 100644
--- a/board/mmccpu/env/bin/_update
+++ b/arch/arm/boards/pm9263/env/bin/_update
diff --git a/board/pm9263/env/bin/boot b/arch/arm/boards/pm9263/env/bin/boot
index 533dea7618..533dea7618 100644
--- a/board/pm9263/env/bin/boot
+++ b/arch/arm/boards/pm9263/env/bin/boot
diff --git a/board/pm9263/env/bin/hush_hack b/arch/arm/boards/pm9263/env/bin/hush_hack
index 5fffa92ecd..5fffa92ecd 100644
--- a/board/pm9263/env/bin/hush_hack
+++ b/arch/arm/boards/pm9263/env/bin/hush_hack
diff --git a/board/pm9263/env/bin/init b/arch/arm/boards/pm9263/env/bin/init
index 02f5cd415b..02f5cd415b 100644
--- a/board/pm9263/env/bin/init
+++ b/arch/arm/boards/pm9263/env/bin/init
diff --git a/board/pm9263/env/bin/update_kernel b/arch/arm/boards/pm9263/env/bin/update_kernel
index 05c822d860..05c822d860 100644
--- a/board/pm9263/env/bin/update_kernel
+++ b/arch/arm/boards/pm9263/env/bin/update_kernel
diff --git a/board/pm9263/env/bin/update_root b/arch/arm/boards/pm9263/env/bin/update_root
index a75137237b..a75137237b 100644
--- a/board/pm9263/env/bin/update_root
+++ b/arch/arm/boards/pm9263/env/bin/update_root
diff --git a/board/pm9263/env/config b/arch/arm/boards/pm9263/env/config
index 75132911c4..75132911c4 100644
--- a/board/pm9263/env/config
+++ b/arch/arm/boards/pm9263/env/config
diff --git a/board/pm9263/init.c b/arch/arm/boards/pm9263/init.c
index 88b91eafa9..88b91eafa9 100644
--- a/board/pm9263/init.c
+++ b/arch/arm/boards/pm9263/init.c
diff --git a/board/scb9328/Makefile b/arch/arm/boards/scb9328/Makefile
index db6fd7ec37..db6fd7ec37 100644
--- a/board/scb9328/Makefile
+++ b/arch/arm/boards/scb9328/Makefile
diff --git a/board/scb9328/config.h b/arch/arm/boards/scb9328/config.h
index cc22b7ae72..cc22b7ae72 100644
--- a/board/scb9328/config.h
+++ b/arch/arm/boards/scb9328/config.h
diff --git a/board/scb9328/env/bin/init b/arch/arm/boards/scb9328/env/bin/init
index 416669f851..416669f851 100644
--- a/board/scb9328/env/bin/init
+++ b/arch/arm/boards/scb9328/env/bin/init
diff --git a/board/scb9328/lowlevel_init.S b/arch/arm/boards/scb9328/lowlevel_init.S
index 5b024286bb..5b024286bb 100644
--- a/board/scb9328/lowlevel_init.S
+++ b/arch/arm/boards/scb9328/lowlevel_init.S
diff --git a/board/scb9328/scb9328.c b/arch/arm/boards/scb9328/scb9328.c
index e781393eae..e781393eae 100644
--- a/board/scb9328/scb9328.c
+++ b/arch/arm/boards/scb9328/scb9328.c
diff --git a/board/scb9328/scb9328.dox b/arch/arm/boards/scb9328/scb9328.dox
index 75bc7c8c1a..75bc7c8c1a 100644
--- a/board/scb9328/scb9328.dox
+++ b/arch/arm/boards/scb9328/scb9328.dox
diff --git a/arch/arm/configs/a9m2410_defconfig b/arch/arm/configs/a9m2410_defconfig
index 9429a3763d..9e888fc6b9 100644
--- a/arch/arm/configs/a9m2410_defconfig
+++ b/arch/arm/configs/a9m2410_defconfig
@@ -100,7 +100,7 @@ CONFIG_CONSOLE_ACTIVATE_FIRST=y
 # CONFIG_OF_FLAT_TREE is not set
 CONFIG_PARTITION=y
 CONFIG_DEFAULT_ENVIRONMENT=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="board/a9m2410/env"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/a9m2410/env"
 
 #
 # Debugging
diff --git a/arch/arm/configs/a9m2440_defconfig b/arch/arm/configs/a9m2440_defconfig
index 1fcabbb62e..f69dcfd76a 100644
--- a/arch/arm/configs/a9m2440_defconfig
+++ b/arch/arm/configs/a9m2440_defconfig
@@ -101,7 +101,7 @@ CONFIG_CONSOLE_ACTIVATE_FIRST=y
 # CONFIG_OF_FLAT_TREE is not set
 CONFIG_PARTITION=y
 CONFIG_DEFAULT_ENVIRONMENT=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="board/a9m2440/env"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/a9m2440/env"
 
 #
 # Debugging
diff --git a/arch/arm/configs/at91sam9260ek_defconfig b/arch/arm/configs/at91sam9260ek_defconfig
index 61df756932..b40485b46f 100644
--- a/arch/arm/configs/at91sam9260ek_defconfig
+++ b/arch/arm/configs/at91sam9260ek_defconfig
@@ -89,7 +89,7 @@ CONFIG_CONSOLE_ACTIVATE_FIRST=y
 # CONFIG_OF_FLAT_TREE is not set
 CONFIG_PARTITION=y
 CONFIG_DEFAULT_ENVIRONMENT=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="board/at91sam9260ek/env"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/at91sam9260ek/env"
 
 #
 # Debugging
diff --git a/arch/arm/configs/at91sam9263ek_defconfig b/arch/arm/configs/at91sam9263ek_defconfig
index eb47856b05..d423c2fdfd 100644
--- a/arch/arm/configs/at91sam9263ek_defconfig
+++ b/arch/arm/configs/at91sam9263ek_defconfig
@@ -93,7 +93,7 @@ CONFIG_CONSOLE_ACTIVATE_FIRST=y
 # CONFIG_OF_FLAT_TREE is not set
 CONFIG_PARTITION=y
 CONFIG_DEFAULT_ENVIRONMENT=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="board/at91sam9263ek/env"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/at91sam9263ek/env"
 
 #
 # Debugging
diff --git a/arch/arm/configs/edb93xx_defconfig b/arch/arm/configs/edb93xx_defconfig
index d6b4b19f14..d8fe23f70f 100644
--- a/arch/arm/configs/edb93xx_defconfig
+++ b/arch/arm/configs/edb93xx_defconfig
@@ -103,7 +103,7 @@ CONFIG_CONSOLE_ACTIVATE_FIRST=y
 # CONFIG_OF_FLAT_TREE is not set
 CONFIG_PARTITION=y
 CONFIG_DEFAULT_ENVIRONMENT=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="board/edb93xx/env"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/edb93xx/env"
 
 #
 # Debugging                     
diff --git a/arch/arm/configs/eukrea_cpuimx25_defconfig b/arch/arm/configs/eukrea_cpuimx25_defconfig
index 574d32292d..88f61c7826 100644
--- a/arch/arm/configs/eukrea_cpuimx25_defconfig
+++ b/arch/arm/configs/eukrea_cpuimx25_defconfig
@@ -108,7 +108,7 @@ CONFIG_CONSOLE_ACTIVATE_FIRST=y
 # CONFIG_OF_FLAT_TREE is not set
 CONFIG_PARTITION=y
 CONFIG_DEFAULT_ENVIRONMENT=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="board/eukrea_cpuimx25/env"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/eukrea_cpuimx25/env"
 
 #
 # Debugging                     
diff --git a/arch/arm/configs/eukrea_cpuimx27_defconfig b/arch/arm/configs/eukrea_cpuimx27_defconfig
index a1cf1adb74..c7f6b78db0 100644
--- a/arch/arm/configs/eukrea_cpuimx27_defconfig
+++ b/arch/arm/configs/eukrea_cpuimx27_defconfig
@@ -118,7 +118,7 @@ CONFIG_CONSOLE_ACTIVATE_ALL=y
 # CONFIG_OF_FLAT_TREE is not set
 CONFIG_PARTITION=y
 CONFIG_DEFAULT_ENVIRONMENT=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="board/eukrea_cpuimx27/env"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/eukrea_cpuimx27/env"
 
 #
 # Debugging                     
diff --git a/arch/arm/configs/freescale_mx25_3stack_defconfig b/arch/arm/configs/freescale_mx25_3stack_defconfig
index d308e5bf01..fd7dd4273c 100644
--- a/arch/arm/configs/freescale_mx25_3stack_defconfig
+++ b/arch/arm/configs/freescale_mx25_3stack_defconfig
@@ -106,7 +106,7 @@ CONFIG_CONSOLE_ACTIVATE_FIRST=y
 # CONFIG_OF_FLAT_TREE is not set
 CONFIG_PARTITION=y
 CONFIG_DEFAULT_ENVIRONMENT=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="board/freescale-mx25-3-stack/env/"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/freescale-mx25-3-stack/env/"
 
 #
 # Debugging
diff --git a/arch/arm/configs/freescale_mx35_3stack_defconfig b/arch/arm/configs/freescale_mx35_3stack_defconfig
index 17a2fdc6d9..4321fbce09 100644
--- a/arch/arm/configs/freescale_mx35_3stack_defconfig
+++ b/arch/arm/configs/freescale_mx35_3stack_defconfig
@@ -105,7 +105,7 @@ CONFIG_CONSOLE_ACTIVATE_FIRST=y
 # CONFIG_OF_FLAT_TREE is not set
 CONFIG_PARTITION=y
 CONFIG_DEFAULT_ENVIRONMENT=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="board/freescale-mx35-3-stack/env/"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/freescale-mx35-3-stack/env/"
 
 #
 # Debugging                     
diff --git a/arch/arm/configs/mmccpu_defconfig b/arch/arm/configs/mmccpu_defconfig
index 2b80a30a59..a8c41e7878 100644
--- a/arch/arm/configs/mmccpu_defconfig
+++ b/arch/arm/configs/mmccpu_defconfig
@@ -93,7 +93,7 @@ CONFIG_CONSOLE_ACTIVATE_FIRST=y
 # CONFIG_OF_FLAT_TREE is not set
 CONFIG_PARTITION=y
 CONFIG_DEFAULT_ENVIRONMENT=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="board/mmccpu/env"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/mmccpu/env"
 
 #
 # Debugging
diff --git a/arch/arm/configs/mx21ads_defconfig b/arch/arm/configs/mx21ads_defconfig
index 99a87143ec..99b5ed6aa4 100644
--- a/arch/arm/configs/mx21ads_defconfig
+++ b/arch/arm/configs/mx21ads_defconfig
@@ -104,7 +104,7 @@ CONFIG_CONSOLE_ACTIVATE_FIRST=y
 # CONFIG_OF_FLAT_TREE is not set
 CONFIG_PARTITION=y
 CONFIG_DEFAULT_ENVIRONMENT=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="board/imx21ads/env"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/imx21ads/env"
 
 #
 # Debugging
diff --git a/arch/arm/configs/mx27ads_defconfig b/arch/arm/configs/mx27ads_defconfig
index 71880c0b76..a1bf3f9412 100644
--- a/arch/arm/configs/mx27ads_defconfig
+++ b/arch/arm/configs/mx27ads_defconfig
@@ -108,7 +108,7 @@ CONFIG_CONSOLE_ACTIVATE_FIRST=y
 # CONFIG_OF_FLAT_TREE is not set
 CONFIG_PARTITION=y
 CONFIG_DEFAULT_ENVIRONMENT=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="board/imx27ads/env"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/imx27ads/env"
 
 #
 # Debugging
diff --git a/arch/arm/configs/pca100_defconfig b/arch/arm/configs/pca100_defconfig
index 52a5d93bb5..62beefab32 100644
--- a/arch/arm/configs/pca100_defconfig
+++ b/arch/arm/configs/pca100_defconfig
@@ -110,7 +110,7 @@ CONFIG_CONSOLE_ACTIVATE_FIRST=y
 # CONFIG_OF_FLAT_TREE is not set
 CONFIG_PARTITION=y
 CONFIG_DEFAULT_ENVIRONMENT=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="defaultenv board/phycard-i.MX27/env"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="defaultenv arch/arm/boards/phycard-i.MX27/env"
 
 #
 # Debugging
diff --git a/arch/arm/configs/pcm037_defconfig b/arch/arm/configs/pcm037_defconfig
index 9353d0e546..9337f8579b 100644
--- a/arch/arm/configs/pcm037_defconfig
+++ b/arch/arm/configs/pcm037_defconfig
@@ -106,7 +106,7 @@ CONFIG_CONSOLE_ACTIVATE_FIRST=y
 # CONFIG_OF_FLAT_TREE is not set
 CONFIG_PARTITION=y
 CONFIG_DEFAULT_ENVIRONMENT=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="defaultenv board/pcm037/env"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="defaultenv arch/arm/boards/pcm037/env"
 
 #
 # Debugging
diff --git a/arch/arm/configs/pcm038_defconfig b/arch/arm/configs/pcm038_defconfig
index a80089cd4f..65ecb0763d 100644
--- a/arch/arm/configs/pcm038_defconfig
+++ b/arch/arm/configs/pcm038_defconfig
@@ -110,7 +110,7 @@ CONFIG_CONSOLE_ACTIVATE_FIRST=y
 # CONFIG_OF_FLAT_TREE is not set
 CONFIG_PARTITION=y
 CONFIG_DEFAULT_ENVIRONMENT=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="defaultenv board/pcm038/env"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="defaultenv arch/arm/boards/pcm038/env"
 
 #
 # Debugging
diff --git a/arch/arm/configs/pcm043_defconfig b/arch/arm/configs/pcm043_defconfig
index 72a8a4291f..482e580dad 100644
--- a/arch/arm/configs/pcm043_defconfig
+++ b/arch/arm/configs/pcm043_defconfig
@@ -109,7 +109,7 @@ CONFIG_CONSOLE_ACTIVATE_FIRST=y
 # CONFIG_OF_FLAT_TREE is not set
 CONFIG_PARTITION=y
 CONFIG_DEFAULT_ENVIRONMENT=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="defaultenv board/pcm043/env"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="defaultenv arch/arm/boards/pcm043/env"
 
 #
 # Debugging
diff --git a/arch/arm/configs/pm9263_defconfig b/arch/arm/configs/pm9263_defconfig
index cde5cbe66e..d5ee46a6f2 100644
--- a/arch/arm/configs/pm9263_defconfig
+++ b/arch/arm/configs/pm9263_defconfig
@@ -93,7 +93,7 @@ CONFIG_CONSOLE_ACTIVATE_FIRST=y
 # CONFIG_OF_FLAT_TREE is not set
 CONFIG_PARTITION=y
 CONFIG_DEFAULT_ENVIRONMENT=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="board/pm9263/env/"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/pm9263/env/"
 
 #
 # Debugging
diff --git a/arch/arm/configs/scb9328_defconfig b/arch/arm/configs/scb9328_defconfig
index 6638234be3..7dc56dd855 100644
--- a/arch/arm/configs/scb9328_defconfig
+++ b/arch/arm/configs/scb9328_defconfig
@@ -105,7 +105,7 @@ CONFIG_CONSOLE_ACTIVATE_FIRST=y
 # CONFIG_OF_FLAT_TREE is not set
 # CONFIG_PARTITION is not set
 CONFIG_DEFAULT_ENVIRONMENT=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="board/scb9328/env"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/scb9328/env"
 
 #
 # Debugging
diff --git a/arch/arm/include/asm/barebox-arm.h b/arch/arm/include/asm/barebox-arm.h
index 5f0bb73413..7bb1af1606 100644
--- a/arch/arm/include/asm/barebox-arm.h
+++ b/arch/arm/include/asm/barebox-arm.h
@@ -32,7 +32,7 @@
 /* cpu/.../cpu.c */
 int	cleanup_before_linux(void);
 
-/* board/.../... */
+/* arch/<arch>board(s)/.../... */
 int	board_init(void);
 int	dram_init (void);
 
diff --git a/arch/arm/mach-omap/Kconfig b/arch/arm/mach-omap/Kconfig
index e5230802ec..158639ec59 100644
--- a/arch/arm/mach-omap/Kconfig
+++ b/arch/arm/mach-omap/Kconfig
@@ -83,6 +83,6 @@ config GPMC
 	 NAND, OneNAND etc.
 
 # Get the board specific configurations
-source board/omap/Kconfig
+source arch/arm/boards/omap/Kconfig
 
 endmenu
diff --git a/arch/arm/mach-omap/arch-omap.dox b/arch/arm/mach-omap/arch-omap.dox
index 01e45f291e..df16b7be96 100644
--- a/arch/arm/mach-omap/arch-omap.dox
+++ b/arch/arm/mach-omap/arch-omap.dox
@@ -39,7 +39,7 @@ Motivation for code organization is driven from:
 Code is Organized into three main directories:
 @li arch/arm/mach-omap -contains files for ALL peripherals which are present on board with very few exceptions. We will come to these exceptions in later sections.
 @li include/asm-arm/arch-omap - contains files for ALL OMAP on-silicon peripherals. No Board specific files here please!
-@li board/omap - contains files for ALL boards using OMAP processors.
+@li arch/arm/boards/omap - contains files for ALL boards using OMAP processors.
 
 @section mach_omap arch/arm/mach-omap directory guidelines
 It is rather simple: All common peripherals should be isolated as separate driver libraries as far as possible. Exceptions such as clock configuration code may be isolated by the following naming convention: omapX_function_name.[cS], where X belongs to the OMAP variant. The exception is for devices who have existing code locations - potentially drivers/i2c/busses and the like.
@@ -52,7 +52,7 @@ All OMAP common headers are located here. Where we have to incorporate a OMAP va
 
 include/asm-arm/arch-omap/silicon.h contains includes for omapX-silicon.h which defines the base addresses for the peripherals on that platform. the usual convention is to use #define OMAP_SOMETHING_BASE to allow re-use.
 
-@section board_omap board/omap directory guidelines
+@section board_omap arch/arm/boards/omap directory guidelines
 All Board specific files go here. In u-boot, we always had to use common config file which is shared by other drivers to get serial, ethernet baseaddress etc.. we can easily use the device_d structure to handle it with @a barebox. This is more like programming for Linux kernel - it is pretty easy.
 Each specific board file has board-XYZ.c and potentially and equivalent h file.
 
@@ -66,7 +66,7 @@ The responsibility of arch_init_lowlevel and related calls is to setup OMAP. No
 Once this is past, the code returns back to arm common code (cpu/start-arm.S). Here Instruction and Data caches are disabled. The execution proceeds to normal board initialization.
 
 @section board_boot The board boot path
-If the proper CONFIG_MACH_DO_LOWLEVEL_INIT flag is setup, board_init_lowlevel is called. This again would call a common file board/omap/platform.S which setups a temporary SRAM stack and bumps the control to board_init.
+If the proper CONFIG_MACH_DO_LOWLEVEL_INIT flag is setup, board_init_lowlevel is called. This again would call a common file arch/arm/boards/omap/platform.S which setups a temporary SRAM stack and bumps the control to board_init.
 Every Board in OMAP platform can potentially define a board_init and enable defconfig in arch/arm/configs directory. The responsibility here is to setup OMAP for board configurations - this includes SDRAM configuration and pin muxing configuration.
 
 Once this is complete, @a barebox boot process proceeds by calling init functions and finally entering shell prompt
@@ -87,7 +87,7 @@ static int my_board_devices_init(void) {
 device_initcall(my_board_devices_init);
 @endcode
 
-You may probably be interested in calling console_initcall to get a console.. Modify board/omap/Kconfig to add your OMAP board, create a defconfig, do a make C=2 to enable sparse warnings, you can potentially have a binary done in no time! if you remember to put doxygen comments in your code, you can do a make docs and get the documentation done too..
+You may probably be interested in calling console_initcall to get a console.. Modify arch/arm/boards/omap/Kconfig to add your OMAP board, create a defconfig, do a make C=2 to enable sparse warnings, you can potentially have a binary done in no time! if you remember to put doxygen comments in your code, you can do a make docs and get the documentation done too..
 
 
 */
diff --git a/arch/arm/mach-s3c24xx/generic.c b/arch/arm/mach-s3c24xx/generic.c
index 372904f89d..46b5c50d5b 100644
--- a/arch/arm/mach-s3c24xx/generic.c
+++ b/arch/arm/mach-s3c24xx/generic.c
@@ -244,8 +244,8 @@ EXPORT_SYMBOL(reset_cpu);
 
 @section s3c24xx_boards Boards using S3C24xx Processors
 
-@li @subpage board/a9m2410/a9m2410.c
-@li @subpage board/a9m2440/a9m2440.c
+@li @subpage arch/arm/boards/a9m2410/a9m2410.c
+@li @subpage arch/arm/boards/a9m2440/a9m2440.c
 
 @section s3c24xx_arch Documentation for S3C24xx Architectures Files
 
diff --git a/arch/blackfin/Makefile b/arch/blackfin/Makefile
index dbb90814f9..902268da70 100644
--- a/arch/blackfin/Makefile
+++ b/arch/blackfin/Makefile
@@ -22,7 +22,7 @@ PHONY += maketools
 
 
 ifneq ($(board-y),)
-BOARD  := board/$(board-y)/
+BOARD  := arch/blackfin/boards/$(board-y)/
 else
 BOARD  :=
 endif
diff --git a/board/ipe337/Makefile b/arch/blackfin/boards/ipe337/Makefile
index 172dfb688c..172dfb688c 100644
--- a/board/ipe337/Makefile
+++ b/arch/blackfin/boards/ipe337/Makefile
diff --git a/board/ipe337/barebox.lds.S b/arch/blackfin/boards/ipe337/barebox.lds.S
index 4299b8208b..4299b8208b 100644
--- a/board/ipe337/barebox.lds.S
+++ b/arch/blackfin/boards/ipe337/barebox.lds.S
diff --git a/board/ipe337/cmd_alternate.c b/arch/blackfin/boards/ipe337/cmd_alternate.c
index 2883c77d32..2883c77d32 100644
--- a/board/ipe337/cmd_alternate.c
+++ b/arch/blackfin/boards/ipe337/cmd_alternate.c
diff --git a/board/ipe337/config.h b/arch/blackfin/boards/ipe337/config.h
index aa25d0792d..aa25d0792d 100644
--- a/board/ipe337/config.h
+++ b/arch/blackfin/boards/ipe337/config.h
diff --git a/board/ipe337/env/bin/_alternate b/arch/blackfin/boards/ipe337/env/bin/_alternate
index 10ae2134c0..10ae2134c0 100644
--- a/board/ipe337/env/bin/_alternate
+++ b/arch/blackfin/boards/ipe337/env/bin/_alternate
diff --git a/board/ipe337/env/bin/_update b/arch/blackfin/boards/ipe337/env/bin/_update
index 5419ece6a7..5419ece6a7 100644
--- a/board/ipe337/env/bin/_update
+++ b/arch/blackfin/boards/ipe337/env/bin/_update
diff --git a/board/ipe337/env/bin/boot b/arch/blackfin/boards/ipe337/env/bin/boot
index 62807d211f..62807d211f 100644
--- a/board/ipe337/env/bin/boot
+++ b/arch/blackfin/boards/ipe337/env/bin/boot
diff --git a/board/ipe337/env/bin/init b/arch/blackfin/boards/ipe337/env/bin/init
index e864dc5a42..e864dc5a42 100644
--- a/board/ipe337/env/bin/init
+++ b/arch/blackfin/boards/ipe337/env/bin/init
diff --git a/board/ipe337/env/bin/magic.bin b/arch/blackfin/boards/ipe337/env/bin/magic.bin
index f8bff393cf..f8bff393cf 100644
--- a/board/ipe337/env/bin/magic.bin
+++ b/arch/blackfin/boards/ipe337/env/bin/magic.bin
diff --git a/board/ipe337/env/bin/reset_ageing b/arch/blackfin/boards/ipe337/env/bin/reset_ageing
index 2c95ae762e..2c95ae762e 100644
--- a/board/ipe337/env/bin/reset_ageing
+++ b/arch/blackfin/boards/ipe337/env/bin/reset_ageing
diff --git a/board/ipe337/env/bin/update_application b/arch/blackfin/boards/ipe337/env/bin/update_application
index 46ad210e36..46ad210e36 100644
--- a/board/ipe337/env/bin/update_application
+++ b/arch/blackfin/boards/ipe337/env/bin/update_application
diff --git a/board/ipe337/env/bin/update_bareboxenv b/arch/blackfin/boards/ipe337/env/bin/update_bareboxenv
index b0a32c626b..b0a32c626b 100644
--- a/board/ipe337/env/bin/update_bareboxenv
+++ b/arch/blackfin/boards/ipe337/env/bin/update_bareboxenv
diff --git a/board/ipe337/env/bin/update_kernel b/arch/blackfin/boards/ipe337/env/bin/update_kernel
index d5c210eb2b..d5c210eb2b 100644
--- a/board/ipe337/env/bin/update_kernel
+++ b/arch/blackfin/boards/ipe337/env/bin/update_kernel
diff --git a/board/ipe337/env/bin/update_persistent b/arch/blackfin/boards/ipe337/env/bin/update_persistent
index a869b2218d..a869b2218d 100644
--- a/board/ipe337/env/bin/update_persistent
+++ b/arch/blackfin/boards/ipe337/env/bin/update_persistent
diff --git a/board/ipe337/env/bin/update_system b/arch/blackfin/boards/ipe337/env/bin/update_system
index 598fc10e81..598fc10e81 100644
--- a/board/ipe337/env/bin/update_system
+++ b/arch/blackfin/boards/ipe337/env/bin/update_system
diff --git a/board/ipe337/env/config b/arch/blackfin/boards/ipe337/env/config
index 7c5ee76e30..7c5ee76e30 100644
--- a/board/ipe337/env/config
+++ b/arch/blackfin/boards/ipe337/env/config
diff --git a/board/ipe337/ipe337.c b/arch/blackfin/boards/ipe337/ipe337.c
index 269e7743fc..269e7743fc 100644
--- a/board/ipe337/ipe337.c
+++ b/arch/blackfin/boards/ipe337/ipe337.c
diff --git a/board/ipe337/ipe337.dox b/arch/blackfin/boards/ipe337/ipe337.dox
index 4d7925af94..4d7925af94 100644
--- a/board/ipe337/ipe337.dox
+++ b/arch/blackfin/boards/ipe337/ipe337.dox
diff --git a/arch/blackfin/configs/ipe337_defconfig b/arch/blackfin/configs/ipe337_defconfig
index fd4ff66456..33fd2fcde8 100644
--- a/arch/blackfin/configs/ipe337_defconfig
+++ b/arch/blackfin/configs/ipe337_defconfig
@@ -55,7 +55,7 @@ CONFIG_CONSOLE_ACTIVATE_FIRST=y
 # CONFIG_OF_FLAT_TREE is not set
 CONFIG_PARTITION=y
 CONFIG_DEFAULT_ENVIRONMENT=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="board/ipe337/env"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/blackin/boards/ipe337/env"
 
 #
 # Debugging                     
diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index f377325add..ec70028a16 100644
--- a/arch/m68k/Makefile
+++ b/arch/m68k/Makefile
@@ -63,7 +63,7 @@ PHONY += maketools
 
 
 ifneq ($(board-y),)
-BOARD  := board/$(board-y)/
+BOARD  := arch/m68k/boards/$(board-y)/
 else
 BOARD  :=
 endif
diff --git a/board/kp_ukd_r1_num/Makefile b/arch/m68k/boards/kp_ukd_r1_num/Makefile
index 65f2a02fca..65f2a02fca 100644
--- a/board/kp_ukd_r1_num/Makefile
+++ b/arch/m68k/boards/kp_ukd_r1_num/Makefile
diff --git a/board/phycore_mcf54xx/env/bin/_update b/arch/m68k/boards/kp_ukd_r1_num/env/bin/_update
index 014bce3512..014bce3512 100644
--- a/board/phycore_mcf54xx/env/bin/_update
+++ b/arch/m68k/boards/kp_ukd_r1_num/env/bin/_update
diff --git a/board/kp_ukd_r1_num/env/bin/boot b/arch/m68k/boards/kp_ukd_r1_num/env/bin/boot
index c9fcbac620..c9fcbac620 100644
--- a/board/kp_ukd_r1_num/env/bin/boot
+++ b/arch/m68k/boards/kp_ukd_r1_num/env/bin/boot
diff --git a/board/kp_ukd_r1_num/env/bin/init b/arch/m68k/boards/kp_ukd_r1_num/env/bin/init
index 48e2139f7d..48e2139f7d 100644
--- a/board/kp_ukd_r1_num/env/bin/init
+++ b/arch/m68k/boards/kp_ukd_r1_num/env/bin/init
diff --git a/board/kp_ukd_r1_num/env/bin/pcidmaloop b/arch/m68k/boards/kp_ukd_r1_num/env/bin/pcidmaloop
index 24e76cbed7..24e76cbed7 100644
--- a/board/kp_ukd_r1_num/env/bin/pcidmaloop
+++ b/arch/m68k/boards/kp_ukd_r1_num/env/bin/pcidmaloop
diff --git a/board/kp_ukd_r1_num/env/bin/pciloop b/arch/m68k/boards/kp_ukd_r1_num/env/bin/pciloop
index 4a804f9f31..4a804f9f31 100644
--- a/board/kp_ukd_r1_num/env/bin/pciloop
+++ b/arch/m68k/boards/kp_ukd_r1_num/env/bin/pciloop
diff --git a/board/kp_ukd_r1_num/env/bin/update_kernel b/arch/m68k/boards/kp_ukd_r1_num/env/bin/update_kernel
index 1ad95fc5d6..1ad95fc5d6 100644
--- a/board/kp_ukd_r1_num/env/bin/update_kernel
+++ b/arch/m68k/boards/kp_ukd_r1_num/env/bin/update_kernel
diff --git a/board/kp_ukd_r1_num/env/bin/update_root b/arch/m68k/boards/kp_ukd_r1_num/env/bin/update_root
index b757a5b922..b757a5b922 100644
--- a/board/kp_ukd_r1_num/env/bin/update_root
+++ b/arch/m68k/boards/kp_ukd_r1_num/env/bin/update_root
diff --git a/board/kp_ukd_r1_num/env/config b/arch/m68k/boards/kp_ukd_r1_num/env/config
index 14958ba1df..14958ba1df 100644
--- a/board/kp_ukd_r1_num/env/config
+++ b/arch/m68k/boards/kp_ukd_r1_num/env/config
diff --git a/board/kp_ukd_r1_num/highlevel_init.c b/arch/m68k/boards/kp_ukd_r1_num/highlevel_init.c
index 3a88cd68c7..3a88cd68c7 100644
--- a/board/kp_ukd_r1_num/highlevel_init.c
+++ b/arch/m68k/boards/kp_ukd_r1_num/highlevel_init.c
diff --git a/board/kp_ukd_r1_num/kp_ukd_r1_num.c b/arch/m68k/boards/kp_ukd_r1_num/kp_ukd_r1_num.c
index 9bf1713cc4..9bf1713cc4 100644
--- a/board/kp_ukd_r1_num/kp_ukd_r1_num.c
+++ b/arch/m68k/boards/kp_ukd_r1_num/kp_ukd_r1_num.c
diff --git a/board/kp_ukd_r1_num/kp_ukd_r1_num.dox b/arch/m68k/boards/kp_ukd_r1_num/kp_ukd_r1_num.dox
index ca0fcbcf39..ca0fcbcf39 100644
--- a/board/kp_ukd_r1_num/kp_ukd_r1_num.dox
+++ b/arch/m68k/boards/kp_ukd_r1_num/kp_ukd_r1_num.dox
diff --git a/board/kp_ukd_r1_num/lowlevel_init.c b/arch/m68k/boards/kp_ukd_r1_num/lowlevel_init.c
index b3de505c24..b3de505c24 100644
--- a/board/kp_ukd_r1_num/lowlevel_init.c
+++ b/arch/m68k/boards/kp_ukd_r1_num/lowlevel_init.c
diff --git a/board/kp_ukd_r1_num/pci-stubs.c b/arch/m68k/boards/kp_ukd_r1_num/pci-stubs.c
index b7ab7c7d72..b7ab7c7d72 100644
--- a/board/kp_ukd_r1_num/pci-stubs.c
+++ b/arch/m68k/boards/kp_ukd_r1_num/pci-stubs.c
diff --git a/board/phycore_mcf54xx/Makefile b/arch/m68k/boards/phycore_mcf54xx/Makefile
index 054123fe75..054123fe75 100644
--- a/board/phycore_mcf54xx/Makefile
+++ b/arch/m68k/boards/phycore_mcf54xx/Makefile
diff --git a/board/pm9263/env/bin/_update b/arch/m68k/boards/phycore_mcf54xx/env/bin/_update
index 014bce3512..014bce3512 100644
--- a/board/pm9263/env/bin/_update
+++ b/arch/m68k/boards/phycore_mcf54xx/env/bin/_update
diff --git a/board/phycore_mcf54xx/env/bin/boot b/arch/m68k/boards/phycore_mcf54xx/env/bin/boot
index c9fcbac620..c9fcbac620 100644
--- a/board/phycore_mcf54xx/env/bin/boot
+++ b/arch/m68k/boards/phycore_mcf54xx/env/bin/boot
diff --git a/board/phycore_mcf54xx/env/bin/init b/arch/m68k/boards/phycore_mcf54xx/env/bin/init
index 48e2139f7d..48e2139f7d 100644
--- a/board/phycore_mcf54xx/env/bin/init
+++ b/arch/m68k/boards/phycore_mcf54xx/env/bin/init
diff --git a/board/phycore_mcf54xx/env/bin/pcidmaloop b/arch/m68k/boards/phycore_mcf54xx/env/bin/pcidmaloop
index 24e76cbed7..24e76cbed7 100644
--- a/board/phycore_mcf54xx/env/bin/pcidmaloop
+++ b/arch/m68k/boards/phycore_mcf54xx/env/bin/pcidmaloop
diff --git a/board/phycore_mcf54xx/env/bin/pciloop b/arch/m68k/boards/phycore_mcf54xx/env/bin/pciloop
index 4a804f9f31..4a804f9f31 100644
--- a/board/phycore_mcf54xx/env/bin/pciloop
+++ b/arch/m68k/boards/phycore_mcf54xx/env/bin/pciloop
diff --git a/board/phycore_mcf54xx/env/bin/update_kernel b/arch/m68k/boards/phycore_mcf54xx/env/bin/update_kernel
index 1ad95fc5d6..1ad95fc5d6 100644
--- a/board/phycore_mcf54xx/env/bin/update_kernel
+++ b/arch/m68k/boards/phycore_mcf54xx/env/bin/update_kernel
diff --git a/board/phycore_mcf54xx/env/bin/update_root b/arch/m68k/boards/phycore_mcf54xx/env/bin/update_root
index b757a5b922..b757a5b922 100644
--- a/board/phycore_mcf54xx/env/bin/update_root
+++ b/arch/m68k/boards/phycore_mcf54xx/env/bin/update_root
diff --git a/board/phycore_mcf54xx/env/config b/arch/m68k/boards/phycore_mcf54xx/env/config
index 58550625d2..58550625d2 100644
--- a/board/phycore_mcf54xx/env/config
+++ b/arch/m68k/boards/phycore_mcf54xx/env/config
diff --git a/board/phycore_mcf54xx/highlevel_init.c b/arch/m68k/boards/phycore_mcf54xx/highlevel_init.c
index 3a88cd68c7..3a88cd68c7 100644
--- a/board/phycore_mcf54xx/highlevel_init.c
+++ b/arch/m68k/boards/phycore_mcf54xx/highlevel_init.c
diff --git a/board/phycore_mcf54xx/lowlevel_init.c b/arch/m68k/boards/phycore_mcf54xx/lowlevel_init.c
index 2837e3ed67..2837e3ed67 100644
--- a/board/phycore_mcf54xx/lowlevel_init.c
+++ b/arch/m68k/boards/phycore_mcf54xx/lowlevel_init.c
diff --git a/board/phycore_mcf54xx/pci-stubs.c b/arch/m68k/boards/phycore_mcf54xx/pci-stubs.c
index b7ab7c7d72..b7ab7c7d72 100644
--- a/board/phycore_mcf54xx/pci-stubs.c
+++ b/arch/m68k/boards/phycore_mcf54xx/pci-stubs.c
diff --git a/board/phycore_mcf54xx/phyCore_MCF54xx.c b/arch/m68k/boards/phycore_mcf54xx/phyCore_MCF54xx.c
index 3bc2d12a42..3bc2d12a42 100644
--- a/board/phycore_mcf54xx/phyCore_MCF54xx.c
+++ b/arch/m68k/boards/phycore_mcf54xx/phyCore_MCF54xx.c
diff --git a/board/phycore_mcf54xx/phyCore_MCF54xx.dox b/arch/m68k/boards/phycore_mcf54xx/phyCore_MCF54xx.dox
index 36dd0ad195..36dd0ad195 100644
--- a/board/phycore_mcf54xx/phyCore_MCF54xx.dox
+++ b/arch/m68k/boards/phycore_mcf54xx/phyCore_MCF54xx.dox
diff --git a/arch/m68k/configs/phycore_kpukdr1_5475num_defconfig b/arch/m68k/configs/phycore_kpukdr1_5475num_defconfig
index ba21a008d3..bb91152210 100644
--- a/arch/m68k/configs/phycore_kpukdr1_5475num_defconfig
+++ b/arch/m68k/configs/phycore_kpukdr1_5475num_defconfig
@@ -71,7 +71,7 @@ CONFIG_EARLY_CONSOLE_PORT="psc0"
 CONFIG_EARLY_CONSOLE_BAUDRATE=115200
 # CONFIG_OF_FLAT_TREE is not set
 CONFIG_DEFAULT_ENVIRONMENT=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="board/kp_ukd_r1_num/env/"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/m68k/boards/kp_ukd_r1_num/env/"
 
 #
 # Debugging
diff --git a/arch/m68k/configs/phycore_mcf54xx_defconfig b/arch/m68k/configs/phycore_mcf54xx_defconfig
index 34ca73ffc7..f64ca8b022 100644
--- a/arch/m68k/configs/phycore_mcf54xx_defconfig
+++ b/arch/m68k/configs/phycore_mcf54xx_defconfig
@@ -71,7 +71,7 @@ CONFIG_EARLY_CONSOLE_PORT="psc0"
 CONFIG_EARLY_CONSOLE_BAUDRATE=115200
 # CONFIG_OF_FLAT_TREE is not set
 CONFIG_DEFAULT_ENVIRONMENT=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="board/phycore_mcf54xx/env"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/m68k/boards/phycore_mcf54xx/env"
 
 #
 # Debugging                     
diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile
index c24d3c3685..46d64e5bc6 100644
--- a/arch/ppc/Makefile
+++ b/arch/ppc/Makefile
@@ -35,7 +35,7 @@ PHONY += maketools
 
 
 ifneq ($(board-y),)
-BOARD  := board/$(board-y)/
+BOARD  := arch/ppc/boards/$(board-y)/
 else
 BOARD  :=
 endif
diff --git a/board/pcm030/Makefile b/arch/ppc/boards/pcm030/Makefile
index e7d744bfb4..e7d744bfb4 100644
--- a/board/pcm030/Makefile
+++ b/arch/ppc/boards/pcm030/Makefile
diff --git a/board/pcm030/barebox.lds.S b/arch/ppc/boards/pcm030/barebox.lds.S
index ab99335675..ab99335675 100644
--- a/board/pcm030/barebox.lds.S
+++ b/arch/ppc/boards/pcm030/barebox.lds.S
diff --git a/board/pcm030/config.h b/arch/ppc/boards/pcm030/config.h
index a772ee6d96..a772ee6d96 100644
--- a/board/pcm030/config.h
+++ b/arch/ppc/boards/pcm030/config.h
diff --git a/board/pcm030/mt46v32m16-75.h b/arch/ppc/boards/pcm030/mt46v32m16-75.h
index 4d191f1f91..4d191f1f91 100644
--- a/board/pcm030/mt46v32m16-75.h
+++ b/arch/ppc/boards/pcm030/mt46v32m16-75.h
diff --git a/board/pcm030/pcm030.c b/arch/ppc/boards/pcm030/pcm030.c
index f3845adf4c..f3845adf4c 100644
--- a/board/pcm030/pcm030.c
+++ b/arch/ppc/boards/pcm030/pcm030.c
diff --git a/board/pcm030/pcm030.dox b/arch/ppc/boards/pcm030/pcm030.dox
index b9ada839f2..b9ada839f2 100644
--- a/board/pcm030/pcm030.dox
+++ b/arch/ppc/boards/pcm030/pcm030.dox
diff --git a/arch/sandbox/Makefile b/arch/sandbox/Makefile
index 6b8942eb16..4ca17ed839 100644
--- a/arch/sandbox/Makefile
+++ b/arch/sandbox/Makefile
@@ -3,8 +3,10 @@ CPPFLAGS += -fno-strict-aliasing
 
 machine-y := sandbox
 
-board-y := sandbox
-lds-y   := board/sandbox/barebox.lds
+board-y := arch/sandbox/board
+BOARD	:= $(board-y)/
+lds-y   := $(BOARD)/barebox.lds
+
 
 TEXT_BASE = $(CONFIG_TEXT_BASE)
 
@@ -62,6 +64,6 @@ cmd_barebox__ = $(CC) -o $@ -Wl,-T,$(barebox-lds) \
 	-Wl,--start-group $(barebox-common) -Wl,--end-group \
 	-lrt -lpthread
 
-common-y += board/sandbox/ arch/sandbox/os/
+common-y += $(BOARD) arch/sandbox/os/
 
-CLEAN_FILES += board/sandbox/barebox.lds
+CLEAN_FILES += $(BOARD)/barebox.lds
diff --git a/board/sandbox/.gitignore b/arch/sandbox/board/.gitignore
index d1165788c9..d1165788c9 100644
--- a/board/sandbox/.gitignore
+++ b/arch/sandbox/board/.gitignore
diff --git a/board/sandbox/Makefile b/arch/sandbox/board/Makefile
index 8abe5dde08..8abe5dde08 100644
--- a/board/sandbox/Makefile
+++ b/arch/sandbox/board/Makefile
diff --git a/board/sandbox/barebox.lds.S b/arch/sandbox/board/barebox.lds.S
index 53e9f6021a..53e9f6021a 100644
--- a/board/sandbox/barebox.lds.S
+++ b/arch/sandbox/board/barebox.lds.S
diff --git a/board/sandbox/board.c b/arch/sandbox/board/board.c
index 84017eb50d..84017eb50d 100644
--- a/board/sandbox/board.c
+++ b/arch/sandbox/board/board.c
diff --git a/board/sandbox/clock.c b/arch/sandbox/board/clock.c
index b15086432c..b15086432c 100644
--- a/board/sandbox/clock.c
+++ b/arch/sandbox/board/clock.c
diff --git a/board/sandbox/config.h b/arch/sandbox/board/config.h
index c96d762f2d..c96d762f2d 100644
--- a/board/sandbox/config.h
+++ b/arch/sandbox/board/config.h
diff --git a/board/sandbox/console.c b/arch/sandbox/board/console.c
index 2959e85c7a..2959e85c7a 100644
--- a/board/sandbox/console.c
+++ b/arch/sandbox/board/console.c
diff --git a/board/sandbox/env/bin/init b/arch/sandbox/board/env/bin/init
index a7cb7d563d..a7cb7d563d 100644
--- a/board/sandbox/env/bin/init
+++ b/arch/sandbox/board/env/bin/init
diff --git a/board/sandbox/env/config b/arch/sandbox/board/env/config
index 2b148b6daa..2b148b6daa 100644
--- a/board/sandbox/env/config
+++ b/arch/sandbox/board/env/config
diff --git a/board/sandbox/hostfile.c b/arch/sandbox/board/hostfile.c
index ad625d7a6e..ad625d7a6e 100644
--- a/board/sandbox/hostfile.c
+++ b/arch/sandbox/board/hostfile.c
diff --git a/arch/sandbox/configs/sandbox_defconfig b/arch/sandbox/configs/sandbox_defconfig
index adcb07e49b..9037c8ba92 100644
--- a/arch/sandbox/configs/sandbox_defconfig
+++ b/arch/sandbox/configs/sandbox_defconfig
@@ -41,7 +41,7 @@ CONFIG_CONSOLE_ACTIVATE_FIRST=y
 # CONFIG_OF_FLAT_TREE is not set
 CONFIG_PARTITION=y
 CONFIG_DEFAULT_ENVIRONMENT=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="board/sandbox/env"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/sandbox/board/env"
 
 #
 # Debugging
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 2e2cb810d7..57c5dbc3b0 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -26,7 +26,7 @@ all: $(KBUILD_IMAGE)
 
 
 ifneq ($(board-y),)
-BOARD  := board/$(board-y)/
+BOARD  := arch/x86/boards/$(board-y)/
 else
 BOARD  :=
 endif
diff --git a/board/x86_generic/Makefile b/arch/x86/boards/x86_generic/Makefile
index 248240da07..248240da07 100644
--- a/board/x86_generic/Makefile
+++ b/arch/x86/boards/x86_generic/Makefile
diff --git a/board/x86_generic/config.h b/arch/x86/boards/x86_generic/config.h
index 39bea1844b..39bea1844b 100644
--- a/board/x86_generic/config.h
+++ b/arch/x86/boards/x86_generic/config.h
diff --git a/board/x86_generic/env/bin/boot b/arch/x86/boards/x86_generic/env/bin/boot
index fcfffe3194..fcfffe3194 100644
--- a/board/x86_generic/env/bin/boot
+++ b/arch/x86/boards/x86_generic/env/bin/boot
diff --git a/board/x86_generic/env/bin/init b/arch/x86/boards/x86_generic/env/bin/init
index 2924a4449a..2924a4449a 100644
--- a/board/x86_generic/env/bin/init
+++ b/arch/x86/boards/x86_generic/env/bin/init
diff --git a/board/x86_generic/env/config b/arch/x86/boards/x86_generic/env/config
index dd57aad716..dd57aad716 100644
--- a/board/x86_generic/env/config
+++ b/arch/x86/boards/x86_generic/env/config
diff --git a/board/x86_generic/generic_pc.c b/arch/x86/boards/x86_generic/generic_pc.c
index bd93bc168d..bd93bc168d 100644
--- a/board/x86_generic/generic_pc.c
+++ b/arch/x86/boards/x86_generic/generic_pc.c
diff --git a/arch/x86/configs/generic_defconfig b/arch/x86/configs/generic_defconfig
index 091f696e3a..3c72242415 100644
--- a/arch/x86/configs/generic_defconfig
+++ b/arch/x86/configs/generic_defconfig
@@ -63,7 +63,7 @@ CONFIG_CONSOLE_ACTIVATE_FIRST=y
 # CONFIG_OF_FLAT_TREE is not set
 CONFIG_PARTITION=y
 CONFIG_DEFAULT_ENVIRONMENT=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="board/x86_generic/env"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/x86/boards/x86_generic/env"
 
 #
 # Debugging                     
diff --git a/board/board.dox b/board/board.dox
index 76bff45060..6bda416ec2 100644
--- a/board/board.dox
+++ b/board/board.dox
@@ -5,24 +5,24 @@ the @a barebox source tree.
 
 @section board_add_files Files/Directories to be added
 
- - board/\<boardname\>
- - board/\<boardname\>/Makefile
- - board/\<boardname\>/\<boardname\>.c
- - board/\<boardname\>/\<boardname\>.dox
+ - arch/\<architecture\>/boards/\<boardname\>
+ - arch/\<architecture\>/boards/\<boardname\>/Makefile
+ - arch/\<architecture\>/boards/\<boardname\>/\<boardname\>.c
+ - arch/\<architecture\>/boards/\<boardname\>/\<boardname\>.dox
  - include/configs/\<boardname\>.h
  - arch/\<architecture\>/configs/\<boardname\>_defconfig
 
-@subsection board_makefile board/\<boardname\>Makefile
+@subsection board_makefile arch/\<architecture\>/boards/\<boardname\>Makefile
 
 @verbatim
 	obj-y += all files that builds the BSP (Assembler and/or C files)
 @endverbatim
 
-@subsection board_basefile board/\<boardname\>\<boardname\>.c
+@subsection board_basefile arch/\<architecture\>/boards/\<boardname\>\<boardname\>.c
 
 TBD
 
-@subsection board_doxygen board/\<boardname\>/\<boardname\>.dox
+@subsection board_doxygen arch/\<architecture\>/boards/\<boardname\>/\<boardname\>.dox
 
 This file should describe in short words your new board, what CPU
 it uses, what resources are provided and features it supports.
@@ -58,7 +58,7 @@ at the right architecture.
 
 @note Consider to use an unique page lable.
 
-@subsection board_lscript board/\<boardname\>/barebox.lds.S
+@subsection board_lscript arch/\<architecture\>/boards/\<boardname\>/barebox.lds.S
 
 If your board needs a special binary @a barebox layout, you can provide a local
 board linker script file. This will replace the generic one provided by your