Merge branch 'master' of git://git.denx.de/u-boot-arm

[karo-tx-uboot.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 43700c32eea9c7c4730105d384f799684b3289af..79ccc06d5c929f5c5a63be2b09043bd6fefd9e47 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -627,6 +627,9 @@ config TARGET_HUMMINGBOARD
        bool "Support hummingboard"
        select CPU_V7
 
+config TARGET_KOSAGI_NOVENA
+       bool "Support Kosagi Novena"
+
 config TARGET_TQMA6
        bool "TQ Systems TQMa6 board"
        select CPU_V7
@@ -663,30 +666,8 @@ config TARGET_SOCFPGA_CYCLONE5
        select CPU_V7
        select SUPPORT_SPL
 
-config TARGET_SUN4I
-       bool "Support sun4i"
-       select CPU_V7
-       select SUPPORT_SPL
-
-config TARGET_SUN5I
-       bool "Support sun5i"
-       select CPU_V7
-       select SUPPORT_SPL
-
-config TARGET_SUN6I
-       bool "Support sun6i"
-       select CPU_V7
-       select SUPPORT_SPL
-
-config TARGET_SUN7I
-       bool "Support sun7i"
-       select CPU_V7
-       select SUPPORT_SPL
-
-config TARGET_SUN8I
-       bool "Support sun8i"
-       select CPU_V7
-       select SUPPORT_SPL
+config ARCH_SUNXI
+       bool "Support sunxi (Allwinner) SoCs"
 
 config TARGET_SNOWBALL
        bool "Support snowball"
@@ -914,6 +895,7 @@ source "board/imx31_phycore/Kconfig"
 source "board/isee/igep0033/Kconfig"
 source "board/jornada/Kconfig"
 source "board/karo/tx25/Kconfig"
+source "board/kosagi/novena/Kconfig"
 source "board/logicpd/imx27lite/Kconfig"
 source "board/logicpd/imx31_litekit/Kconfig"
 source "board/maxbcm/Kconfig"
@@ -968,4 +950,6 @@ source "board/woodburn/Kconfig"
 source "board/xaeniax/Kconfig"
 source "board/zipitz2/Kconfig"
 
+source "arch/arm/Kconfig.debug"
+
 endmenu