summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-02-03 10:01:33 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2014-02-03 15:09:14 +0100
commit2a1f5f802e1c62b40e57beabbd7413d12a715059 (patch)
tree0af8e8d205559495af8256bdd387e1e77df768a4
parent46c034db92676dd569797c4cf03f072e56fd6734 (diff)
downloadbarebox-2a1f5f802e1c62b40e57beabbd7413d12a715059.tar.gz
barebox-2a1f5f802e1c62b40e57beabbd7413d12a715059.tar.xz
ARM: rename boards to more consistent naming
This renames the Freescale and Phytec board directories and defconfig files to a common naming scheme. The board directories are named <vendor>-<board> and the defconfig files are named <vendor>-<board>_defconfig. Also the DataModul realq7 is renamed to its Marketing Name eDM-QMX6. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/Makefile2
-rw-r--r--arch/arm/boards/Makefile32
-rw-r--r--arch/arm/boards/datamodul-edm-qmx6/Makefile (renamed from arch/arm/boards/dmo-mx6-realq7/Makefile)0
-rw-r--r--arch/arm/boards/datamodul-edm-qmx6/board.c (renamed from arch/arm/boards/dmo-mx6-realq7/board.c)0
-rw-r--r--arch/arm/boards/datamodul-edm-qmx6/env/boot/mmc (renamed from arch/arm/boards/dmo-mx6-realq7/env/boot/mmc)0
-rw-r--r--arch/arm/boards/datamodul-edm-qmx6/env/config-board (renamed from arch/arm/boards/dmo-mx6-realq7/env/config-board)0
-rw-r--r--arch/arm/boards/datamodul-edm-qmx6/env/init/automount (renamed from arch/arm/boards/dmo-mx6-realq7/env/init/automount)0
-rw-r--r--arch/arm/boards/datamodul-edm-qmx6/flash-header.imxcfg (renamed from arch/arm/boards/dmo-mx6-realq7/flash-header.imxcfg)0
-rw-r--r--arch/arm/boards/datamodul-edm-qmx6/lowlevel.c (renamed from arch/arm/boards/dmo-mx6-realq7/lowlevel.c)0
-rw-r--r--arch/arm/boards/freescale-mx21-ads/Makefile (renamed from arch/arm/boards/imx21ads/Makefile)0
-rw-r--r--arch/arm/boards/freescale-mx21-ads/env/bin/init (renamed from arch/arm/boards/imx21ads/env/bin/init)0
-rw-r--r--arch/arm/boards/freescale-mx21-ads/imx21ads.c (renamed from arch/arm/boards/imx21ads/imx21ads.c)0
-rw-r--r--arch/arm/boards/freescale-mx21-ads/imx21ads.dox (renamed from arch/arm/boards/imx21ads/imx21ads.dox)0
-rw-r--r--arch/arm/boards/freescale-mx21-ads/lowlevel_init.S (renamed from arch/arm/boards/imx21ads/lowlevel_init.S)0
-rw-r--r--arch/arm/boards/freescale-mx25-3ds/3stack.c (renamed from arch/arm/boards/freescale-mx25-3-stack/3stack.c)0
-rw-r--r--arch/arm/boards/freescale-mx25-3ds/Makefile (renamed from arch/arm/boards/freescale-mx25-3-stack/Makefile)0
-rw-r--r--arch/arm/boards/freescale-mx25-3ds/env/bin/_update (renamed from arch/arm/boards/freescale-mx25-3-stack/env/bin/_update)0
-rw-r--r--arch/arm/boards/freescale-mx25-3ds/env/bin/boot (renamed from arch/arm/boards/freescale-mx25-3-stack/env/bin/boot)0
-rw-r--r--arch/arm/boards/freescale-mx25-3ds/env/bin/hush_hack (renamed from arch/arm/boards/freescale-mx25-3-stack/env/bin/hush_hack)0
-rw-r--r--arch/arm/boards/freescale-mx25-3ds/env/bin/init (renamed from arch/arm/boards/freescale-mx25-3-stack/env/bin/init)0
-rw-r--r--arch/arm/boards/freescale-mx25-3ds/env/bin/update_kernel (renamed from arch/arm/boards/freescale-mx25-3-stack/env/bin/update_kernel)0
-rw-r--r--arch/arm/boards/freescale-mx25-3ds/env/bin/update_root (renamed from arch/arm/boards/freescale-mx25-3-stack/env/bin/update_root)0
-rw-r--r--arch/arm/boards/freescale-mx25-3ds/env/config (renamed from arch/arm/boards/freescale-mx25-3-stack/env/config)0
-rw-r--r--arch/arm/boards/freescale-mx25-3ds/lowlevel_init.S (renamed from arch/arm/boards/freescale-mx25-3-stack/lowlevel_init.S)0
-rw-r--r--arch/arm/boards/freescale-mx27-ads/Makefile (renamed from arch/arm/boards/imx27ads/Makefile)0
-rw-r--r--arch/arm/boards/freescale-mx27-ads/env/bin/_update (renamed from arch/arm/boards/imx27ads/env/bin/_update)0
-rw-r--r--arch/arm/boards/freescale-mx27-ads/env/bin/boot (renamed from arch/arm/boards/imx27ads/env/bin/boot)0
-rw-r--r--arch/arm/boards/freescale-mx27-ads/env/bin/init (renamed from arch/arm/boards/imx27ads/env/bin/init)0
-rw-r--r--arch/arm/boards/freescale-mx27-ads/env/bin/update_kernel (renamed from arch/arm/boards/imx27ads/env/bin/update_kernel)0
-rw-r--r--arch/arm/boards/freescale-mx27-ads/env/bin/update_root (renamed from arch/arm/boards/imx27ads/env/bin/update_root)0
-rw-r--r--arch/arm/boards/freescale-mx27-ads/env/config (renamed from arch/arm/boards/imx27ads/env/config)0
-rw-r--r--arch/arm/boards/freescale-mx27-ads/imx27ads.c (renamed from arch/arm/boards/imx27ads/imx27ads.c)0
-rw-r--r--arch/arm/boards/freescale-mx27-ads/imx27ads.dox (renamed from arch/arm/boards/imx27ads/imx27ads.dox)0
-rw-r--r--arch/arm/boards/freescale-mx27-ads/lowlevel_init.S (renamed from arch/arm/boards/imx27ads/lowlevel_init.S)0
-rw-r--r--arch/arm/boards/freescale-mx35-3ds/3stack.c (renamed from arch/arm/boards/freescale-mx35-3-stack/3stack.c)0
-rw-r--r--arch/arm/boards/freescale-mx35-3ds/3stack.dox (renamed from arch/arm/boards/freescale-mx35-3-stack/3stack.dox)0
-rw-r--r--arch/arm/boards/freescale-mx35-3ds/Makefile (renamed from arch/arm/boards/freescale-mx35-3-stack/Makefile)0
-rw-r--r--arch/arm/boards/freescale-mx35-3ds/board-mx35_3stack.h (renamed from arch/arm/boards/freescale-mx35-3-stack/board-mx35_3stack.h)0
-rw-r--r--arch/arm/boards/freescale-mx35-3ds/env/config (renamed from arch/arm/boards/freescale-mx35-3-stack/env/config)0
-rw-r--r--arch/arm/boards/freescale-mx35-3ds/flash_header.c (renamed from arch/arm/boards/freescale-mx35-3-stack/flash_header.c)0
-rw-r--r--arch/arm/boards/freescale-mx35-3ds/lowlevel_init.S (renamed from arch/arm/boards/freescale-mx35-3-stack/lowlevel_init.S)0
-rw-r--r--arch/arm/boards/freescale-mx51-babbage/Makefile (renamed from arch/arm/boards/freescale-mx51-pdk/Makefile)0
-rw-r--r--arch/arm/boards/freescale-mx51-babbage/board.c (renamed from arch/arm/boards/freescale-mx51-pdk/board.c)0
-rw-r--r--arch/arm/boards/freescale-mx51-babbage/env/config-board (renamed from arch/arm/boards/freescale-mx51-pdk/env/config-board)0
-rw-r--r--arch/arm/boards/freescale-mx51-babbage/flash-header-imx51-babbage.imxcfg (renamed from arch/arm/boards/freescale-mx51-pdk/flash-header-imx51-babbage.imxcfg)0
-rw-r--r--arch/arm/boards/freescale-mx51-babbage/lowlevel.c (renamed from arch/arm/boards/freescale-mx51-pdk/lowlevel.c)0
-rw-r--r--arch/arm/boards/freescale-mx51-babbage/mx51-pdk.dox (renamed from arch/arm/boards/freescale-mx51-pdk/mx51-pdk.dox)0
-rw-r--r--arch/arm/boards/freescale-mx53-qsb/Makefile (renamed from arch/arm/boards/freescale-mx53-loco/Makefile)0
-rw-r--r--arch/arm/boards/freescale-mx53-qsb/board.c (renamed from arch/arm/boards/freescale-mx53-loco/board.c)0
-rw-r--r--arch/arm/boards/freescale-mx53-qsb/env/config-board (renamed from arch/arm/boards/freescale-mx53-loco/env/config-board)0
-rw-r--r--arch/arm/boards/freescale-mx53-qsb/flash-header-imx53-loco.imxcfg (renamed from arch/arm/boards/freescale-mx53-loco/flash-header-imx53-loco.imxcfg)0
-rw-r--r--arch/arm/boards/freescale-mx53-qsb/lowlevel.c (renamed from arch/arm/boards/freescale-mx53-loco/lowlevel.c)0
-rw-r--r--arch/arm/boards/freescale-mx53-qsb/mx53-pdk.dox (renamed from arch/arm/boards/freescale-mx53-loco/mx53-pdk.dox)0
-rw-r--r--arch/arm/boards/phytec-phycard-imx27/Makefile (renamed from arch/arm/boards/phycard-i.MX27/Makefile)0
-rw-r--r--arch/arm/boards/phytec-phycard-imx27/lowlevel.c (renamed from arch/arm/boards/phycard-i.MX27/lowlevel.c)0
-rw-r--r--arch/arm/boards/phytec-phycard-imx27/pca100.c (renamed from arch/arm/boards/phycard-i.MX27/pca100.c)0
-rw-r--r--arch/arm/boards/phytec-phycard-imx27/pca100.dox (renamed from arch/arm/boards/phycard-i.MX27/pca100.dox)0
-rw-r--r--arch/arm/boards/phytec-phycard-omap3/Makefile (renamed from arch/arm/boards/phycard-a-l1/Makefile)0
-rw-r--r--arch/arm/boards/phytec-phycard-omap3/env/config (renamed from arch/arm/boards/phycard-a-l1/env/config)0
-rw-r--r--arch/arm/boards/phytec-phycard-omap3/lowlevel.c (renamed from arch/arm/boards/phycard-a-l1/lowlevel.c)0
-rw-r--r--arch/arm/boards/phytec-phycard-omap3/pca-a-l1.c (renamed from arch/arm/boards/phycard-a-l1/pca-a-l1.c)0
-rw-r--r--arch/arm/boards/phytec-phycard-omap3/pca-a-l1.dox (renamed from arch/arm/boards/phycard-a-l1/pca-a-l1.dox)0
-rw-r--r--arch/arm/boards/phytec-phycard-omap3/pca-a-l1.h (renamed from arch/arm/boards/phycard-a-l1/pca-a-l1.h)0
-rw-r--r--arch/arm/boards/phytec-phycard-omap4/Makefile (renamed from arch/arm/boards/phycard-a-xl2/Makefile)0
-rw-r--r--arch/arm/boards/phytec-phycard-omap4/env/bin/nand_bootstrap (renamed from arch/arm/boards/phycard-a-xl2/env/bin/nand_bootstrap)0
-rw-r--r--arch/arm/boards/phytec-phycard-omap4/env/config (renamed from arch/arm/boards/phycard-a-xl2/env/config)0
-rw-r--r--arch/arm/boards/phytec-phycard-omap4/lowlevel.c (renamed from arch/arm/boards/phycard-a-xl2/lowlevel.c)0
-rw-r--r--arch/arm/boards/phytec-phycard-omap4/mux.c (renamed from arch/arm/boards/phycard-a-xl2/mux.c)0
-rw-r--r--arch/arm/boards/phytec-phycard-omap4/pca-a-xl2.c (renamed from arch/arm/boards/phycard-a-xl2/pca-a-xl2.c)0
-rw-r--r--arch/arm/boards/phytec-phycore-am335x/Makefile (renamed from arch/arm/boards/pcm051/Makefile)0
-rw-r--r--arch/arm/boards/phytec-phycore-am335x/board.c (renamed from arch/arm/boards/pcm051/board.c)0
-rw-r--r--arch/arm/boards/phytec-phycore-am335x/env/boot/mmc (renamed from arch/arm/boards/pcm051/env/boot/mmc)0
-rw-r--r--arch/arm/boards/phytec-phycore-am335x/env/boot/nand (renamed from arch/arm/boards/pcm051/env/boot/nand)0
-rw-r--r--arch/arm/boards/phytec-phycore-am335x/env/boot/spi (renamed from arch/arm/boards/pcm051/env/boot/spi)0
-rw-r--r--arch/arm/boards/phytec-phycore-am335x/env/config-board (renamed from arch/arm/boards/pcm051/env/config-board)0
-rw-r--r--arch/arm/boards/phytec-phycore-am335x/lowlevel.c (renamed from arch/arm/boards/pcm051/lowlevel.c)0
-rw-r--r--arch/arm/boards/phytec-phycore-imx27/Makefile (renamed from arch/arm/boards/pcm038/Makefile)0
-rw-r--r--arch/arm/boards/phytec-phycore-imx27/env/boot/nand-ubi (renamed from arch/arm/boards/pcm037/env/boot/nand-ubi)0
-rw-r--r--arch/arm/boards/phytec-phycore-imx27/env/config-board (renamed from arch/arm/boards/pcm037/env/config-board)0
-rw-r--r--arch/arm/boards/phytec-phycore-imx27/env/init/mtdparts-nand (renamed from arch/arm/boards/pcm037/env/init/mtdparts-nand)0
-rw-r--r--arch/arm/boards/phytec-phycore-imx27/env/init/mtdparts-nor (renamed from arch/arm/boards/pcm038/env/init/mtdparts-nor)0
-rw-r--r--arch/arm/boards/phytec-phycore-imx27/lowlevel.c (renamed from arch/arm/boards/pcm038/lowlevel.c)0
-rw-r--r--arch/arm/boards/phytec-phycore-imx27/pcm038.c (renamed from arch/arm/boards/pcm038/pcm038.c)0
-rw-r--r--arch/arm/boards/phytec-phycore-imx27/pcm038.dox (renamed from arch/arm/boards/pcm038/pcm038.dox)0
-rw-r--r--arch/arm/boards/phytec-phycore-imx27/pcm970.c (renamed from arch/arm/boards/pcm038/pcm970.c)0
-rw-r--r--arch/arm/boards/phytec-phycore-imx27/pll.h (renamed from arch/arm/boards/pcm038/pll.h)0
-rw-r--r--arch/arm/boards/phytec-phycore-imx31/Makefile (renamed from arch/arm/boards/pcm037/Makefile)0
-rw-r--r--arch/arm/boards/phytec-phycore-imx31/env/boot/nand-ubi (renamed from arch/arm/boards/pcm038/env/boot/nand-ubi)0
-rw-r--r--arch/arm/boards/phytec-phycore-imx31/env/config-board (renamed from arch/arm/boards/pcm038/env/config-board)0
-rw-r--r--arch/arm/boards/phytec-phycore-imx31/env/init/mtdparts-nand (renamed from arch/arm/boards/pcm038/env/init/mtdparts-nand)0
-rw-r--r--arch/arm/boards/phytec-phycore-imx31/env/init/mtdparts-nor (renamed from arch/arm/boards/pcm037/env/init/mtdparts-nor)0
-rw-r--r--arch/arm/boards/phytec-phycore-imx31/lowlevel.c (renamed from arch/arm/boards/pcm037/lowlevel.c)0
-rw-r--r--arch/arm/boards/phytec-phycore-imx31/pcm037.c (renamed from arch/arm/boards/pcm037/pcm037.c)0
-rw-r--r--arch/arm/boards/phytec-phycore-imx31/pcm037.dox (renamed from arch/arm/boards/pcm037/pcm037.dox)0
-rw-r--r--arch/arm/boards/phytec-phycore-imx35/Makefile (renamed from arch/arm/boards/pcm043/Makefile)0
-rw-r--r--arch/arm/boards/phytec-phycore-imx35/env/boot/nand-ubi (renamed from arch/arm/boards/pcm043/env/boot/nand-ubi)0
-rw-r--r--arch/arm/boards/phytec-phycore-imx35/env/config-board (renamed from arch/arm/boards/pcm043/env/config-board)0
-rw-r--r--arch/arm/boards/phytec-phycore-imx35/env/init/mtdparts-nand (renamed from arch/arm/boards/pcm043/env/init/mtdparts-nand)0
-rw-r--r--arch/arm/boards/phytec-phycore-imx35/env/init/mtdparts-nor (renamed from arch/arm/boards/pcm043/env/init/mtdparts-nor)0
-rw-r--r--arch/arm/boards/phytec-phycore-imx35/lowlevel.c (renamed from arch/arm/boards/pcm043/lowlevel.c)0
-rw-r--r--arch/arm/boards/phytec-phycore-imx35/pcm043.c (renamed from arch/arm/boards/pcm043/pcm043.c)0
-rw-r--r--arch/arm/boards/phytec-phycore-imx35/pcm043.dox (renamed from arch/arm/boards/pcm043/pcm043.dox)0
-rw-r--r--arch/arm/boards/phytec-phycore-omap4460/Makefile (renamed from arch/arm/boards/pcm049/Makefile)0
-rw-r--r--arch/arm/boards/phytec-phycore-omap4460/board.c (renamed from arch/arm/boards/pcm049/board.c)0
-rw-r--r--arch/arm/boards/phytec-phycore-omap4460/env/bin/init_board (renamed from arch/arm/boards/pcm049/env/bin/init_board)0
-rw-r--r--arch/arm/boards/phytec-phycore-omap4460/env/bin/nand_bootstrap (renamed from arch/arm/boards/pcm049/env/bin/nand_bootstrap)0
-rw-r--r--arch/arm/boards/phytec-phycore-omap4460/env/config (renamed from arch/arm/boards/pcm049/env/config)0
-rw-r--r--arch/arm/boards/phytec-phycore-omap4460/lowlevel.c (renamed from arch/arm/boards/pcm049/lowlevel.c)0
-rw-r--r--arch/arm/boards/phytec-phycore-omap4460/mux.c (renamed from arch/arm/boards/pcm049/mux.c)0
-rw-r--r--arch/arm/boards/phytec-phycore-pxa270/Makefile (renamed from arch/arm/boards/pcm027/Makefile)0
-rw-r--r--arch/arm/boards/phytec-phycore-pxa270/board.c (renamed from arch/arm/boards/pcm027/board.c)0
-rw-r--r--arch/arm/boards/phytec-phycore-pxa270/config.h (renamed from arch/arm/boards/pcm027/config.h)0
-rw-r--r--arch/arm/boards/phytec-phycore-pxa270/env/config (renamed from arch/arm/boards/pcm027/env/config)0
-rw-r--r--arch/arm/boards/phytec-phycore-pxa270/lowlevel_init.S (renamed from arch/arm/boards/pcm027/lowlevel_init.S)0
-rw-r--r--arch/arm/boards/phytec-phyflex-imx6/Makefile (renamed from arch/arm/boards/phytec-pfla02/Makefile)0
-rw-r--r--arch/arm/boards/phytec-phyflex-imx6/board.c (renamed from arch/arm/boards/phytec-pfla02/board.c)0
-rw-r--r--arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-1gib.imxcfg (renamed from arch/arm/boards/phytec-pfla02/flash-header-phytec-pfla02-1gib.imxcfg)0
-rw-r--r--arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-2gib.imxcfg (renamed from arch/arm/boards/phytec-pfla02/flash-header-phytec-pfla02-2gib.imxcfg)0
-rw-r--r--arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02.h (renamed from arch/arm/boards/phytec-pfla02/flash-header-phytec-pfla02.h)0
-rw-r--r--arch/arm/boards/phytec-phyflex-imx6/lowlevel.c (renamed from arch/arm/boards/phytec-pfla02/lowlevel.c)0
-rw-r--r--arch/arm/configs/datamodul-edm-qmx6_defconfig (renamed from arch/arm/configs/dmo-realq7_defconfig)2
-rw-r--r--arch/arm/configs/freescale-mx21-ads_defconfig (renamed from arch/arm/configs/mx21ads_defconfig)2
-rw-r--r--arch/arm/configs/freescale-mx23-evk_defconfig (renamed from arch/arm/configs/imx23evk_defconfig)0
-rw-r--r--arch/arm/configs/freescale-mx25-3ds_defconfig (renamed from arch/arm/configs/freescale_mx25_3stack_defconfig)2
-rw-r--r--arch/arm/configs/freescale-mx27-ads_defconfig (renamed from arch/arm/configs/mx27ads_defconfig)2
-rw-r--r--arch/arm/configs/freescale-mx28-evk_defconfig (renamed from arch/arm/configs/imx28evk_defconfig)0
-rw-r--r--arch/arm/configs/freescale-mx35-3ds_defconfig (renamed from arch/arm/configs/freescale_mx35_3stack_defconfig)2
-rw-r--r--arch/arm/configs/freescale-mx51-babbage_defconfig (renamed from arch/arm/configs/freescale_mx51_babbage_defconfig)2
-rw-r--r--arch/arm/configs/freescale-mx53-qsb_defconfig (renamed from arch/arm/configs/freescale_mx53_loco_defconfig)2
-rw-r--r--arch/arm/configs/freescale-mx53-smd_defconfig (renamed from arch/arm/configs/freescale_mx53_smd_defconfig)0
-rw-r--r--arch/arm/configs/phytec-phycard-imx27_defconfig (renamed from arch/arm/configs/pca100_defconfig)0
-rw-r--r--arch/arm/configs/phytec-phycard-omap3-xload_defconfig (renamed from arch/arm/configs/phycard_a_l1_xload_defconfig)0
-rw-r--r--arch/arm/configs/phytec-phycard-omap3_defconfig (renamed from arch/arm/configs/phycard_a_l1_defconfig)2
-rw-r--r--arch/arm/configs/phytec-phycard-omap4-xload_defconfig (renamed from arch/arm/configs/phycard_a_xl2_xload_defconfig)0
-rw-r--r--arch/arm/configs/phytec-phycard-omap4_defconfig (renamed from arch/arm/configs/phycard_a_xl2_defconfig)2
-rw-r--r--arch/arm/configs/phytec-phycore-am335x_defconfig (renamed from arch/arm/configs/pcm051_defconfig)2
-rw-r--r--arch/arm/configs/phytec-phycore-imx27_defconfig (renamed from arch/arm/configs/pcm038_defconfig)2
-rw-r--r--arch/arm/configs/phytec-phycore-imx31_defconfig (renamed from arch/arm/configs/pcm037_defconfig)2
-rw-r--r--arch/arm/configs/phytec-phycore-imx35_defconfig (renamed from arch/arm/configs/pcm043_defconfig)2
-rw-r--r--arch/arm/configs/phytec-phycore-omap4460-xload_defconfig (renamed from arch/arm/configs/pcm049_xload_defconfig)0
-rw-r--r--arch/arm/configs/phytec-phycore-omap4460_defconfig (renamed from arch/arm/configs/pcm049_defconfig)2
-rw-r--r--arch/arm/configs/phytec-phycore-pxa270_defconfig (renamed from arch/arm/configs/pcm027_defconfig)2
-rw-r--r--images/Makefile.imx12
143 files changed, 38 insertions, 38 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index fbc648001b..c0b725d438 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -88,7 +88,7 @@ board-$(CONFIG_MACH_GLOBALSCALE_MIRABOX) += globalscale-mirabox
board-$(CONFIG_MACH_MARVELL_ARMADA_XP_GP) += marvell-armada-xp-gp
board-$(CONFIG_MACH_MINI2440) += friendlyarm-mini2440
board-$(CONFIG_MACH_MINI6410) += friendlyarm-mini6410
-board-$(CONFIG_MACH_PCM027) += pcm027
+board-$(CONFIG_MACH_PCM027) += phytec-phycore-pxa270
board-$(CONFIG_MACH_PLATHOME_OPENBLOCKS_AX3) += plathome-openblocks-ax3/
board-$(CONFIG_MACH_SOLIDRUN_CUBOX) += solidrun-cubox
board-$(CONFIG_MACH_TINY210) += friendlyarm-tiny210
diff --git a/arch/arm/boards/Makefile b/arch/arm/boards/Makefile
index a4219d7f77..befddd0397 100644
--- a/arch/arm/boards/Makefile
+++ b/arch/arm/boards/Makefile
@@ -32,10 +32,10 @@ obj-$(CONFIG_MACH_EUKREA_CPUIMX25) += eukrea_cpuimx25/
obj-$(CONFIG_MACH_EUKREA_CPUIMX27) += eukrea_cpuimx27/
obj-$(CONFIG_MACH_EUKREA_CPUIMX35) += eukrea_cpuimx35/
obj-$(CONFIG_MACH_EUKREA_CPUIMX51SD) += eukrea_cpuimx51/
-obj-$(CONFIG_MACH_FREESCALE_MX25_3STACK) += freescale-mx25-3-stack/
-obj-$(CONFIG_MACH_FREESCALE_MX35_3STACK) += freescale-mx35-3-stack/
-obj-$(CONFIG_MACH_FREESCALE_MX51_PDK) += freescale-mx51-pdk/
-obj-$(CONFIG_MACH_FREESCALE_MX53_LOCO) += freescale-mx53-loco/
+obj-$(CONFIG_MACH_FREESCALE_MX25_3STACK) += freescale-mx25-3ds/
+obj-$(CONFIG_MACH_FREESCALE_MX35_3STACK) += freescale-mx35-3ds/
+obj-$(CONFIG_MACH_FREESCALE_MX51_PDK) += freescale-mx51-babbage/
+obj-$(CONFIG_MACH_FREESCALE_MX53_LOCO) += freescale-mx53-qsb/
obj-$(CONFIG_MACH_FREESCALE_MX53_SMD) += freescale-mx53-smd/
obj-$(CONFIG_MACH_FREESCALE_MX53_VMX53) += freescale-mx53-vmx53/
obj-$(CONFIG_MACH_GE863) += telit-evk-pro3/
@@ -43,9 +43,9 @@ obj-$(CONFIG_MACH_GK802) += gk802/
obj-$(CONFIG_MACH_GUF_CUPID) += guf-cupid/
obj-$(CONFIG_MACH_GUF_VINCELL) += guf-vincell/
obj-$(CONFIG_MACH_HIGHBANK) += highbank/
-obj-$(CONFIG_MACH_IMX21ADS) += imx21ads/
+obj-$(CONFIG_MACH_IMX21ADS) += freescale-mx21-ads/
obj-$(CONFIG_MACH_IMX233_OLINUXINO) += imx233-olinuxino/
-obj-$(CONFIG_MACH_IMX27ADS) += imx27ads/
+obj-$(CONFIG_MACH_IMX27ADS) += freescale-mx27-ads/
obj-$(CONFIG_MACH_MIOA701) += mioa701/
obj-$(CONFIG_MACH_MMCCPU) += mmccpu/
obj-$(CONFIG_MACH_MX23EVK) += freescale-mx23-evk/
@@ -57,21 +57,21 @@ obj-$(CONFIG_MACH_NXDB500) += netx/
obj-$(CONFIG_MACH_OMAP343xSDP) += omap343xdsp/
obj-$(CONFIG_MACH_OMAP3EVM) += omap3evm/
obj-$(CONFIG_MACH_PANDA) += panda/
-obj-$(CONFIG_MACH_PCA100) += phycard-i.MX27/
-obj-$(CONFIG_MACH_PCAAL1) += phycard-a-l1/
-obj-$(CONFIG_MACH_PCAAXL2) += phycard-a-xl2/
-obj-$(CONFIG_MACH_PCM037) += pcm037/
-obj-$(CONFIG_MACH_PCM038) += pcm038/
-obj-$(CONFIG_MACH_PCM043) += pcm043/
-obj-$(CONFIG_MACH_PCM049) += pcm049/
-obj-$(CONFIG_MACH_PCM051) += pcm051/
-obj-$(CONFIG_MACH_PHYTEC_PFLA02) += phytec-pfla02/
+obj-$(CONFIG_MACH_PCA100) += phytec-phycard-imx27/
+obj-$(CONFIG_MACH_PCAAL1) += phytec-phycard-omap3/
+obj-$(CONFIG_MACH_PCAAXL2) += phytec-phycard-omap4/
+obj-$(CONFIG_MACH_PCM037) += phytec-phycore-imx31/
+obj-$(CONFIG_MACH_PCM038) += phytec-phycore-imx27/
+obj-$(CONFIG_MACH_PCM043) += phytec-phycore-imx35/
+obj-$(CONFIG_MACH_PCM049) += phytec-phycore-omap4460/
+obj-$(CONFIG_MACH_PCM051) += phytec-phycore-am335x/
+obj-$(CONFIG_MACH_PHYTEC_PFLA02) += phytec-phyflex-imx6/
obj-$(CONFIG_MACH_PM9261) += pm9261/
obj-$(CONFIG_MACH_PM9263) += pm9263/
obj-$(CONFIG_MACH_PM9G45) += pm9g45/
obj-$(CONFIG_MACH_QIL_A9260) += qil-a926x/
obj-$(CONFIG_MACH_QIL_A9G20) += qil-a926x/
-obj-$(CONFIG_MACH_REALQ7) += dmo-mx6-realq7/
+obj-$(CONFIG_MACH_REALQ7) += datamodul-edm-qmx6/
obj-$(CONFIG_MACH_RPI) += raspberry-pi/
obj-$(CONFIG_MACH_SABRELITE) += freescale-mx6-sabrelite/
obj-$(CONFIG_MACH_SABRESD) += freescale-mx6-sabresd/
diff --git a/arch/arm/boards/dmo-mx6-realq7/Makefile b/arch/arm/boards/datamodul-edm-qmx6/Makefile
index bb6d9d848d..bb6d9d848d 100644
--- a/arch/arm/boards/dmo-mx6-realq7/Makefile
+++ b/arch/arm/boards/datamodul-edm-qmx6/Makefile
diff --git a/arch/arm/boards/dmo-mx6-realq7/board.c b/arch/arm/boards/datamodul-edm-qmx6/board.c
index 8a49beee2f..8a49beee2f 100644
--- a/arch/arm/boards/dmo-mx6-realq7/board.c
+++ b/arch/arm/boards/datamodul-edm-qmx6/board.c
diff --git a/arch/arm/boards/dmo-mx6-realq7/env/boot/mmc b/arch/arm/boards/datamodul-edm-qmx6/env/boot/mmc
index e311763c48..e311763c48 100644
--- a/arch/arm/boards/dmo-mx6-realq7/env/boot/mmc
+++ b/arch/arm/boards/datamodul-edm-qmx6/env/boot/mmc
diff --git a/arch/arm/boards/dmo-mx6-realq7/env/config-board b/arch/arm/boards/datamodul-edm-qmx6/env/config-board
index 4cabac63dd..4cabac63dd 100644
--- a/arch/arm/boards/dmo-mx6-realq7/env/config-board
+++ b/arch/arm/boards/datamodul-edm-qmx6/env/config-board
diff --git a/arch/arm/boards/dmo-mx6-realq7/env/init/automount b/arch/arm/boards/datamodul-edm-qmx6/env/init/automount
index 2ce37c785a..2ce37c785a 100644
--- a/arch/arm/boards/dmo-mx6-realq7/env/init/automount
+++ b/arch/arm/boards/datamodul-edm-qmx6/env/init/automount
diff --git a/arch/arm/boards/dmo-mx6-realq7/flash-header.imxcfg b/arch/arm/boards/datamodul-edm-qmx6/flash-header.imxcfg
index 400a870154..400a870154 100644
--- a/arch/arm/boards/dmo-mx6-realq7/flash-header.imxcfg
+++ b/arch/arm/boards/datamodul-edm-qmx6/flash-header.imxcfg
diff --git a/arch/arm/boards/dmo-mx6-realq7/lowlevel.c b/arch/arm/boards/datamodul-edm-qmx6/lowlevel.c
index de7cc98efe..de7cc98efe 100644
--- a/arch/arm/boards/dmo-mx6-realq7/lowlevel.c
+++ b/arch/arm/boards/datamodul-edm-qmx6/lowlevel.c
diff --git a/arch/arm/boards/imx21ads/Makefile b/arch/arm/boards/freescale-mx21-ads/Makefile
index a43425b9ea..a43425b9ea 100644
--- a/arch/arm/boards/imx21ads/Makefile
+++ b/arch/arm/boards/freescale-mx21-ads/Makefile
diff --git a/arch/arm/boards/imx21ads/env/bin/init b/arch/arm/boards/freescale-mx21-ads/env/bin/init
index 224a6b40be..224a6b40be 100644
--- a/arch/arm/boards/imx21ads/env/bin/init
+++ b/arch/arm/boards/freescale-mx21-ads/env/bin/init
diff --git a/arch/arm/boards/imx21ads/imx21ads.c b/arch/arm/boards/freescale-mx21-ads/imx21ads.c
index 1bbd8cbf2a..1bbd8cbf2a 100644
--- a/arch/arm/boards/imx21ads/imx21ads.c
+++ b/arch/arm/boards/freescale-mx21-ads/imx21ads.c
diff --git a/arch/arm/boards/imx21ads/imx21ads.dox b/arch/arm/boards/freescale-mx21-ads/imx21ads.dox
index 9f11ffaa6e..9f11ffaa6e 100644
--- a/arch/arm/boards/imx21ads/imx21ads.dox
+++ b/arch/arm/boards/freescale-mx21-ads/imx21ads.dox
diff --git a/arch/arm/boards/imx21ads/lowlevel_init.S b/arch/arm/boards/freescale-mx21-ads/lowlevel_init.S
index 471390f328..471390f328 100644
--- a/arch/arm/boards/imx21ads/lowlevel_init.S
+++ b/arch/arm/boards/freescale-mx21-ads/lowlevel_init.S
diff --git a/arch/arm/boards/freescale-mx25-3-stack/3stack.c b/arch/arm/boards/freescale-mx25-3ds/3stack.c
index bd0e839b7a..bd0e839b7a 100644
--- a/arch/arm/boards/freescale-mx25-3-stack/3stack.c
+++ b/arch/arm/boards/freescale-mx25-3ds/3stack.c
diff --git a/arch/arm/boards/freescale-mx25-3-stack/Makefile b/arch/arm/boards/freescale-mx25-3ds/Makefile
index 52c416e3a5..52c416e3a5 100644
--- a/arch/arm/boards/freescale-mx25-3-stack/Makefile
+++ b/arch/arm/boards/freescale-mx25-3ds/Makefile
diff --git a/arch/arm/boards/freescale-mx25-3-stack/env/bin/_update b/arch/arm/boards/freescale-mx25-3ds/env/bin/_update
index 014bce3512..014bce3512 100644
--- a/arch/arm/boards/freescale-mx25-3-stack/env/bin/_update
+++ b/arch/arm/boards/freescale-mx25-3ds/env/bin/_update
diff --git a/arch/arm/boards/freescale-mx25-3-stack/env/bin/boot b/arch/arm/boards/freescale-mx25-3ds/env/bin/boot
index 7bbff2d1f6..7bbff2d1f6 100644
--- a/arch/arm/boards/freescale-mx25-3-stack/env/bin/boot
+++ b/arch/arm/boards/freescale-mx25-3ds/env/bin/boot
diff --git a/arch/arm/boards/freescale-mx25-3-stack/env/bin/hush_hack b/arch/arm/boards/freescale-mx25-3ds/env/bin/hush_hack
index 5fffa92ecd..5fffa92ecd 100644
--- a/arch/arm/boards/freescale-mx25-3-stack/env/bin/hush_hack
+++ b/arch/arm/boards/freescale-mx25-3ds/env/bin/hush_hack
diff --git a/arch/arm/boards/freescale-mx25-3-stack/env/bin/init b/arch/arm/boards/freescale-mx25-3ds/env/bin/init
index 0600b9e661..0600b9e661 100644
--- a/arch/arm/boards/freescale-mx25-3-stack/env/bin/init
+++ b/arch/arm/boards/freescale-mx25-3ds/env/bin/init
diff --git a/arch/arm/boards/freescale-mx25-3-stack/env/bin/update_kernel b/arch/arm/boards/freescale-mx25-3ds/env/bin/update_kernel
index 05c822d860..05c822d860 100644
--- a/arch/arm/boards/freescale-mx25-3-stack/env/bin/update_kernel
+++ b/arch/arm/boards/freescale-mx25-3ds/env/bin/update_kernel
diff --git a/arch/arm/boards/freescale-mx25-3-stack/env/bin/update_root b/arch/arm/boards/freescale-mx25-3ds/env/bin/update_root
index eaf36ebcea..eaf36ebcea 100644
--- a/arch/arm/boards/freescale-mx25-3-stack/env/bin/update_root
+++ b/arch/arm/boards/freescale-mx25-3ds/env/bin/update_root
diff --git a/arch/arm/boards/freescale-mx25-3-stack/env/config b/arch/arm/boards/freescale-mx25-3ds/env/config
index a5e492e339..a5e492e339 100644
--- a/arch/arm/boards/freescale-mx25-3-stack/env/config
+++ b/arch/arm/boards/freescale-mx25-3ds/env/config
diff --git a/arch/arm/boards/freescale-mx25-3-stack/lowlevel_init.S b/arch/arm/boards/freescale-mx25-3ds/lowlevel_init.S
index 4ca4c82d32..4ca4c82d32 100644
--- a/arch/arm/boards/freescale-mx25-3-stack/lowlevel_init.S
+++ b/arch/arm/boards/freescale-mx25-3ds/lowlevel_init.S
diff --git a/arch/arm/boards/imx27ads/Makefile b/arch/arm/boards/freescale-mx27-ads/Makefile
index 398db9b6b9..398db9b6b9 100644
--- a/arch/arm/boards/imx27ads/Makefile
+++ b/arch/arm/boards/freescale-mx27-ads/Makefile
diff --git a/arch/arm/boards/imx27ads/env/bin/_update b/arch/arm/boards/freescale-mx27-ads/env/bin/_update
index 014bce3512..014bce3512 100644
--- a/arch/arm/boards/imx27ads/env/bin/_update
+++ b/arch/arm/boards/freescale-mx27-ads/env/bin/_update
diff --git a/arch/arm/boards/imx27ads/env/bin/boot b/arch/arm/boards/freescale-mx27-ads/env/bin/boot
index 3859dc113b..3859dc113b 100644
--- a/arch/arm/boards/imx27ads/env/bin/boot
+++ b/arch/arm/boards/freescale-mx27-ads/env/bin/boot
diff --git a/arch/arm/boards/imx27ads/env/bin/init b/arch/arm/boards/freescale-mx27-ads/env/bin/init
index 48e2139f7d..48e2139f7d 100644
--- a/arch/arm/boards/imx27ads/env/bin/init
+++ b/arch/arm/boards/freescale-mx27-ads/env/bin/init
diff --git a/arch/arm/boards/imx27ads/env/bin/update_kernel b/arch/arm/boards/freescale-mx27-ads/env/bin/update_kernel
index 1ad95fc5d6..1ad95fc5d6 100644
--- a/arch/arm/boards/imx27ads/env/bin/update_kernel
+++ b/arch/arm/boards/freescale-mx27-ads/env/bin/update_kernel
diff --git a/arch/arm/boards/imx27ads/env/bin/update_root b/arch/arm/boards/freescale-mx27-ads/env/bin/update_root
index b757a5b922..b757a5b922 100644
--- a/arch/arm/boards/imx27ads/env/bin/update_root
+++ b/arch/arm/boards/freescale-mx27-ads/env/bin/update_root
diff --git a/arch/arm/boards/imx27ads/env/config b/arch/arm/boards/freescale-mx27-ads/env/config
index f18a86b7c1..f18a86b7c1 100644
--- a/arch/arm/boards/imx27ads/env/config
+++ b/arch/arm/boards/freescale-mx27-ads/env/config
diff --git a/arch/arm/boards/imx27ads/imx27ads.c b/arch/arm/boards/freescale-mx27-ads/imx27ads.c
index 9fb1760602..9fb1760602 100644
--- a/arch/arm/boards/imx27ads/imx27ads.c
+++ b/arch/arm/boards/freescale-mx27-ads/imx27ads.c
diff --git a/arch/arm/boards/imx27ads/imx27ads.dox b/arch/arm/boards/freescale-mx27-ads/imx27ads.dox
index e14d8e3fab..e14d8e3fab 100644
--- a/arch/arm/boards/imx27ads/imx27ads.dox
+++ b/arch/arm/boards/freescale-mx27-ads/imx27ads.dox
diff --git a/arch/arm/boards/imx27ads/lowlevel_init.S b/arch/arm/boards/freescale-mx27-ads/lowlevel_init.S
index 45f39921ec..45f39921ec 100644
--- a/arch/arm/boards/imx27ads/lowlevel_init.S
+++ b/arch/arm/boards/freescale-mx27-ads/lowlevel_init.S
diff --git a/arch/arm/boards/freescale-mx35-3-stack/3stack.c b/arch/arm/boards/freescale-mx35-3ds/3stack.c
index dbd1c7adcb..dbd1c7adcb 100644
--- a/arch/arm/boards/freescale-mx35-3-stack/3stack.c
+++ b/arch/arm/boards/freescale-mx35-3ds/3stack.c
diff --git a/arch/arm/boards/freescale-mx35-3-stack/3stack.dox b/arch/arm/boards/freescale-mx35-3ds/3stack.dox
index 15c5b6e1ff..15c5b6e1ff 100644
--- a/arch/arm/boards/freescale-mx35-3-stack/3stack.dox
+++ b/arch/arm/boards/freescale-mx35-3ds/3stack.dox
diff --git a/arch/arm/boards/freescale-mx35-3-stack/Makefile b/arch/arm/boards/freescale-mx35-3ds/Makefile
index a1110c2e0b..a1110c2e0b 100644
--- a/arch/arm/boards/freescale-mx35-3-stack/Makefile
+++ b/arch/arm/boards/freescale-mx35-3ds/Makefile
diff --git a/arch/arm/boards/freescale-mx35-3-stack/board-mx35_3stack.h b/arch/arm/boards/freescale-mx35-3ds/board-mx35_3stack.h
index 3bcb470b74..3bcb470b74 100644
--- a/arch/arm/boards/freescale-mx35-3-stack/board-mx35_3stack.h
+++ b/arch/arm/boards/freescale-mx35-3ds/board-mx35_3stack.h
diff --git a/arch/arm/boards/freescale-mx35-3-stack/env/config b/arch/arm/boards/freescale-mx35-3ds/env/config
index af2fb6b2bc..af2fb6b2bc 100644
--- a/arch/arm/boards/freescale-mx35-3-stack/env/config
+++ b/arch/arm/boards/freescale-mx35-3ds/env/config
diff --git a/arch/arm/boards/freescale-mx35-3-stack/flash_header.c b/arch/arm/boards/freescale-mx35-3ds/flash_header.c
index 076b816491..076b816491 100644
--- a/arch/arm/boards/freescale-mx35-3-stack/flash_header.c
+++ b/arch/arm/boards/freescale-mx35-3ds/flash_header.c
diff --git a/arch/arm/boards/freescale-mx35-3-stack/lowlevel_init.S b/arch/arm/boards/freescale-mx35-3ds/lowlevel_init.S
index 6d37f35a2e..6d37f35a2e 100644
--- a/arch/arm/boards/freescale-mx35-3-stack/lowlevel_init.S
+++ b/arch/arm/boards/freescale-mx35-3ds/lowlevel_init.S
diff --git a/arch/arm/boards/freescale-mx51-pdk/Makefile b/arch/arm/boards/freescale-mx51-babbage/Makefile
index 6252c88631..6252c88631 100644
--- a/arch/arm/boards/freescale-mx51-pdk/Makefile
+++ b/arch/arm/boards/freescale-mx51-babbage/Makefile
diff --git a/arch/arm/boards/freescale-mx51-pdk/board.c b/arch/arm/boards/freescale-mx51-babbage/board.c
index bfe5338bcd..bfe5338bcd 100644
--- a/arch/arm/boards/freescale-mx51-pdk/board.c
+++ b/arch/arm/boards/freescale-mx51-babbage/board.c
diff --git a/arch/arm/boards/freescale-mx51-pdk/env/config-board b/arch/arm/boards/freescale-mx51-babbage/env/config-board
index cfc483eb3d..cfc483eb3d 100644
--- a/arch/arm/boards/freescale-mx51-pdk/env/config-board
+++ b/arch/arm/boards/freescale-mx51-babbage/env/config-board
diff --git a/arch/arm/boards/freescale-mx51-pdk/flash-header-imx51-babbage.imxcfg b/arch/arm/boards/freescale-mx51-babbage/flash-header-imx51-babbage.imxcfg
index bac6816fee..bac6816fee 100644
--- a/arch/arm/boards/freescale-mx51-pdk/flash-header-imx51-babbage.imxcfg
+++ b/arch/arm/boards/freescale-mx51-babbage/flash-header-imx51-babbage.imxcfg
diff --git a/arch/arm/boards/freescale-mx51-pdk/lowlevel.c b/arch/arm/boards/freescale-mx51-babbage/lowlevel.c
index f60601194d..f60601194d 100644
--- a/arch/arm/boards/freescale-mx51-pdk/lowlevel.c
+++ b/arch/arm/boards/freescale-mx51-babbage/lowlevel.c
diff --git a/arch/arm/boards/freescale-mx51-pdk/mx51-pdk.dox b/arch/arm/boards/freescale-mx51-babbage/mx51-pdk.dox
index d9ea823e5c..d9ea823e5c 100644
--- a/arch/arm/boards/freescale-mx51-pdk/mx51-pdk.dox
+++ b/arch/arm/boards/freescale-mx51-babbage/mx51-pdk.dox
diff --git a/arch/arm/boards/freescale-mx53-loco/Makefile b/arch/arm/boards/freescale-mx53-qsb/Makefile
index bcaa974f35..bcaa974f35 100644
--- a/arch/arm/boards/freescale-mx53-loco/Makefile
+++ b/arch/arm/boards/freescale-mx53-qsb/Makefile
diff --git a/arch/arm/boards/freescale-mx53-loco/board.c b/arch/arm/boards/freescale-mx53-qsb/board.c
index 69036dafcf..69036dafcf 100644
--- a/arch/arm/boards/freescale-mx53-loco/board.c
+++ b/arch/arm/boards/freescale-mx53-qsb/board.c
diff --git a/arch/arm/boards/freescale-mx53-loco/env/config-board b/arch/arm/boards/freescale-mx53-qsb/env/config-board
index a6cf69ddbc..a6cf69ddbc 100644
--- a/arch/arm/boards/freescale-mx53-loco/env/config-board
+++ b/arch/arm/boards/freescale-mx53-qsb/env/config-board
diff --git a/arch/arm/boards/freescale-mx53-loco/flash-header-imx53-loco.imxcfg b/arch/arm/boards/freescale-mx53-qsb/flash-header-imx53-loco.imxcfg
index 95bcd19805..95bcd19805 100644
--- a/arch/arm/boards/freescale-mx53-loco/flash-header-imx53-loco.imxcfg
+++ b/arch/arm/boards/freescale-mx53-qsb/flash-header-imx53-loco.imxcfg
diff --git a/arch/arm/boards/freescale-mx53-loco/lowlevel.c b/arch/arm/boards/freescale-mx53-qsb/lowlevel.c
index c9e057ae67..c9e057ae67 100644
--- a/arch/arm/boards/freescale-mx53-loco/lowlevel.c
+++ b/arch/arm/boards/freescale-mx53-qsb/lowlevel.c
diff --git a/arch/arm/boards/freescale-mx53-loco/mx53-pdk.dox b/arch/arm/boards/freescale-mx53-qsb/mx53-pdk.dox
index 3a2c84fc3f..3a2c84fc3f 100644
--- a/arch/arm/boards/freescale-mx53-loco/mx53-pdk.dox
+++ b/arch/arm/boards/freescale-mx53-qsb/mx53-pdk.dox
diff --git a/arch/arm/boards/phycard-i.MX27/Makefile b/arch/arm/boards/phytec-phycard-imx27/Makefile
index 34492bb127..34492bb127 100644
--- a/arch/arm/boards/phycard-i.MX27/Makefile
+++ b/arch/arm/boards/phytec-phycard-imx27/Makefile
diff --git a/arch/arm/boards/phycard-i.MX27/lowlevel.c b/arch/arm/boards/phytec-phycard-imx27/lowlevel.c
index 5b3bdafa71..5b3bdafa71 100644
--- a/arch/arm/boards/phycard-i.MX27/lowlevel.c
+++ b/arch/arm/boards/phytec-phycard-imx27/lowlevel.c
diff --git a/arch/arm/boards/phycard-i.MX27/pca100.c b/arch/arm/boards/phytec-phycard-imx27/pca100.c
index 4b355bcc6a..4b355bcc6a 100644
--- a/arch/arm/boards/phycard-i.MX27/pca100.c
+++ b/arch/arm/boards/phytec-phycard-imx27/pca100.c
diff --git a/arch/arm/boards/phycard-i.MX27/pca100.dox b/arch/arm/boards/phytec-phycard-imx27/pca100.dox
index 9b17674a21..9b17674a21 100644
--- a/arch/arm/boards/phycard-i.MX27/pca100.dox
+++ b/arch/arm/boards/phytec-phycard-imx27/pca100.dox
diff --git a/arch/arm/boards/phycard-a-l1/Makefile b/arch/arm/boards/phytec-phycard-omap3/Makefile
index a71feec396..a71feec396 100644
--- a/arch/arm/boards/phycard-a-l1/Makefile
+++ b/arch/arm/boards/phytec-phycard-omap3/Makefile
diff --git a/arch/arm/boards/phycard-a-l1/env/config b/arch/arm/boards/phytec-phycard-omap3/env/config
index a3f452b3d1..a3f452b3d1 100644
--- a/arch/arm/boards/phycard-a-l1/env/config
+++ b/arch/arm/boards/phytec-phycard-omap3/env/config
diff --git a/arch/arm/boards/phycard-a-l1/lowlevel.c b/arch/arm/boards/phytec-phycard-omap3/lowlevel.c
index 7a67493fd6..7a67493fd6 100644
--- a/arch/arm/boards/phycard-a-l1/lowlevel.c
+++ b/arch/arm/boards/phytec-phycard-omap3/lowlevel.c
diff --git a/arch/arm/boards/phycard-a-l1/pca-a-l1.c b/arch/arm/boards/phytec-phycard-omap3/pca-a-l1.c
index 68a17bf0c3..68a17bf0c3 100644
--- a/arch/arm/boards/phycard-a-l1/pca-a-l1.c
+++ b/arch/arm/boards/phytec-phycard-omap3/pca-a-l1.c
diff --git a/arch/arm/boards/phycard-a-l1/pca-a-l1.dox b/arch/arm/boards/phytec-phycard-omap3/pca-a-l1.dox
index d93c57499b..d93c57499b 100644
--- a/arch/arm/boards/phycard-a-l1/pca-a-l1.dox
+++ b/arch/arm/boards/phytec-phycard-omap3/pca-a-l1.dox
diff --git a/arch/arm/boards/phycard-a-l1/pca-a-l1.h b/arch/arm/boards/phytec-phycard-omap3/pca-a-l1.h
index f6f8996697..f6f8996697 100644
--- a/arch/arm/boards/phycard-a-l1/pca-a-l1.h
+++ b/arch/arm/boards/phytec-phycard-omap3/pca-a-l1.h
diff --git a/arch/arm/boards/phycard-a-xl2/Makefile b/arch/arm/boards/phytec-phycard-omap4/Makefile
index 64782e0fc2..64782e0fc2 100644
--- a/arch/arm/boards/phycard-a-xl2/Makefile
+++ b/arch/arm/boards/phytec-phycard-omap4/Makefile
diff --git a/arch/arm/boards/phycard-a-xl2/env/bin/nand_bootstrap b/arch/arm/boards/phytec-phycard-omap4/env/bin/nand_bootstrap
index f8873fabe2..f8873fabe2 100644
--- a/arch/arm/boards/phycard-a-xl2/env/bin/nand_bootstrap
+++ b/arch/arm/boards/phytec-phycard-omap4/env/bin/nand_bootstrap
diff --git a/arch/arm/boards/phycard-a-xl2/env/config b/arch/arm/boards/phytec-phycard-omap4/env/config
index 998f9fa0f2..998f9fa0f2 100644
--- a/arch/arm/boards/phycard-a-xl2/env/config
+++ b/arch/arm/boards/phytec-phycard-omap4/env/config
diff --git a/arch/arm/boards/phycard-a-xl2/lowlevel.c b/arch/arm/boards/phytec-phycard-omap4/lowlevel.c
index 1ddf8a07ed..1ddf8a07ed 100644
--- a/arch/arm/boards/phycard-a-xl2/lowlevel.c
+++ b/arch/arm/boards/phytec-phycard-omap4/lowlevel.c
diff --git a/arch/arm/boards/phycard-a-xl2/mux.c b/arch/arm/boards/phytec-phycard-omap4/mux.c
index a31d995767..a31d995767 100644
--- a/arch/arm/boards/phycard-a-xl2/mux.c
+++ b/arch/arm/boards/phytec-phycard-omap4/mux.c
diff --git a/arch/arm/boards/phycard-a-xl2/pca-a-xl2.c b/arch/arm/boards/phytec-phycard-omap4/pca-a-xl2.c
index 64297224c0..64297224c0 100644
--- a/arch/arm/boards/phycard-a-xl2/pca-a-xl2.c
+++ b/arch/arm/boards/phytec-phycard-omap4/pca-a-xl2.c
diff --git a/arch/arm/boards/pcm051/Makefile b/arch/arm/boards/phytec-phycore-am335x/Makefile
index 092c31d6b2..092c31d6b2 100644
--- a/arch/arm/boards/pcm051/Makefile
+++ b/arch/arm/boards/phytec-phycore-am335x/Makefile
diff --git a/arch/arm/boards/pcm051/board.c b/arch/arm/boards/phytec-phycore-am335x/board.c
index 59de42bee2..59de42bee2 100644
--- a/arch/arm/boards/pcm051/board.c
+++ b/arch/arm/boards/phytec-phycore-am335x/board.c
diff --git a/arch/arm/boards/pcm051/env/boot/mmc b/arch/arm/boards/phytec-phycore-am335x/env/boot/mmc
index 93a2357448..93a2357448 100644
--- a/arch/arm/boards/pcm051/env/boot/mmc
+++ b/arch/arm/boards/phytec-phycore-am335x/env/boot/mmc
diff --git a/arch/arm/boards/pcm051/env/boot/nand b/arch/arm/boards/phytec-phycore-am335x/env/boot/nand
index 22d657ed9d..22d657ed9d 100644
--- a/arch/arm/boards/pcm051/env/boot/nand
+++ b/arch/arm/boards/phytec-phycore-am335x/env/boot/nand
diff --git a/arch/arm/boards/pcm051/env/boot/spi b/arch/arm/boards/phytec-phycore-am335x/env/boot/spi
index 2d10184236..2d10184236 100644
--- a/arch/arm/boards/pcm051/env/boot/spi
+++ b/arch/arm/boards/phytec-phycore-am335x/env/boot/spi
diff --git a/arch/arm/boards/pcm051/env/config-board b/arch/arm/boards/phytec-phycore-am335x/env/config-board
index 7f0b2b797d..7f0b2b797d 100644
--- a/arch/arm/boards/pcm051/env/config-board
+++ b/arch/arm/boards/phytec-phycore-am335x/env/config-board
diff --git a/arch/arm/boards/pcm051/lowlevel.c b/arch/arm/boards/phytec-phycore-am335x/lowlevel.c
index d3cac6860b..d3cac6860b 100644
--- a/arch/arm/boards/pcm051/lowlevel.c
+++ b/arch/arm/boards/phytec-phycore-am335x/lowlevel.c
diff --git a/arch/arm/boards/pcm038/Makefile b/arch/arm/boards/phytec-phycore-imx27/Makefile
index bfb55d398e..bfb55d398e 100644
--- a/arch/arm/boards/pcm038/Makefile
+++ b/arch/arm/boards/phytec-phycore-imx27/Makefile
diff --git a/arch/arm/boards/pcm037/env/boot/nand-ubi b/arch/arm/boards/phytec-phycore-imx27/env/boot/nand-ubi
index 67b0cb4afe..67b0cb4afe 100644
--- a/arch/arm/boards/pcm037/env/boot/nand-ubi
+++ b/arch/arm/boards/phytec-phycore-imx27/env/boot/nand-ubi
diff --git a/arch/arm/boards/pcm037/env/config-board b/arch/arm/boards/phytec-phycore-imx27/env/config-board
index e8e8378f53..e8e8378f53 100644
--- a/arch/arm/boards/pcm037/env/config-board
+++ b/arch/arm/boards/phytec-phycore-imx27/env/config-board
diff --git a/arch/arm/boards/pcm037/env/init/mtdparts-nand b/arch/arm/boards/phytec-phycore-imx27/env/init/mtdparts-nand
index 84220b77b3..84220b77b3 100644
--- a/arch/arm/boards/pcm037/env/init/mtdparts-nand
+++ b/arch/arm/boards/phytec-phycore-imx27/env/init/mtdparts-nand
diff --git a/arch/arm/boards/pcm038/env/init/mtdparts-nor b/arch/arm/boards/phytec-phycore-imx27/env/init/mtdparts-nor
index c2c40655f3..c2c40655f3 100644
--- a/arch/arm/boards/pcm038/env/init/mtdparts-nor
+++ b/arch/arm/boards/phytec-phycore-imx27/env/init/mtdparts-nor
diff --git a/arch/arm/boards/pcm038/lowlevel.c b/arch/arm/boards/phytec-phycore-imx27/lowlevel.c
index 4f55af8264..4f55af8264 100644
--- a/arch/arm/boards/pcm038/lowlevel.c
+++ b/arch/arm/boards/phytec-phycore-imx27/lowlevel.c
diff --git a/arch/arm/boards/pcm038/pcm038.c b/arch/arm/boards/phytec-phycore-imx27/pcm038.c
index 1733261f7d..1733261f7d 100644
--- a/arch/arm/boards/pcm038/pcm038.c
+++ b/arch/arm/boards/phytec-phycore-imx27/pcm038.c
diff --git a/arch/arm/boards/pcm038/pcm038.dox b/arch/arm/boards/phytec-phycore-imx27/pcm038.dox
index 85177d2eb1..85177d2eb1 100644
--- a/arch/arm/boards/pcm038/pcm038.dox
+++ b/arch/arm/boards/phytec-phycore-imx27/pcm038.dox
diff --git a/arch/arm/boards/pcm038/pcm970.c b/arch/arm/boards/phytec-phycore-imx27/pcm970.c
index 2b2483b0a6..2b2483b0a6 100644
--- a/arch/arm/boards/pcm038/pcm970.c
+++ b/arch/arm/boards/phytec-phycore-imx27/pcm970.c
diff --git a/arch/arm/boards/pcm038/pll.h b/arch/arm/boards/phytec-phycore-imx27/pll.h
index 8bdb76d111..8bdb76d111 100644
--- a/arch/arm/boards/pcm038/pll.h
+++ b/arch/arm/boards/phytec-phycore-imx27/pll.h
diff --git a/arch/arm/boards/pcm037/Makefile b/arch/arm/boards/phytec-phycore-imx31/Makefile
index 6c9ca6942f..6c9ca6942f 100644
--- a/arch/arm/boards/pcm037/Makefile
+++ b/arch/arm/boards/phytec-phycore-imx31/Makefile
diff --git a/arch/arm/boards/pcm038/env/boot/nand-ubi b/arch/arm/boards/phytec-phycore-imx31/env/boot/nand-ubi
index 67b0cb4afe..67b0cb4afe 100644
--- a/arch/arm/boards/pcm038/env/boot/nand-ubi
+++ b/arch/arm/boards/phytec-phycore-imx31/env/boot/nand-ubi
diff --git a/arch/arm/boards/pcm038/env/config-board b/arch/arm/boards/phytec-phycore-imx31/env/config-board
index e8e8378f53..e8e8378f53 100644
--- a/arch/arm/boards/pcm038/env/config-board
+++ b/arch/arm/boards/phytec-phycore-imx31/env/config-board
diff --git a/arch/arm/boards/pcm038/env/init/mtdparts-nand b/arch/arm/boards/phytec-phycore-imx31/env/init/mtdparts-nand
index 84220b77b3..84220b77b3 100644
--- a/arch/arm/boards/pcm038/env/init/mtdparts-nand
+++ b/arch/arm/boards/phytec-phycore-imx31/env/init/mtdparts-nand
diff --git a/arch/arm/boards/pcm037/env/init/mtdparts-nor b/arch/arm/boards/phytec-phycore-imx31/env/init/mtdparts-nor
index 2ef6ead71a..2ef6ead71a 100644
--- a/arch/arm/boards/pcm037/env/init/mtdparts-nor
+++ b/arch/arm/boards/phytec-phycore-imx31/env/init/mtdparts-nor
diff --git a/arch/arm/boards/pcm037/lowlevel.c b/arch/arm/boards/phytec-phycore-imx31/lowlevel.c
index cd894c25ce..cd894c25ce 100644
--- a/arch/arm/boards/pcm037/lowlevel.c
+++ b/arch/arm/boards/phytec-phycore-imx31/lowlevel.c
diff --git a/arch/arm/boards/pcm037/pcm037.c b/arch/arm/boards/phytec-phycore-imx31/pcm037.c
index a1ffb2e73e..a1ffb2e73e 100644
--- a/arch/arm/boards/pcm037/pcm037.c
+++ b/arch/arm/boards/phytec-phycore-imx31/pcm037.c
diff --git a/arch/arm/boards/pcm037/pcm037.dox b/arch/arm/boards/phytec-phycore-imx31/pcm037.dox
index b2afdd6acd..b2afdd6acd 100644
--- a/arch/arm/boards/pcm037/pcm037.dox
+++ b/arch/arm/boards/phytec-phycore-imx31/pcm037.dox
diff --git a/arch/arm/boards/pcm043/Makefile b/arch/arm/boards/phytec-phycore-imx35/Makefile
index 72275ead78..72275ead78 100644
--- a/arch/arm/boards/pcm043/Makefile
+++ b/arch/arm/boards/phytec-phycore-imx35/Makefile
diff --git a/arch/arm/boards/pcm043/env/boot/nand-ubi b/arch/arm/boards/phytec-phycore-imx35/env/boot/nand-ubi
index 67b0cb4afe..67b0cb4afe 100644
--- a/arch/arm/boards/pcm043/env/boot/nand-ubi
+++ b/arch/arm/boards/phytec-phycore-imx35/env/boot/nand-ubi
diff --git a/arch/arm/boards/pcm043/env/config-board b/arch/arm/boards/phytec-phycore-imx35/env/config-board
index e8e8378f53..e8e8378f53 100644
--- a/arch/arm/boards/pcm043/env/config-board
+++ b/arch/arm/boards/phytec-phycore-imx35/env/config-board
diff --git a/arch/arm/boards/pcm043/env/init/mtdparts-nand b/arch/arm/boards/phytec-phycore-imx35/env/init/mtdparts-nand
index 8a41f62810..8a41f62810 100644
--- a/arch/arm/boards/pcm043/env/init/mtdparts-nand
+++ b/arch/arm/boards/phytec-phycore-imx35/env/init/mtdparts-nand
diff --git a/arch/arm/boards/pcm043/env/init/mtdparts-nor b/arch/arm/boards/phytec-phycore-imx35/env/init/mtdparts-nor
index f787f28442..f787f28442 100644
--- a/arch/arm/boards/pcm043/env/init/mtdparts-nor
+++ b/arch/arm/boards/phytec-phycore-imx35/env/init/mtdparts-nor
diff --git a/arch/arm/boards/pcm043/lowlevel.c b/arch/arm/boards/phytec-phycore-imx35/lowlevel.c
index 8376bb4f00..8376bb4f00 100644
--- a/arch/arm/boards/pcm043/lowlevel.c
+++ b/arch/arm/boards/phytec-phycore-imx35/lowlevel.c
diff --git a/arch/arm/boards/pcm043/pcm043.c b/arch/arm/boards/phytec-phycore-imx35/pcm043.c
index 46821a784a..46821a784a 100644
--- a/arch/arm/boards/pcm043/pcm043.c
+++ b/arch/arm/boards/phytec-phycore-imx35/pcm043.c
diff --git a/arch/arm/boards/pcm043/pcm043.dox b/arch/arm/boards/phytec-phycore-imx35/pcm043.dox
index c6715fffcf..c6715fffcf 100644
--- a/arch/arm/boards/pcm043/pcm043.dox
+++ b/arch/arm/boards/phytec-phycore-imx35/pcm043.dox
diff --git a/arch/arm/boards/pcm049/Makefile b/arch/arm/boards/phytec-phycore-omap4460/Makefile
index 5d4eb10b9b..5d4eb10b9b 100644
--- a/arch/arm/boards/pcm049/Makefile
+++ b/arch/arm/boards/phytec-phycore-omap4460/Makefile
diff --git a/arch/arm/boards/pcm049/board.c b/arch/arm/boards/phytec-phycore-omap4460/board.c
index baf88a380c..baf88a380c 100644
--- a/arch/arm/boards/pcm049/board.c
+++ b/arch/arm/boards/phytec-phycore-omap4460/board.c
diff --git a/arch/arm/boards/pcm049/env/bin/init_board b/arch/arm/boards/phytec-phycore-omap4460/env/bin/init_board
index d5142ee8d0..d5142ee8d0 100644
--- a/arch/arm/boards/pcm049/env/bin/init_board
+++ b/arch/arm/boards/phytec-phycore-omap4460/env/bin/init_board
diff --git a/arch/arm/boards/pcm049/env/bin/nand_bootstrap b/arch/arm/boards/phytec-phycore-omap4460/env/bin/nand_bootstrap
index 49e38dc4f0..49e38dc4f0 100644
--- a/arch/arm/boards/pcm049/env/bin/nand_bootstrap
+++ b/arch/arm/boards/phytec-phycore-omap4460/env/bin/nand_bootstrap
diff --git a/arch/arm/boards/pcm049/env/config b/arch/arm/boards/phytec-phycore-omap4460/env/config
index 1a252dd9c5..1a252dd9c5 100644
--- a/arch/arm/boards/pcm049/env/config
+++ b/arch/arm/boards/phytec-phycore-omap4460/env/config
diff --git a/arch/arm/boards/pcm049/lowlevel.c b/arch/arm/boards/phytec-phycore-omap4460/lowlevel.c
index 4f39600436..4f39600436 100644
--- a/arch/arm/boards/pcm049/lowlevel.c
+++ b/arch/arm/boards/phytec-phycore-omap4460/lowlevel.c
diff --git a/arch/arm/boards/pcm049/mux.c b/arch/arm/boards/phytec-phycore-omap4460/mux.c
index fda4c519b8..fda4c519b8 100644
--- a/arch/arm/boards/pcm049/mux.c
+++ b/arch/arm/boards/phytec-phycore-omap4460/mux.c
diff --git a/arch/arm/boards/pcm027/Makefile b/arch/arm/boards/phytec-phycore-pxa270/Makefile
index 040cf93944..040cf93944 100644
--- a/arch/arm/boards/pcm027/Makefile
+++ b/arch/arm/boards/phytec-phycore-pxa270/Makefile
diff --git a/arch/arm/boards/pcm027/board.c b/arch/arm/boards/phytec-phycore-pxa270/board.c
index 509569e81e..509569e81e 100644
--- a/arch/arm/boards/pcm027/board.c
+++ b/arch/arm/boards/phytec-phycore-pxa270/board.c
diff --git a/arch/arm/boards/pcm027/config.h b/arch/arm/boards/phytec-phycore-pxa270/config.h
index ca02b1140b..ca02b1140b 100644
--- a/arch/arm/boards/pcm027/config.h
+++ b/arch/arm/boards/phytec-phycore-pxa270/config.h
diff --git a/arch/arm/boards/pcm027/env/config b/arch/arm/boards/phytec-phycore-pxa270/env/config
index d42780090b..d42780090b 100644
--- a/arch/arm/boards/pcm027/env/config
+++ b/arch/arm/boards/phytec-phycore-pxa270/env/config
diff --git a/arch/arm/boards/pcm027/lowlevel_init.S b/arch/arm/boards/phytec-phycore-pxa270/lowlevel_init.S
index c7dacce30c..c7dacce30c 100644
--- a/arch/arm/boards/pcm027/lowlevel_init.S
+++ b/arch/arm/boards/phytec-phycore-pxa270/lowlevel_init.S
diff --git a/arch/arm/boards/phytec-pfla02/Makefile b/arch/arm/boards/phytec-phyflex-imx6/Makefile
index 93e73081c2..93e73081c2 100644
--- a/arch/arm/boards/phytec-pfla02/Makefile
+++ b/arch/arm/boards/phytec-phyflex-imx6/Makefile
diff --git a/arch/arm/boards/phytec-pfla02/board.c b/arch/arm/boards/phytec-phyflex-imx6/board.c
index e9bd1680fd..e9bd1680fd 100644
--- a/arch/arm/boards/phytec-pfla02/board.c
+++ b/arch/arm/boards/phytec-phyflex-imx6/board.c
diff --git a/arch/arm/boards/phytec-pfla02/flash-header-phytec-pfla02-1gib.imxcfg b/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-1gib.imxcfg
index 524ebca580..524ebca580 100644
--- a/arch/arm/boards/phytec-pfla02/flash-header-phytec-pfla02-1gib.imxcfg
+++ b/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-1gib.imxcfg
diff --git a/arch/arm/boards/phytec-pfla02/flash-header-phytec-pfla02-2gib.imxcfg b/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-2gib.imxcfg
index bf6e0ab26b..bf6e0ab26b 100644
--- a/arch/arm/boards/phytec-pfla02/flash-header-phytec-pfla02-2gib.imxcfg
+++ b/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02-2gib.imxcfg
diff --git a/arch/arm/boards/phytec-pfla02/flash-header-phytec-pfla02.h b/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02.h
index b90f7cb3cf..b90f7cb3cf 100644
--- a/arch/arm/boards/phytec-pfla02/flash-header-phytec-pfla02.h
+++ b/arch/arm/boards/phytec-phyflex-imx6/flash-header-phytec-pfla02.h
diff --git a/arch/arm/boards/phytec-pfla02/lowlevel.c b/arch/arm/boards/phytec-phyflex-imx6/lowlevel.c
index 6422bc4dcb..6422bc4dcb 100644
--- a/arch/arm/boards/phytec-pfla02/lowlevel.c
+++ b/arch/arm/boards/phytec-phyflex-imx6/lowlevel.c
diff --git a/arch/arm/configs/dmo-realq7_defconfig b/arch/arm/configs/datamodul-edm-qmx6_defconfig
index 131eddfe57..30e5a53478 100644
--- a/arch/arm/configs/dmo-realq7_defconfig
+++ b/arch/arm/configs/datamodul-edm-qmx6_defconfig
@@ -20,7 +20,7 @@ CONFIG_AUTO_COMPLETE=y
CONFIG_MENU=y
CONFIG_CONSOLE_ACTIVATE_NONE=y
CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/dmo-mx6-realq7/env"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/datamodul-edm-qmx6/env"
CONFIG_RESET_SOURCE=y
CONFIG_CMD_EDIT=y
CONFIG_CMD_SLEEP=y
diff --git a/arch/arm/configs/mx21ads_defconfig b/arch/arm/configs/freescale-mx21-ads_defconfig
index 13c005bf93..530f4837ed 100644
--- a/arch/arm/configs/mx21ads_defconfig
+++ b/arch/arm/configs/freescale-mx21-ads_defconfig
@@ -9,7 +9,7 @@ CONFIG_LONGHELP=y
CONFIG_CMDLINE_EDITING=y
CONFIG_AUTO_COMPLETE=y
CONFIG_PARTITION=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/imx21ads/env"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/freescale-mx21-ads/env"
CONFIG_CMD_EDIT=y
CONFIG_CMD_SLEEP=y
CONFIG_CMD_SAVEENV=y
diff --git a/arch/arm/configs/imx23evk_defconfig b/arch/arm/configs/freescale-mx23-evk_defconfig
index 1502d22460..1502d22460 100644
--- a/arch/arm/configs/imx23evk_defconfig
+++ b/arch/arm/configs/freescale-mx23-evk_defconfig
diff --git a/arch/arm/configs/freescale_mx25_3stack_defconfig b/arch/arm/configs/freescale-mx25-3ds_defconfig
index 888736ab07..57d346594c 100644
--- a/arch/arm/configs/freescale_mx25_3stack_defconfig
+++ b/arch/arm/configs/freescale-mx25-3ds_defconfig
@@ -17,7 +17,7 @@ CONFIG_AUTO_COMPLETE=y
# CONFIG_ERRNO_MESSAGES is not set
CONFIG_PARTITION=y
CONFIG_DEFAULT_ENVIRONMENT_GENERIC=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/freescale-mx25-3-stack/env/"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/freescale-mx25-3ds/env/"
CONFIG_CMD_EDIT=y
CONFIG_CMD_SLEEP=y
CONFIG_CMD_SAVEENV=y
diff --git a/arch/arm/configs/mx27ads_defconfig b/arch/arm/configs/freescale-mx27-ads_defconfig
index b3fdf84fad..d374582e4e 100644
--- a/arch/arm/configs/mx27ads_defconfig
+++ b/arch/arm/configs/freescale-mx27-ads_defconfig
@@ -8,7 +8,7 @@ CONFIG_LONGHELP=y
CONFIG_CMDLINE_EDITING=y
CONFIG_AUTO_COMPLETE=y
CONFIG_PARTITION=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/imx27ads/env"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/freescale-mx27-ads/env"
CONFIG_CMD_EDIT=y
CONFIG_CMD_SLEEP=y
CONFIG_CMD_SAVEENV=y
diff --git a/arch/arm/configs/imx28evk_defconfig b/arch/arm/configs/freescale-mx28-evk_defconfig
index d06bac8236..d06bac8236 100644
--- a/arch/arm/configs/imx28evk_defconfig
+++ b/arch/arm/configs/freescale-mx28-evk_defconfig
diff --git a/arch/arm/configs/freescale_mx35_3stack_defconfig b/arch/arm/configs/freescale-mx35-3ds_defconfig
index 2f457642be..e3f32629d3 100644
--- a/arch/arm/configs/freescale_mx35_3stack_defconfig
+++ b/arch/arm/configs/freescale-mx35-3ds_defconfig
@@ -15,7 +15,7 @@ CONFIG_CMDLINE_EDITING=y
CONFIG_AUTO_COMPLETE=y
CONFIG_PARTITION=y
CONFIG_DEFAULT_ENVIRONMENT_GENERIC=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/freescale-mx35-3-stack/env/"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/freescale-mx35-3ds/env/"
CONFIG_CMD_EDIT=y
CONFIG_CMD_SLEEP=y
CONFIG_CMD_SAVEENV=y
diff --git a/arch/arm/configs/freescale_mx51_babbage_defconfig b/arch/arm/configs/freescale-mx51-babbage_defconfig
index b45b897424..3d1ad31c7b 100644
--- a/arch/arm/configs/freescale_mx51_babbage_defconfig
+++ b/arch/arm/configs/freescale-mx51-babbage_defconfig
@@ -17,7 +17,7 @@ CONFIG_AUTO_COMPLETE=y
CONFIG_MENU=y
CONFIG_CONSOLE_ACTIVATE_NONE=y
CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/freescale-mx51-pdk/env/"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/freescale-mx51-babbage/env/"
CONFIG_CMD_EDIT=y
CONFIG_CMD_SLEEP=y
CONFIG_CMD_SAVEENV=y
diff --git a/arch/arm/configs/freescale_mx53_loco_defconfig b/arch/arm/configs/freescale-mx53-qsb_defconfig
index 886394485b..afe8b72c0d 100644
--- a/arch/arm/configs/freescale_mx53_loco_defconfig
+++ b/arch/arm/configs/freescale-mx53-qsb_defconfig
@@ -18,7 +18,7 @@ CONFIG_AUTO_COMPLETE=y
CONFIG_MENU=y
CONFIG_CONSOLE_ACTIVATE_NONE=y
CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/freescale-mx53-loco/env/"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/freescale-mx53-qsb/env/"
CONFIG_RESET_SOURCE=y
CONFIG_DEBUG_INFO=y
CONFIG_CMD_EDIT=y
diff --git a/arch/arm/configs/freescale_mx53_smd_defconfig b/arch/arm/configs/freescale-mx53-smd_defconfig
index f18c436c57..f18c436c57 100644
--- a/arch/arm/configs/freescale_mx53_smd_defconfig
+++ b/arch/arm/configs/freescale-mx53-smd_defconfig
diff --git a/arch/arm/configs/pca100_defconfig b/arch/arm/configs/phytec-phycard-imx27_defconfig
index 6e3a3ada29..6e3a3ada29 100644
--- a/arch/arm/configs/pca100_defconfig
+++ b/arch/arm/configs/phytec-phycard-imx27_defconfig
diff --git a/arch/arm/configs/phycard_a_l1_xload_defconfig b/arch/arm/configs/phytec-phycard-omap3-xload_defconfig
index 5901ed10ab..5901ed10ab 100644
--- a/arch/arm/configs/phycard_a_l1_xload_defconfig
+++ b/arch/arm/configs/phytec-phycard-omap3-xload_defconfig
diff --git a/arch/arm/configs/phycard_a_l1_defconfig b/arch/arm/configs/phytec-phycard-omap3_defconfig
index cdf292cfe8..b9016589bb 100644
--- a/arch/arm/configs/phycard_a_l1_defconfig
+++ b/arch/arm/configs/phytec-phycard-omap3_defconfig
@@ -59,7 +59,7 @@ CONFIG_PARTITION=y
CONFIG_PARTITION_DISK=y
CONFIG_PARTITION_DISK_DOS=y
CONFIG_DEFAULT_ENVIRONMENT=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/phycard-a-l1/env"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/phytec-phycard-omap3/env"
CONFIG_COMMAND_SUPPORT=y
CONFIG_CMD_EDIT=y
CONFIG_CMD_SLEEP=y
diff --git a/arch/arm/configs/phycard_a_xl2_xload_defconfig b/arch/arm/configs/phytec-phycard-omap4-xload_defconfig
index 84160e3418..84160e3418 100644
--- a/arch/arm/configs/phycard_a_xl2_xload_defconfig
+++ b/arch/arm/configs/phytec-phycard-omap4-xload_defconfig
diff --git a/arch/arm/configs/phycard_a_xl2_defconfig b/arch/arm/configs/phytec-phycard-omap4_defconfig
index f091b823ae..2b7548bfe6 100644
--- a/arch/arm/configs/phycard_a_xl2_defconfig
+++ b/arch/arm/configs/phytec-phycard-omap4_defconfig
@@ -17,7 +17,7 @@ CONFIG_AUTO_COMPLETE=y
# CONFIG_TIMESTAMP is not set
CONFIG_PARTITION=y
CONFIG_DEFAULT_ENVIRONMENT_GENERIC=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/phycard-a-xl2/env/"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/phytec-phycard-omap4/env/"
CONFIG_CMD_EDIT=y
CONFIG_CMD_SLEEP=y
CONFIG_CMD_SAVEENV=y
diff --git a/arch/arm/configs/pcm051_defconfig b/arch/arm/configs/phytec-phycore-am335x_defconfig
index d7e510bfe8..c74116bdec 100644
--- a/arch/arm/configs/pcm051_defconfig
+++ b/arch/arm/configs/phytec-phycore-am335x_defconfig
@@ -22,7 +22,7 @@ CONFIG_MENU=y
# CONFIG_TIMESTAMP is not set
CONFIG_BLSPEC=y
CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/pcm051/env"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/phytec-phycore-am335x/env"
CONFIG_DEBUG_INFO=y
CONFIG_CMD_EDIT=y
CONFIG_CMD_SLEEP=y
diff --git a/arch/arm/configs/pcm038_defconfig b/arch/arm/configs/phytec-phycore-imx27_defconfig
index e2f5388d60..07751ea2df 100644
--- a/arch/arm/configs/pcm038_defconfig
+++ b/arch/arm/configs/phytec-phycore-imx27_defconfig
@@ -16,7 +16,7 @@ CONFIG_CMDLINE_EDITING=y
CONFIG_AUTO_COMPLETE=y
CONFIG_MENU=y
CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/pcm038/env"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/phytec-phycore-imx27/env"
CONFIG_CMD_EDIT=y
CONFIG_CMD_SLEEP=y
CONFIG_CMD_SAVEENV=y
diff --git a/arch/arm/configs/pcm037_defconfig b/arch/arm/configs/phytec-phycore-imx31_defconfig
index 1a757013a1..2aa87fe2d4 100644
--- a/arch/arm/configs/pcm037_defconfig
+++ b/arch/arm/configs/phytec-phycore-imx31_defconfig
@@ -19,7 +19,7 @@ CONFIG_MENU=y
CONFIG_PARTITION=y
CONFIG_PARTITION_DISK=y
CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/pcm037/env"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/phytec-phycore-imx31/env"
CONFIG_RESET_SOURCE=y
CONFIG_CMD_EDIT=y
CONFIG_CMD_SLEEP=y
diff --git a/arch/arm/configs/pcm043_defconfig b/arch/arm/configs/phytec-phycore-imx35_defconfig
index 5447777486..59c1b82135 100644
--- a/arch/arm/configs/pcm043_defconfig
+++ b/arch/arm/configs/phytec-phycore-imx35_defconfig
@@ -22,7 +22,7 @@ CONFIG_MENU=y
CONFIG_PARTITION=y
CONFIG_PARTITION_DISK=y
CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/pcm043/env"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/phytec-phycore-imx35/env"
CONFIG_RESET_SOURCE=y
CONFIG_CMD_EDIT=y
CONFIG_CMD_SLEEP=y
diff --git a/arch/arm/configs/pcm049_xload_defconfig b/arch/arm/configs/phytec-phycore-omap4460-xload_defconfig
index 6bbc2e4193..6bbc2e4193 100644
--- a/arch/arm/configs/pcm049_xload_defconfig
+++ b/arch/arm/configs/phytec-phycore-omap4460-xload_defconfig
diff --git a/arch/arm/configs/pcm049_defconfig b/arch/arm/configs/phytec-phycore-omap4460_defconfig
index 35b405281a..906dfea420 100644
--- a/arch/arm/configs/pcm049_defconfig
+++ b/arch/arm/configs/phytec-phycore-omap4460_defconfig
@@ -16,7 +16,7 @@ CONFIG_CMDLINE_EDITING=y
CONFIG_AUTO_COMPLETE=y
# CONFIG_TIMESTAMP is not set
CONFIG_DEFAULT_ENVIRONMENT_GENERIC=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/pcm049/env"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/phytec-phycore-omap4460/env"
CONFIG_CMD_EDIT=y
CONFIG_CMD_SLEEP=y
CONFIG_CMD_SAVEENV=y
diff --git a/arch/arm/configs/pcm027_defconfig b/arch/arm/configs/phytec-phycore-pxa270_defconfig
index f911951276..0e8d1b3946 100644
--- a/arch/arm/configs/pcm027_defconfig
+++ b/arch/arm/configs/phytec-phycore-pxa270_defconfig
@@ -14,7 +14,7 @@ CONFIG_CMDLINE_EDITING=y
CONFIG_AUTO_COMPLETE=y
CONFIG_PARTITION=y
CONFIG_DEFAULT_ENVIRONMENT_GENERIC=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/pcm027/env"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/phytec-phycore-pxa270/env"
CONFIG_DEBUG_INFO=y
CONFIG_CMD_EDIT=y
CONFIG_CMD_SLEEP=y
diff --git a/images/Makefile.imx b/images/Makefile.imx
index dd12242b99..9aca871fd6 100644
--- a/images/Makefile.imx
+++ b/images/Makefile.imx
@@ -16,7 +16,7 @@ image-$(CONFIG_MACH_TX25) += barebox-karo-tx25.img
# ----------------------- i.MX51 based boards ---------------------------
pblx-$(CONFIG_MACH_FREESCALE_MX51_PDK) += start_imx51_babbage
-CFG_start_imx51_babbage.pblx.imximg = $(board)/freescale-mx51-pdk/flash-header-imx51-babbage.imxcfg
+CFG_start_imx51_babbage.pblx.imximg = $(board)/freescale-mx51-babbage/flash-header-imx51-babbage.imxcfg
FILE_barebox-freescale-imx51-babbage.img = start_imx51_babbage.pblx.imximg
image-$(CONFIG_MACH_FREESCALE_MX51_PDK) += barebox-freescale-imx51-babbage.img
@@ -27,12 +27,12 @@ image-$(CONFIG_MACH_EFIKA_MX_SMARTBOOK) += barebox-genesi-efikasb.img
# ----------------------- i.MX53 based boards ---------------------------
pblx-$(CONFIG_MACH_FREESCALE_MX53_LOCO) += start_imx53_loco
-CFG_start_imx53_loco.pblx.imximg = $(board)/freescale-mx53-loco/flash-header-imx53-loco.imxcfg
+CFG_start_imx53_loco.pblx.imximg = $(board)/freescale-mx53-qsb/flash-header-imx53-loco.imxcfg
FILE_barebox-freescale-imx53-loco.img = start_imx53_loco.pblx.imximg
image-$(CONFIG_MACH_FREESCALE_MX53_LOCO) += barebox-freescale-imx53-loco.img
pblx-$(CONFIG_MACH_FREESCALE_MX53_LOCO) += start_imx53_loco_r
-CFG_start_imx53_loco_r.pblx.imximg = $(board)/freescale-mx53-loco/flash-header-imx53-loco.imxcfg
+CFG_start_imx53_loco_r.pblx.imximg = $(board)/freescale-mx53-qsb/flash-header-imx53-loco.imxcfg
FILE_barebox-freescale-imx53-loco-r.img = start_imx53_loco_r.pblx.imximg
image-$(CONFIG_MACH_FREESCALE_MX53_LOCO) += barebox-freescale-imx53-loco-r.img
@@ -53,7 +53,7 @@ image-$(CONFIG_MACH_TQMA53) += barebox-tq-mba53-1gib.img
# ----------------------- i.MX6 based boards ---------------------------
pblx-$(CONFIG_MACH_REALQ7) += start_imx6_realq7
-CFG_start_imx6_realq7.pblx.imximg = $(board)/dmo-mx6-realq7/flash-header.imxcfg
+CFG_start_imx6_realq7.pblx.imximg = $(board)/datamodul-edm-qmx6/flash-header.imxcfg
FILE_barebox-datamodul-edm-qmx6.img = start_imx6_realq7.pblx.imximg
image-$(CONFIG_MACH_REALQ7) += barebox-datamodul-edm-qmx6.img
@@ -73,12 +73,12 @@ FILE_barebox-tq-tqma6q-mba6x.img = start_imx6q_mba6x.pblx.imximg
image-$(CONFIG_MACH_TQMA6X) += barebox-tq-tqma6q-mba6x.img
pblx-$(CONFIG_MACH_PHYTEC_PFLA02) += start_phytec_pbab01_2gib
-CFG_start_phytec_pbab01_2gib.pblx.imximg = $(board)/phytec-pfla02/flash-header-phytec-pfla02-2gib.imxcfg
+CFG_start_phytec_pbab01_2gib.pblx.imximg = $(board)/phytec-phyflex-imx6/flash-header-phytec-pfla02-2gib.imxcfg
FILE_barebox-phytec-pbab01-2gib.img = start_phytec_pbab01_2gib.pblx.imximg
image-$(CONFIG_MACH_PHYTEC_PFLA02) += barebox-phytec-pbab01-2gib.img
pblx-$(CONFIG_MACH_PHYTEC_PFLA02) += start_phytec_pbab01_1gib
-CFG_start_phytec_pbab01_1gib.pblx.imximg = $(board)/phytec-pfla02/flash-header-phytec-pfla02-1gib.imxcfg
+CFG_start_phytec_pbab01_1gib.pblx.imximg = $(board)/phytec-phyflex-imx6/flash-header-phytec-pfla02-1gib.imxcfg
FILE_barebox-phytec-pbab01-1gib.img = start_phytec_pbab01_1gib.pblx.imximg
image-$(CONFIG_MACH_PHYTEC_PFLA02) += barebox-phytec-pbab01-1gib.img