sunxi: Add default MMC0 card detect pin for A83T, H3 and A64 SoCs

[u-boot] / board / sunxi / Kconfig

diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index 55906b5b76046b701997b6df50372ea636a94336..a24d5c238da91f09b36b5d327be4cccaeff011f4 100644 (file)
--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
@@ -18,7 +18,6 @@ config SUNXI_GEN_SUN6I
 
 choice
        prompt "Sunxi SoC Variant"
-       optional
 
 config MACH_SUN4I
        bool "sun4i (Allwinner A10)"
@@ -68,18 +67,44 @@ config MACH_SUN8I_A33
        select SUPPORT_SPL
        select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT
 
+config MACH_SUN8I_A83T
+       bool "sun8i (Allwinner A83T)"
+       select CPU_V7
+       select SUNXI_GEN_SUN6I
+       select SUPPORT_SPL
+
+config MACH_SUN8I_H3
+       bool "sun8i (Allwinner H3)"
+       select CPU_V7
+       select CPU_V7_HAS_NONSEC
+       select CPU_V7_HAS_VIRT
+       select SUNXI_GEN_SUN6I
+       select SUPPORT_SPL
+       select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT
+
 config MACH_SUN9I
        bool "sun9i (Allwinner A80)"
        select CPU_V7
        select SUNXI_GEN_SUN6I
 
+config MACH_SUN50I
+       bool "sun50i (Allwinner A64)"
+       select ARM64
+       select SUNXI_GEN_SUN6I
+
 endchoice
 
 # The sun8i SoCs share a lot, this helps to avoid a lot of "if A23 || A33"
 config MACH_SUN8I
        bool
-       default y if MACH_SUN8I_A23 || MACH_SUN8I_A33
+       default y if MACH_SUN8I_A23 || MACH_SUN8I_A33 || MACH_SUN8I_H3 || MACH_SUN8I_A83T
 
+config DRAM_TYPE
+       int "sunxi dram type"
+       depends on MACH_SUN8I_A83T
+       default 3
+       ---help---
+       Set the dram type, 3: DDR3, 7: LPDDR3
 
 config DRAM_CLK
        int "sunxi dram clock speed"
@@ -192,6 +217,7 @@ config DRAM_ODT_CORRECTION
 endif
 
 config SYS_CLK_FREQ
+       default 816000000 if MACH_SUN50I
        default 912000000 if MACH_SUN7I
        default 1008000000 if MACH_SUN4I || MACH_SUN5I || MACH_SUN6I || MACH_SUN8I
 
@@ -202,6 +228,7 @@ config SYS_CONFIG_NAME
        default "sun7i" if MACH_SUN7I
        default "sun8i" if MACH_SUN8I
        default "sun9i" if MACH_SUN9I
+       default "sun50i" if MACH_SUN50I
 
 config SYS_BOARD
        default "sunxi"
@@ -227,8 +254,13 @@ config OLD_SUNXI_KERNEL_COMPAT
        Set this to enable various workarounds for old kernels, this results in
        sub-optimal settings for newer kernels, only enable if needed.
 
+config MMC
+       depends on !UART0_PORT_F
+       default y if ARCH_SUNXI
+
 config MMC0_CD_PIN
        string "Card detect pin for mmc0"
+       default "PF6" if MACH_SUN8I_A83T || MACH_SUN8I_H3 || MACH_SUN50I
        default ""
        ---help---
        Set the card detect pin for mmc0, leave empty to not use cd. This
@@ -280,6 +312,15 @@ config MMC_SUNXI_SLOT_EXTRA
        slot or emmc on mmc1 - mmc3. Setting this to 1, 2 or 3 will enable
        support for this.
 
+config INITIAL_USB_SCAN_DELAY
+       int "delay initial usb scan by x ms to allow builtin devices to init"
+       default 0
+       ---help---
+       Some boards have on board usb devices which need longer than the
+       USB spec's 1 second to connect from board powerup. Set this config
+       option to a non 0 value to add an extra delay before the first usb
+       bus scan.
+
 config USB0_VBUS_PIN
        string "Vbus enable pin for usb0 (otg)"
        default ""
@@ -317,6 +358,12 @@ config USB2_VBUS_PIN
        ---help---
        See USB1_VBUS_PIN help text.
 
+config USB3_VBUS_PIN
+       string "Vbus enable pin for usb3 (ehci2)"
+       default ""
+       ---help---
+       See USB1_VBUS_PIN help text.
+
 config I2C0_ENABLE
        bool "Enable I2C/TWI controller 0"
        default y if MACH_SUN4I || MACH_SUN5I || MACH_SUN7I
@@ -347,6 +394,15 @@ config I2C3_ENABLE
        See I2C0_ENABLE help text.
 endif
 
+if SUNXI_GEN_SUN6I
+config R_I2C_ENABLE
+       bool "Enable the PRCM I2C/TWI controller"
+       # This is used for the pmic on H3
+       default y if SY8106A_POWER
+       ---help---
+       Set this to y to enable the I2C controller which is part of the PRCM.
+endif
+
 if MACH_SUN7I
 config I2C4_ENABLE
        bool "Enable I2C/TWI controller 4"
@@ -363,6 +419,7 @@ config AXP_GPIO
 
 config VIDEO
        boolean "Enable graphical uboot console on HDMI, LCD or VGA"
+       depends on !MACH_SUN8I_A83T
        default y
        ---help---
        Say Y here to add support for using a cfb console on the HDMI, LCD
@@ -562,4 +619,8 @@ config GMAC_TX_DELAY
        ---help---
        Set the GMAC Transmit Clock Delay Chain value.
 
+config SPL_STACK_R_ADDR
+       default 0x4fe00000 if MACH_SUN4I || MACH_SUN5I || MACH_SUN6I || MACH_SUN7I || MACH_SUN8I || MACH_SUN50I
+       default 0x2fe00000 if MACH_SUN9I
+
 endif