diff --git a/arch/arm/Makefile b/arch/arm/Makefile index fbc648001..c0b725d43 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 a4219d7f7..befddd039 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 similarity index 100% rename from arch/arm/boards/dmo-mx6-realq7/Makefile rename to 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 similarity index 100% rename from arch/arm/boards/dmo-mx6-realq7/board.c rename to 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 similarity index 100% rename from arch/arm/boards/dmo-mx6-realq7/env/boot/mmc rename to 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 similarity index 100% rename from arch/arm/boards/dmo-mx6-realq7/env/config-board rename to 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 similarity index 100% rename from arch/arm/boards/dmo-mx6-realq7/env/init/automount rename to 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 similarity index 100% rename from arch/arm/boards/dmo-mx6-realq7/flash-header.imxcfg rename to 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 similarity index 100% rename from arch/arm/boards/dmo-mx6-realq7/lowlevel.c rename to arch/arm/boards/datamodul-edm-qmx6/lowlevel.c diff --git a/arch/arm/boards/imx21ads/Makefile b/arch/arm/boards/freescale-mx21-ads/Makefile similarity index 100% rename from arch/arm/boards/imx21ads/Makefile rename to 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 similarity index 100% rename from arch/arm/boards/imx21ads/env/bin/init rename to 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 similarity index 100% rename from arch/arm/boards/imx21ads/imx21ads.c rename to 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 similarity index 100% rename from arch/arm/boards/imx21ads/imx21ads.dox rename to 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 similarity index 100% rename from arch/arm/boards/imx21ads/lowlevel_init.S rename to 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 similarity index 100% rename from arch/arm/boards/freescale-mx25-3-stack/3stack.c rename to 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 similarity index 100% rename from arch/arm/boards/freescale-mx25-3-stack/Makefile rename to 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 similarity index 100% rename from arch/arm/boards/freescale-mx25-3-stack/env/bin/_update rename to 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 similarity index 100% rename from arch/arm/boards/freescale-mx25-3-stack/env/bin/boot rename to 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 similarity index 100% rename from arch/arm/boards/freescale-mx25-3-stack/env/bin/hush_hack rename to 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 similarity index 100% rename from arch/arm/boards/freescale-mx25-3-stack/env/bin/init rename to 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 similarity index 100% rename from arch/arm/boards/freescale-mx25-3-stack/env/bin/update_kernel rename to 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 similarity index 100% rename from arch/arm/boards/freescale-mx25-3-stack/env/bin/update_root rename to 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 similarity index 100% rename from arch/arm/boards/freescale-mx25-3-stack/env/config rename to 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 similarity index 100% rename from arch/arm/boards/freescale-mx25-3-stack/lowlevel_init.S rename to 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 similarity index 100% rename from arch/arm/boards/imx27ads/Makefile rename to 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 similarity index 100% rename from arch/arm/boards/imx27ads/env/bin/_update rename to 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 similarity index 100% rename from arch/arm/boards/imx27ads/env/bin/boot rename to 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 similarity index 100% rename from arch/arm/boards/imx27ads/env/bin/init rename to 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 similarity index 100% rename from arch/arm/boards/imx27ads/env/bin/update_kernel rename to 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 similarity index 100% rename from arch/arm/boards/imx27ads/env/bin/update_root rename to 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 similarity index 100% rename from arch/arm/boards/imx27ads/env/config rename to 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 similarity index 100% rename from arch/arm/boards/imx27ads/imx27ads.c rename to 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 similarity index 100% rename from arch/arm/boards/imx27ads/imx27ads.dox rename to 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 similarity index 100% rename from arch/arm/boards/imx27ads/lowlevel_init.S rename to 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 similarity index 100% rename from arch/arm/boards/freescale-mx35-3-stack/3stack.c rename to 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 similarity index 100% rename from arch/arm/boards/freescale-mx35-3-stack/3stack.dox rename to 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 similarity index 100% rename from arch/arm/boards/freescale-mx35-3-stack/Makefile rename to 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 similarity index 100% rename from arch/arm/boards/freescale-mx35-3-stack/board-mx35_3stack.h rename to 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 similarity index 100% rename from arch/arm/boards/freescale-mx35-3-stack/env/config rename to 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 similarity index 100% rename from arch/arm/boards/freescale-mx35-3-stack/flash_header.c rename to 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 similarity index 100% rename from arch/arm/boards/freescale-mx35-3-stack/lowlevel_init.S rename to 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 similarity index 100% rename from arch/arm/boards/freescale-mx51-pdk/Makefile rename to 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 similarity index 100% rename from arch/arm/boards/freescale-mx51-pdk/board.c rename to 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 similarity index 100% rename from arch/arm/boards/freescale-mx51-pdk/env/config-board rename to 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 similarity index 100% rename from arch/arm/boards/freescale-mx51-pdk/flash-header-imx51-babbage.imxcfg rename to 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 similarity index 100% rename from arch/arm/boards/freescale-mx51-pdk/lowlevel.c rename to 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 similarity index 100% rename from arch/arm/boards/freescale-mx51-pdk/mx51-pdk.dox rename to 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 similarity index 100% rename from arch/arm/boards/freescale-mx53-loco/Makefile rename to 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 similarity index 100% rename from arch/arm/boards/freescale-mx53-loco/board.c rename to 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 similarity index 100% rename from arch/arm/boards/freescale-mx53-loco/env/config-board rename to 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 similarity index 100% rename from arch/arm/boards/freescale-mx53-loco/flash-header-imx53-loco.imxcfg rename to 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 similarity index 100% rename from arch/arm/boards/freescale-mx53-loco/lowlevel.c rename to 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 similarity index 100% rename from arch/arm/boards/freescale-mx53-loco/mx53-pdk.dox rename to 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 similarity index 100% rename from arch/arm/boards/phycard-i.MX27/Makefile rename to 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 similarity index 100% rename from arch/arm/boards/phycard-i.MX27/lowlevel.c rename to 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 similarity index 100% rename from arch/arm/boards/phycard-i.MX27/pca100.c rename to 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 similarity index 100% rename from arch/arm/boards/phycard-i.MX27/pca100.dox rename to 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 similarity index 100% rename from arch/arm/boards/phycard-a-l1/Makefile rename to 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 similarity index 100% rename from arch/arm/boards/phycard-a-l1/env/config rename to 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 similarity index 100% rename from arch/arm/boards/phycard-a-l1/lowlevel.c rename to 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 similarity index 100% rename from arch/arm/boards/phycard-a-l1/pca-a-l1.c rename to 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 similarity index 100% rename from arch/arm/boards/phycard-a-l1/pca-a-l1.dox rename to 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 similarity index 100% rename from arch/arm/boards/phycard-a-l1/pca-a-l1.h rename to 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 similarity index 100% rename from arch/arm/boards/phycard-a-xl2/Makefile rename to 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 similarity index 100% rename from arch/arm/boards/phycard-a-xl2/env/bin/nand_bootstrap rename to 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 similarity index 100% rename from arch/arm/boards/phycard-a-xl2/env/config rename to 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 similarity index 100% rename from arch/arm/boards/phycard-a-xl2/lowlevel.c rename to 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 similarity index 100% rename from arch/arm/boards/phycard-a-xl2/mux.c rename to 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 similarity index 100% rename from arch/arm/boards/phycard-a-xl2/pca-a-xl2.c rename to 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 similarity index 100% rename from arch/arm/boards/pcm051/Makefile rename to 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 similarity index 100% rename from arch/arm/boards/pcm051/board.c rename to 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 similarity index 100% rename from arch/arm/boards/pcm051/env/boot/mmc rename to 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 similarity index 100% rename from arch/arm/boards/pcm051/env/boot/nand rename to 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 similarity index 100% rename from arch/arm/boards/pcm051/env/boot/spi rename to 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 similarity index 100% rename from arch/arm/boards/pcm051/env/config-board rename to 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 similarity index 100% rename from arch/arm/boards/pcm051/lowlevel.c rename to arch/arm/boards/phytec-phycore-am335x/lowlevel.c diff --git a/arch/arm/boards/pcm038/Makefile b/arch/arm/boards/phytec-phycore-imx27/Makefile similarity index 100% rename from arch/arm/boards/pcm038/Makefile rename to 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 similarity index 100% rename from arch/arm/boards/pcm037/env/boot/nand-ubi rename to 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 similarity index 100% rename from arch/arm/boards/pcm037/env/config-board rename to 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 similarity index 100% rename from arch/arm/boards/pcm037/env/init/mtdparts-nand rename to 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 similarity index 100% rename from arch/arm/boards/pcm038/env/init/mtdparts-nor rename to 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 similarity index 100% rename from arch/arm/boards/pcm038/lowlevel.c rename to 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 similarity index 100% rename from arch/arm/boards/pcm038/pcm038.c rename to 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 similarity index 100% rename from arch/arm/boards/pcm038/pcm038.dox rename to 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 similarity index 100% rename from arch/arm/boards/pcm038/pcm970.c rename to 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 similarity index 100% rename from arch/arm/boards/pcm038/pll.h rename to arch/arm/boards/phytec-phycore-imx27/pll.h diff --git a/arch/arm/boards/pcm037/Makefile b/arch/arm/boards/phytec-phycore-imx31/Makefile similarity index 100% rename from arch/arm/boards/pcm037/Makefile rename to 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 similarity index 100% rename from arch/arm/boards/pcm038/env/boot/nand-ubi rename to 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 similarity index 100% rename from arch/arm/boards/pcm038/env/config-board rename to 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 similarity index 100% rename from arch/arm/boards/pcm038/env/init/mtdparts-nand rename to 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 similarity index 100% rename from arch/arm/boards/pcm037/env/init/mtdparts-nor rename to 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 similarity index 100% rename from arch/arm/boards/pcm037/lowlevel.c rename to 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 similarity index 100% rename from arch/arm/boards/pcm037/pcm037.c rename to 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 similarity index 100% rename from arch/arm/boards/pcm037/pcm037.dox rename to arch/arm/boards/phytec-phycore-imx31/pcm037.dox diff --git a/arch/arm/boards/pcm043/Makefile b/arch/arm/boards/phytec-phycore-imx35/Makefile similarity index 100% rename from arch/arm/boards/pcm043/Makefile rename to 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 similarity index 100% rename from arch/arm/boards/pcm043/env/boot/nand-ubi rename to 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 similarity index 100% rename from arch/arm/boards/pcm043/env/config-board rename to 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 similarity index 100% rename from arch/arm/boards/pcm043/env/init/mtdparts-nand rename to 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 similarity index 100% rename from arch/arm/boards/pcm043/env/init/mtdparts-nor rename to 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 similarity index 100% rename from arch/arm/boards/pcm043/lowlevel.c rename to 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 similarity index 100% rename from arch/arm/boards/pcm043/pcm043.c rename to 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 similarity index 100% rename from arch/arm/boards/pcm043/pcm043.dox rename to arch/arm/boards/phytec-phycore-imx35/pcm043.dox diff --git a/arch/arm/boards/pcm049/Makefile b/arch/arm/boards/phytec-phycore-omap4460/Makefile similarity index 100% rename from arch/arm/boards/pcm049/Makefile rename to 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 similarity index 100% rename from arch/arm/boards/pcm049/board.c rename to 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 similarity index 100% rename from arch/arm/boards/pcm049/env/bin/init_board rename to 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 similarity index 100% rename from arch/arm/boards/pcm049/env/bin/nand_bootstrap rename to 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 similarity index 100% rename from arch/arm/boards/pcm049/env/config rename to 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 similarity index 100% rename from arch/arm/boards/pcm049/lowlevel.c rename to 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 similarity index 100% rename from arch/arm/boards/pcm049/mux.c rename to arch/arm/boards/phytec-phycore-omap4460/mux.c diff --git a/arch/arm/boards/pcm027/Makefile b/arch/arm/boards/phytec-phycore-pxa270/Makefile similarity index 100% rename from arch/arm/boards/pcm027/Makefile rename to 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 similarity index 100% rename from arch/arm/boards/pcm027/board.c rename to 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 similarity index 100% rename from arch/arm/boards/pcm027/config.h rename to 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 similarity index 100% rename from arch/arm/boards/pcm027/env/config rename to 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 similarity index 100% rename from arch/arm/boards/pcm027/lowlevel_init.S rename to 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 similarity index 100% rename from arch/arm/boards/phytec-pfla02/Makefile rename to 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 similarity index 100% rename from arch/arm/boards/phytec-pfla02/board.c rename to 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 similarity index 100% rename from arch/arm/boards/phytec-pfla02/flash-header-phytec-pfla02-1gib.imxcfg rename to 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 similarity index 100% rename from arch/arm/boards/phytec-pfla02/flash-header-phytec-pfla02-2gib.imxcfg rename to 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 similarity index 100% rename from arch/arm/boards/phytec-pfla02/flash-header-phytec-pfla02.h rename to 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 similarity index 100% rename from arch/arm/boards/phytec-pfla02/lowlevel.c rename to 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 similarity index 96% rename from arch/arm/configs/dmo-realq7_defconfig rename to arch/arm/configs/datamodul-edm-qmx6_defconfig index 131eddfe5..30e5a5347 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 similarity index 92% rename from arch/arm/configs/mx21ads_defconfig rename to arch/arm/configs/freescale-mx21-ads_defconfig index 13c005bf9..530f4837e 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 similarity index 100% rename from arch/arm/configs/imx23evk_defconfig rename to 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 similarity index 98% rename from arch/arm/configs/freescale_mx25_3stack_defconfig rename to arch/arm/configs/freescale-mx25-3ds_defconfig index 888736ab0..57d346594 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 similarity index 91% rename from arch/arm/configs/mx27ads_defconfig rename to arch/arm/configs/freescale-mx27-ads_defconfig index b3fdf84fa..d374582e4 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 similarity index 100% rename from arch/arm/configs/imx28evk_defconfig rename to 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 similarity index 99% rename from arch/arm/configs/freescale_mx35_3stack_defconfig rename to arch/arm/configs/freescale-mx35-3ds_defconfig index 2f457642b..e3f32629d 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 similarity index 99% rename from arch/arm/configs/freescale_mx51_babbage_defconfig rename to arch/arm/configs/freescale-mx51-babbage_defconfig index b45b89742..3d1ad31c7 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 similarity index 99% rename from arch/arm/configs/freescale_mx53_loco_defconfig rename to arch/arm/configs/freescale-mx53-qsb_defconfig index 886394485..afe8b72c0 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 similarity index 100% rename from arch/arm/configs/freescale_mx53_smd_defconfig rename to arch/arm/configs/freescale-mx53-smd_defconfig diff --git a/arch/arm/configs/pca100_defconfig b/arch/arm/configs/phytec-phycard-imx27_defconfig similarity index 100% rename from arch/arm/configs/pca100_defconfig rename to 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 similarity index 100% rename from arch/arm/configs/phycard_a_l1_xload_defconfig rename to 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 similarity index 98% rename from arch/arm/configs/phycard_a_l1_defconfig rename to arch/arm/configs/phytec-phycard-omap3_defconfig index cdf292cfe..b9016589b 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 similarity index 100% rename from arch/arm/configs/phycard_a_xl2_xload_defconfig rename to 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 similarity index 93% rename from arch/arm/configs/phycard_a_xl2_defconfig rename to arch/arm/configs/phytec-phycard-omap4_defconfig index f091b823a..2b7548bfe 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 similarity index 96% rename from arch/arm/configs/pcm051_defconfig rename to arch/arm/configs/phytec-phycore-am335x_defconfig index d7e510bfe..c74116bde 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 similarity index 95% rename from arch/arm/configs/pcm038_defconfig rename to arch/arm/configs/phytec-phycore-imx27_defconfig index e2f5388d6..07751ea2d 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 similarity index 96% rename from arch/arm/configs/pcm037_defconfig rename to arch/arm/configs/phytec-phycore-imx31_defconfig index 1a757013a..2aa87fe2d 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 similarity index 96% rename from arch/arm/configs/pcm043_defconfig rename to arch/arm/configs/phytec-phycore-imx35_defconfig index 544777748..59c1b8213 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 similarity index 100% rename from arch/arm/configs/pcm049_xload_defconfig rename to arch/arm/configs/phytec-phycore-omap4460-xload_defconfig diff --git a/arch/arm/configs/pcm049_defconfig b/arch/arm/configs/phytec-phycore-omap4460_defconfig similarity index 95% rename from arch/arm/configs/pcm049_defconfig rename to arch/arm/configs/phytec-phycore-omap4460_defconfig index 35b405281..906dfea42 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 similarity index 94% rename from arch/arm/configs/pcm027_defconfig rename to arch/arm/configs/phytec-phycore-pxa270_defconfig index f91195127..0e8d1b394 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 dd12242b9..9aca871fd 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