Merge tag 'dm-pull-29jul19' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm

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

diff --git a/arch/arm/mach-meson/Kconfig b/arch/arm/mach-meson/Kconfig
index 7f217facd1b7e7ee991a4dc8c0e251f3d8fc9532..e29e4c0acc06d0d843de16989a5ff80fe41d2f82 100644 (file)
--- a/arch/arm/mach-meson/Kconfig
+++ b/arch/arm/mach-meson/Kconfig
@@ -8,6 +8,7 @@ config MESON64_COMMON
        select DM_SERIAL
        select SYSCON
        select REGMAP
+       select BOARD_LATE_INIT
        imply CMD_DM
 
 config MESON_GX
@@ -40,7 +41,13 @@ config MESON_AXG
        bool "AXG"
        select MESON64_COMMON
        help
-               Select this if your SoC is an A113X/D
+         Select this if your SoC is an A113X/D
+
+config MESON_G12A
+       bool "G12A"
+       select MESON64_COMMON
+       help
+         Select this if your SoC is an S905X/D2
 
 endchoice
 
@@ -60,9 +67,11 @@ config SYS_VENDOR
 
 config SYS_BOARD
        string "Board name"
-       default "odroid-c2" if MESON_GXBB
+       default "p200" if MESON_GXBB
        default "p212" if MESON_GXL
        default "q200" if MESON_GXM
+       default "s400" if MESON_AXG
+       default "u200" if MESON_G12A
        default ""
        help
          This option contains information about board name.