diff options
author | Haojian Zhuang <haojian.zhuang@linaro.org> | 2014-05-11 21:25:21 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-07-31 03:17:46 -0400 |
commit | 16e456329571aa01fe6293d39d05e9e825aed7eb (patch) | |
tree | e429474dd13d6067cd1c71eedbbfae669772d229 /arch/arm | |
parent | e9a86d96be0dff611156ea89fbb6eb91478bddab (diff) |
ARM: config: enable ARCH_HIX5HD2
Since both ARCH_HI3xxx and ARCH_HIX5HD2 are based on Cortex A9 & they're
using similiar kernel features, make them share the hi3xxx_config.
And add it into multi_v7_defconfig too.
Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
Acked-by: Wei Xu <xuwei5@hisilicon.com>
[olof: also turn on ARCH_HISI in multi_v7]
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/configs/hi3xxx_defconfig | 2 | ||||
-rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/configs/hi3xxx_defconfig b/arch/arm/configs/hi3xxx_defconfig index f186bdfa2369..9630687e7d07 100644 --- a/arch/arm/configs/hi3xxx_defconfig +++ b/arch/arm/configs/hi3xxx_defconfig | |||
@@ -3,7 +3,9 @@ CONFIG_NO_HZ=y | |||
3 | CONFIG_HIGH_RES_TIMERS=y | 3 | CONFIG_HIGH_RES_TIMERS=y |
4 | CONFIG_BLK_DEV_INITRD=y | 4 | CONFIG_BLK_DEV_INITRD=y |
5 | CONFIG_RD_LZMA=y | 5 | CONFIG_RD_LZMA=y |
6 | CONFIG_ARCH_HISI=y | ||
6 | CONFIG_ARCH_HI3xxx=y | 7 | CONFIG_ARCH_HI3xxx=y |
8 | CONFIG_ARCH_HIX5HD2=y | ||
7 | CONFIG_SMP=y | 9 | CONFIG_SMP=y |
8 | CONFIG_PREEMPT=y | 10 | CONFIG_PREEMPT=y |
9 | CONFIG_AEABI=y | 11 | CONFIG_AEABI=y |
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index a62ca2714465..849543f7b79b 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig | |||
@@ -24,7 +24,9 @@ CONFIG_MACH_BERLIN_BG2=y | |||
24 | CONFIG_MACH_BERLIN_BG2CD=y | 24 | CONFIG_MACH_BERLIN_BG2CD=y |
25 | CONFIG_MACH_BERLIN_BG2Q=y | 25 | CONFIG_MACH_BERLIN_BG2Q=y |
26 | CONFIG_ARCH_HIGHBANK=y | 26 | CONFIG_ARCH_HIGHBANK=y |
27 | CONFIG_ARCH_HISI=y | ||
27 | CONFIG_ARCH_HI3xxx=y | 28 | CONFIG_ARCH_HI3xxx=y |
29 | CONFIG_ARCH_HIX5HD2=y | ||
28 | CONFIG_ARCH_KEYSTONE=y | 30 | CONFIG_ARCH_KEYSTONE=y |
29 | CONFIG_ARCH_MXC=y | 31 | CONFIG_ARCH_MXC=y |
30 | CONFIG_MACH_IMX51_DT=y | 32 | CONFIG_MACH_IMX51_DT=y |