rockchip: rk3288: move SOC setting into arch_cpu_init()

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

diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
index 1261885dad775b680a2795336b31d83cf8e29297..2f68092f825c34d62c1786119cdca68a81a56962 100644 (file)
--- a/arch/arm/mach-kirkwood/Kconfig
+++ b/arch/arm/mach-kirkwood/Kconfig
@@ -7,15 +7,12 @@ choice
 config TARGET_OPENRD
        bool "Marvell OpenRD Board"
 
-config TARGET_MV88F6281GTW_GE
-       bool "MV88f6281GTW_GE Board"
-
-config TARGET_RD6281A
-       bool "RD6281A Board"
-
 config TARGET_DREAMPLUG
        bool "DreamPlug Board"
 
+config TARGET_DS109
+       bool "Synology DS109"
+
 config TARGET_GURUPLUG
        bool "GuruPlug Board"
 
@@ -34,11 +31,9 @@ config TARGET_DNS325
 config TARGET_ICONNECT
        bool "iconnect Board"
 
-config TARGET_TK71
-       bool "TK71 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"
@@ -46,9 +41,6 @@ config TARGET_NET2BIG_V2
 config TARGET_NETSPACE_V2
        bool "LaCie netspace_v2 Board"
 
-config TARGET_WIRELESS_SPACE
-       bool "LaCie Wireless_space Board"
-
 config TARGET_IB62X0
        bool "ib62x0 Board"
 
@@ -61,29 +53,42 @@ config TARGET_GOFLEXHOME
 config TARGET_NAS220
        bool "BlackArmor 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
        default "kirkwood"
 
 source "board/Marvell/openrd/Kconfig"
-source "board/Marvell/mv88f6281gtw_ge/Kconfig"
-source "board/Marvell/rd6281a/Kconfig"
 source "board/Marvell/dreamplug/Kconfig"
+source "board/Synology/ds109/Kconfig"
 source "board/Marvell/guruplug/Kconfig"
 source "board/Marvell/sheevaplug/Kconfig"
 source "board/buffalo/lsxl/Kconfig"
 source "board/cloudengines/pogo_e02/Kconfig"
 source "board/d-link/dns325/Kconfig"
 source "board/iomega/iconnect/Kconfig"
-source "board/karo/tk71/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/LaCie/wireless_space/Kconfig"
 source "board/raidsonic/ib62x0/Kconfig"
 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