diff options
author | Josh Cartwright <josh.cartwright@ni.com> | 2013-01-24 13:33:25 -0600 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-01-28 14:02:19 -0800 |
commit | 552a5774db69e45545d82e3ca4caae41e9283e00 (patch) | |
tree | 93c5d767a1c00c0f7fdc3ca837d77ef9bfec556d /arch/arm/configs/multi_v7_defconfig | |
parent | 686fad5c3a5409eababf4543f0ecfea3be73ac72 (diff) | |
download | blackbird-op-linux-552a5774db69e45545d82e3ca4caae41e9283e00.tar.gz blackbird-op-linux-552a5774db69e45545d82e3ca4caae41e9283e00.zip |
ARM: multi_v7_defconfig: add ARCH_ZYNQ
Signed-off-by: Josh Cartwright <josh.cartwright@ni.com>
Acked-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs/multi_v7_defconfig')
-rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 6862e7692191..e31d442343c8 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH_HIGHBANK=y CONFIG_ARCH_SOCFPGA=y CONFIG_ARCH_SUNXI=y # CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA is not set +CONFIG_ARCH_ZYNQ=y CONFIG_ARM_ERRATA_754322=y CONFIG_SMP=y CONFIG_ARM_ARCH_TIMER=y |