Merge tag 'efi-2020-07-rc6' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

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

diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
index 9c24921b5cacf5f102f14dee7659fe72816b3763..ae44cb665e0b33723ac7433d233324b161565dc8 100644 (file)
--- a/arch/arm/mach-kirkwood/Kconfig
+++ b/arch/arm/mach-kirkwood/Kconfig
@@ -1,4 +1,4 @@
-if KIRKWOOD
+if ARCH_KIRKWOOD
 
 choice
        prompt "Marvell Kirkwood board select"
@@ -32,7 +32,8 @@ config TARGET_ICONNECT
        bool "iconnect Board"
 
 config TARGET_KM_KIRKWOOD
-       bool "KM_KIRKWOOD Board"
+       bool "KM Kirkwood Board"
+       select VENDOR_KM
 
 config TARGET_NET2BIG_V2
        bool "LaCie 2Big Network v2 NAS Board"
@@ -55,6 +56,15 @@ config TARGET_NAS220
 config TARGET_NSA310S
        bool "Zyxel NSA310S"
 
+config TARGET_SBx81LIFKW
+       bool "Allied Telesis SBx81GS24/SBx81GT40/SBx81XS6/SBx81XS16"
+
+config TARGET_SBx81LIFXCAT
+       bool "Allied Telesis SBx81GP24/SBx81GT24"
+
+config TARGET_DB_88F6281_BP
+       bool "Marvell DB-88F6281-BP"
+
 endchoice
 
 config SYS_SOC
@@ -69,7 +79,7 @@ source "board/buffalo/lsxl/Kconfig"
 source "board/cloudengines/pogo_e02/Kconfig"
 source "board/d-link/dns325/Kconfig"
 source "board/iomega/iconnect/Kconfig"
-source "board/keymile/km_arm/Kconfig"
+source "board/keymile/Kconfig"
 source "board/LaCie/net2big_v2/Kconfig"
 source "board/LaCie/netspace_v2/Kconfig"
 source "board/raidsonic/ib62x0/Kconfig"
@@ -77,5 +87,8 @@ source "board/Seagate/dockstar/Kconfig"
 source "board/Seagate/goflexhome/Kconfig"
 source "board/Seagate/nas220/Kconfig"
 source "board/zyxel/nsa310s/Kconfig"
+source "board/alliedtelesis/SBx81LIFKW/Kconfig"
+source "board/alliedtelesis/SBx81LIFXCAT/Kconfig"
+source "board/Marvell/db-88f6281-bp/Kconfig"
 
 endif