Convert CONFIG_SPL_LIBCOMMON_SUPPORT to Kconfig

[platform/kernel/u-boot.git] / board / sunxi / Kconfig

diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index c1ae6f5..d80abd9 100644 (file)
--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
@@ -1,5 +1,11 @@
 if ARCH_SUNXI
 
+config SPL_GPIO_SUPPORT
+       default y
+
+config SPL_LIBCOMMON_SUPPORT
+       default y
+
 # Note only one of these may be selected at a time! But hidden choices are
 # not supported by Kconfig
 config SUNXI_GEN_SUN4I
@@ -18,6 +24,7 @@ config SUNXI_GEN_SUN6I
 
 choice
        prompt "Sunxi SoC Variant"
+       optional
 
 config MACH_SUN4I
        bool "sun4i (Allwinner A10)"
@@ -36,6 +43,7 @@ config MACH_SUN6I
        select CPU_V7
        select CPU_V7_HAS_NONSEC
        select CPU_V7_HAS_VIRT
+       select ARCH_SUPPORT_PSCI
        select SUNXI_GEN_SUN6I
        select SUPPORT_SPL
        select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT
@@ -45,6 +53,7 @@ config MACH_SUN7I
        select CPU_V7
        select CPU_V7_HAS_NONSEC
        select CPU_V7_HAS_VIRT
+       select ARCH_SUPPORT_PSCI
        select SUNXI_GEN_SUN4I
        select SUPPORT_SPL
        select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT
@@ -54,6 +63,7 @@ config MACH_SUN8I_A23
        select CPU_V7
        select CPU_V7_HAS_NONSEC
        select CPU_V7_HAS_VIRT
+       select ARCH_SUPPORT_PSCI
        select SUNXI_GEN_SUN6I
        select SUPPORT_SPL
        select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT
@@ -63,6 +73,7 @@ config MACH_SUN8I_A33
        select CPU_V7
        select CPU_V7_HAS_NONSEC
        select CPU_V7_HAS_VIRT
+       select ARCH_SUPPORT_PSCI
        select SUNXI_GEN_SUN6I
        select SUPPORT_SPL
        select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT
@@ -78,6 +89,7 @@ config MACH_SUN8I_H3
        select CPU_V7
        select CPU_V7_HAS_NONSEC
        select CPU_V7_HAS_VIRT
+       select ARCH_SUPPORT_PSCI
        select SUNXI_GEN_SUN6I
        select SUPPORT_SPL
        select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT
@@ -248,7 +260,7 @@ config UART0_PORT_F
        Only enable this if you really know what you are doing.
 
 config OLD_SUNXI_KERNEL_COMPAT
-       boolean "Enable workarounds for booting old kernels"
+       bool "Enable workarounds for booting old kernels"
        default n
        ---help---
        Set this to enable various workarounds for old kernels, this results in
@@ -418,14 +430,14 @@ config I2C4_ENABLE
 endif
 
 config AXP_GPIO
-       boolean "Enable support for gpio-s on axp PMICs"
+       bool "Enable support for gpio-s on axp PMICs"
        default n
        ---help---
        Say Y here to enable support for the gpio pins of the axp PMIC ICs.
 
 config VIDEO
-       boolean "Enable graphical uboot console on HDMI, LCD or VGA"
-       depends on !MACH_SUN8I_A83T && !MACH_SUN8I_H3 && !MACH_SUN9I && !MACH_SUN50I_A64
+       bool "Enable graphical uboot console on HDMI, LCD or VGA"
+       depends on !MACH_SUN8I_A83T && !MACH_SUN8I_H3 && !MACH_SUN9I && !MACH_SUN50I
        default y
        ---help---
        Say Y here to add support for using a cfb console on the HDMI, LCD
@@ -433,21 +445,21 @@ config VIDEO
        info on how to select the video output and mode.
 
 config VIDEO_HDMI
-       boolean "HDMI output support"
+       bool "HDMI output support"
        depends on VIDEO && !MACH_SUN8I
        default y
        ---help---
        Say Y here to add support for outputting video over HDMI.
 
 config VIDEO_VGA
-       boolean "VGA output support"
+       bool "VGA output support"
        depends on VIDEO && (MACH_SUN4I || MACH_SUN7I)
        default n
        ---help---
        Say Y here to add support for outputting video over VGA.
 
 config VIDEO_VGA_VIA_LCD
-       boolean "VGA via LCD controller support"
+       bool "VGA via LCD controller support"
        depends on VIDEO && (MACH_SUN5I || MACH_SUN6I || MACH_SUN8I)
        default n
        ---help---
@@ -456,7 +468,7 @@ config VIDEO_VGA_VIA_LCD
        Olimex A13 boards.
 
 config VIDEO_VGA_VIA_LCD_FORCE_SYNC_ACTIVE_HIGH
-       boolean "Force sync active high for VGA via LCD controller support"
+       bool "Force sync active high for VGA via LCD controller support"
        depends on VIDEO_VGA_VIA_LCD
        default n
        ---help---
@@ -474,7 +486,7 @@ config VIDEO_VGA_EXTERNAL_DAC_EN
        format understood by sunxi_name_to_gpio, e.g. PH1 for pin 1 of port H.
 
 config VIDEO_COMPOSITE
-       boolean "Composite video output support"
+       bool "Composite video output support"
        depends on VIDEO && (MACH_SUN4I || MACH_SUN5I || MACH_SUN7I)
        default n
        ---help---