summaryrefslogtreecommitdiff
path: root/arch/arm/configs/imx_v4_v5_defconfig
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-09-17 05:38:39 +0400
committerShawn Guo <shawn.guo@linaro.org>2012-10-15 06:10:15 +0400
commitc5a0d4977f00ca18c49d46fdaff4b2cfeaa4eb28 (patch)
tree2bea7a21542264bbb6b11b6ea5e31139e9ff45f3 /arch/arm/configs/imx_v4_v5_defconfig
parent69ac71d370b21cc52a2afd06f3a6d6d1da5edc75 (diff)
downloadlinux-c5a0d4977f00ca18c49d46fdaff4b2cfeaa4eb28.tar.xz
ARM: imx: enable multi-platform build
It enables multi-platform build for imx. With ARCH_MULTI_* options coming to play, ARCH_MXC becomes an user invisible option, while ARCH_IMX_V4_V5 and ARCH_IMX_V6_V7 get removed. Both imx_v4_v5_defconfig and imx_v6_v7_defconfig get updated to adopt the changes. AUTO_ZRELADDR and ARM_PATCH_PHYS_VIRT are selected by ARCH_MXC now to save the duplication. Headers timex.h and uncompress.h are not needed for multi-platform build. Remove them. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/configs/imx_v4_v5_defconfig')
-rw-r--r--arch/arm/configs/imx_v4_v5_defconfig5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig
index 78ed575feb1a..bd012441b747 100644
--- a/arch/arm/configs/imx_v4_v5_defconfig
+++ b/arch/arm/configs/imx_v4_v5_defconfig
@@ -17,8 +17,9 @@ CONFIG_MODULE_UNLOAD=y
# CONFIG_BLK_DEV_BSG is not set
# CONFIG_IOSCHED_DEADLINE is not set
# CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_MXC=y
-CONFIG_ARCH_IMX_V4_V5=y
+CONFIG_ARCH_MULTI_V4T=y
+CONFIG_ARCH_MULTI_V5=y
+# CONFIG_ARCH_MULTI_V7 is not set
CONFIG_ARCH_MX1ADS=y
CONFIG_MACH_SCB9328=y
CONFIG_MACH_APF9328=y