Convert CONFIG_SYS_I2C_LEGACY to Kconfig and add CONFIG_[ST]PL_SYS_I2C_LEGACY

[u-boot.git] / arch / arm / mach-sunxi / Kconfig

diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
index a29d11505aa43d2c54ce24a33e8d92b3cd016c10..79c669a481351e2293cfae29f3b00a7551378774 100644 (file)
--- a/arch/arm/mach-sunxi/Kconfig
+++ b/arch/arm/mach-sunxi/Kconfig
@@ -152,6 +152,7 @@ config SUN50I_GEN_H6
        bool
        select FIT
        select SPL_LOAD_FIT
+       select MMC_SUNXI_HAS_NEW_MODE
        select SUPPORT_SPL
        ---help---
        Select this for sunxi SoCs which have H6 like peripherals, clocks
@@ -190,10 +191,10 @@ config MACH_SUNXI_H3_H5
        select SUPPORT_SPL
 
 # TODO: try out A80's 8GiB DRAM space
-# TODO: H616 supports 4 GiB DRAM space
 config SUNXI_DRAM_MAX_SIZE
        hex
-       default 0xC0000000 if MACH_SUN50I || MACH_SUN50I_H5 || MACH_SUN50I_H6 || MACH_SUN50I_H616
+       default 0x100000000 if MACH_SUN50I_H616
+       default 0xC0000000 if MACH_SUN50I || MACH_SUN50I_H5 || MACH_SUN50I_H6
        default 0x80000000
 
 choice
@@ -208,6 +209,8 @@ config MACH_SUN4I
        select DRAM_SUN4I
        select SUNXI_GEN_SUN4I
        select SUPPORT_SPL
+       imply SPL_SYS_I2C_LEGACY
+       imply SYS_I2C_LEGACY
 
 config MACH_SUN5I
        bool "sun5i (Allwinner A13)"
@@ -218,6 +221,8 @@ config MACH_SUN5I
        select SUNXI_GEN_SUN4I
        select SUPPORT_SPL
        imply CONS_INDEX_2 if !DM_SERIAL
+       imply SPL_SYS_I2C_LEGACY
+       imply SYS_I2C_LEGACY
 
 config MACH_SUN6I
        bool "sun6i (Allwinner A31)"
@@ -244,6 +249,8 @@ config MACH_SUN7I
        select SUNXI_GEN_SUN4I
        select SUPPORT_SPL
        select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT
+       imply SPL_SYS_I2C_LEGACY
+       imply SYS_I2C_LEGACY
 
 config MACH_SUN8I_A23
        bool "sun8i (Allwinner A23)"
@@ -297,10 +304,12 @@ config MACH_SUN8I_R40
        select CPU_V7_HAS_VIRT
        select ARCH_SUPPORT_PSCI
        select SUNXI_GEN_SUN6I
+       select MMC_SUNXI_HAS_NEW_MODE
        select SUPPORT_SPL
        select SUNXI_DRAM_DW
        select SUNXI_DRAM_DW_32BIT
        select PHY_SUN4I_USB
+       imply SPL_SYS_I2C_LEGACY
 
 config MACH_SUN8I_V3S
        bool "sun8i (Allwinner V3/V3s/S3/S3L)"
@@ -346,6 +355,7 @@ config MACH_SUN50I_H5
        bool "sun50i (Allwinner H5)"
        select ARM64
        select MACH_SUNXI_H3_H5
+       select MMC_SUNXI_HAS_NEW_MODE
        select FIT
        select SPL_LOAD_FIT
 
@@ -973,6 +983,7 @@ config VIDEO_DE2
        depends on SUNXI_DE2
        select DM_VIDEO
        select DISPLAY
+       select VIDEO_DW_HDMI
        imply VIDEO_DT_SIMPLEFB
        default y
        ---help---
@@ -1088,3 +1099,12 @@ config BLUETOOTH_DT_DEVICE_FIXUP
          flipped elsewise.
 
 endif
+
+config CHIP_DIP_SCAN
+       bool "Enable DIPs detection for CHIP board"
+       select SUPPORT_EXTENSION_SCAN
+       select W1
+       select W1_GPIO
+       select W1_EEPROM
+       select W1_EEPROM_DS24XXX
+       select CMD_EXTENSION