diff options
| author | Tom Rini <trini@ti.com> | 2014-11-24 17:05:11 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-11-24 17:05:11 -0500 |
| commit | fce0a90a68de507dc827c1ff40d9e446047fa043 (patch) | |
| tree | 9b8aececd44fd791810d4fef68ac66f62e4a48bd /arch/arm/Kconfig | |
| parent | f3a05c8f944ab2cd832e69a5705708ee7a1797fa (diff) | |
| parent | 8bc347e2ec17bca44b1639a001eeed50d042f0db (diff) | |
| download | talos-obmc-uboot-fce0a90a68de507dc827c1ff40d9e446047fa043.tar.gz talos-obmc-uboot-fce0a90a68de507dc827c1ff40d9e446047fa043.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 5241cb473b..b9ac59e1a4 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -415,6 +415,8 @@ config TARGET_INTEGRATORCP_CM946ES config TARGET_VEXPRESS_CA15_TC2 bool "Support vexpress_ca15_tc2" select CPU_V7 + select CPU_V7_HAS_NONSEC + select CPU_V7_HAS_VIRT config TARGET_VEXPRESS_CA5X2 bool "Support vexpress_ca5x2" @@ -826,6 +828,8 @@ source "arch/arm/cpu/arm926ejs/versatile/Kconfig" source "arch/arm/cpu/armv7/zynq/Kconfig" +source "arch/arm/cpu/armv7/Kconfig" + source "board/aristainetos/Kconfig" source "board/BuR/kwb/Kconfig" source "board/BuR/tseries/Kconfig" |
