Convert CONFIG_BOARD_EARLY_INIT_F to Kconfig

[u-boot] / arch / arm / mach-mvebu / Kconfig

diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index 58f22966dfc9531ffc88681725919bb0c94764dc..e0232b4c96b281eeb0f7dd346d63197fe6564dbb 100644 (file)
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -8,6 +8,7 @@ config ARMADA_32BIT
        select SPL_DM_SEQ_ALIAS
        select SPL_OF_CONTROL
        select SPL_SIMPLE_BUS
+       select BOARD_EARLY_INIT_F
 
 config ARMADA_64BIT
        bool
@@ -31,6 +32,17 @@ config ARMADA_3700
        bool
        select ARM64
 
+# Armada 7K and 8K are very similar - use only one Kconfig symbol for both
+config ARMADA_8K
+       bool
+       select ARM64
+
+# Armada PLL frequency (used for NAND clock generation)
+config SYS_MVEBU_PLL_CLOCK
+       int
+       default "2000000000" if ARMADA_XP || ARMADA_3700 || ARMADA_8K
+       default "1000000000" if ARMADA_38X || ARMADA_375
+
 # Armada XP/38x SoC types...
 config MV78230
        bool
@@ -49,7 +61,7 @@ config 88F6820
        select ARMADA_38X
 
 choice
-       prompt "Marvell MVEBU (Armada XP/375/38x/3700) board select"
+       prompt "Armada XP/375/38x/3700/7K/8K board select"
        optional
 
 config TARGET_CLEARFOG
@@ -72,6 +84,11 @@ config TARGET_DB_88F6820_AMC
        bool "Support DB-88F6820-AMC"
        select 88F6820
 
+config TARGET_MVEBU_ARMADA_8K
+       bool "Support Armada 7k/8k platforms"
+       select ARMADA_8K
+       select BOARD_LATE_INIT
+
 config TARGET_DB_MV784MP_GP
        bool "Support db-mv784mp-gp"
        select MV78460
@@ -86,6 +103,7 @@ config TARGET_MAXBCM
 
 config TARGET_THEADORABLE
        bool "Support theadorable Armada XP"
+       select BOARD_LATE_INIT if USB
        select MV78260
 
 endchoice
@@ -96,6 +114,7 @@ config SYS_BOARD
        default "db-88f6720" if TARGET_DB_88F6720
        default "db-88f6820-gp" if TARGET_DB_88F6820_GP
        default "db-88f6820-amc" if TARGET_DB_88F6820_AMC
+       default "mvebu_armada-8k" if TARGET_MVEBU_ARMADA_8K
        default "db-mv784mp-gp" if TARGET_DB_MV784MP_GP
        default "ds414" if TARGET_DS414
        default "maxbcm" if TARGET_MAXBCM
@@ -107,6 +126,7 @@ config SYS_CONFIG_NAME
        default "db-88f6720" if TARGET_DB_88F6720
        default "db-88f6820-gp" if TARGET_DB_88F6820_GP
        default "db-88f6820-amc" if TARGET_DB_88F6820_AMC
+       default "mvebu_armada-8k" if TARGET_MVEBU_ARMADA_8K
        default "db-mv784mp-gp" if TARGET_DB_MV784MP_GP
        default "ds414" if TARGET_DS414
        default "maxbcm" if TARGET_MAXBCM
@@ -118,6 +138,7 @@ config SYS_VENDOR
        default "Marvell" if TARGET_DB_88F6720
        default "Marvell" if TARGET_DB_88F6820_GP
        default "Marvell" if TARGET_DB_88F6820_AMC
+       default "Marvell" if TARGET_MVEBU_ARMADA_8K
        default "solidrun" if TARGET_CLEARFOG
        default "Synology" if TARGET_DS414