diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-12 06:08:12 -0500 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-12 06:08:12 -0500 |
commit | 53640f41b97792b0889bb70f26f99c06743162a1 (patch) | |
tree | 3a0358208775f29f9e319b506ce849c5dbdc1a06 /arch/arm/configs | |
parent | 77b67063bb6bce6d475e910d3b886a606d0d91f7 (diff) | |
parent | 68b25325a7fd290b5e472bba0df9cbe8c1a81d8f (diff) |
Merge remote-tracking branch 'arm-soc/imx/multiplatform' into imx25-dt
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/imx_v4_v5_defconfig | 4 | ||||
-rw-r--r-- | arch/arm/configs/imx_v6_v7_defconfig | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig index 78ed575feb1a..f71302c3ac33 100644 --- a/arch/arm/configs/imx_v4_v5_defconfig +++ b/arch/arm/configs/imx_v4_v5_defconfig | |||
@@ -18,7 +18,9 @@ CONFIG_MODULE_UNLOAD=y | |||
18 | # CONFIG_IOSCHED_DEADLINE is not set | 18 | # CONFIG_IOSCHED_DEADLINE is not set |
19 | # CONFIG_IOSCHED_CFQ is not set | 19 | # CONFIG_IOSCHED_CFQ is not set |
20 | CONFIG_ARCH_MXC=y | 20 | CONFIG_ARCH_MXC=y |
21 | CONFIG_ARCH_IMX_V4_V5=y | 21 | CONFIG_ARCH_MULTI_V4T=y |
22 | CONFIG_ARCH_MULTI_V5=y | ||
23 | # CONFIG_ARCH_MULTI_V7 is not set | ||
22 | CONFIG_ARCH_MX1ADS=y | 24 | CONFIG_ARCH_MX1ADS=y |
23 | CONFIG_MACH_SCB9328=y | 25 | CONFIG_MACH_SCB9328=y |
24 | CONFIG_MACH_APF9328=y | 26 | CONFIG_MACH_APF9328=y |
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 394ded624e37..44f117aab52c 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig | |||
@@ -17,6 +17,8 @@ CONFIG_MODVERSIONS=y | |||
17 | CONFIG_MODULE_SRCVERSION_ALL=y | 17 | CONFIG_MODULE_SRCVERSION_ALL=y |
18 | # CONFIG_BLK_DEV_BSG is not set | 18 | # CONFIG_BLK_DEV_BSG is not set |
19 | CONFIG_ARCH_MXC=y | 19 | CONFIG_ARCH_MXC=y |
20 | CONFIG_ARCH_MULTI_V6=y | ||
21 | CONFIG_ARCH_MULTI_V7=y | ||
20 | CONFIG_MACH_MX31LILLY=y | 22 | CONFIG_MACH_MX31LILLY=y |
21 | CONFIG_MACH_MX31LITE=y | 23 | CONFIG_MACH_MX31LITE=y |
22 | CONFIG_MACH_PCM037=y | 24 | CONFIG_MACH_PCM037=y |