diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
index cb4e9f2..c060cc8 100644
--- a/arch/arm/mach-kirkwood/Kconfig
+++ b/arch/arm/mach-kirkwood/Kconfig
@@ -1,66 +1,115 @@
 if ARCH_KIRKWOOD
 
+config FEROCEON_88FR131
+	bool
+
+config KW88F6192
+	bool
+
+config KW88F6281
+	bool
+
+config SHEEVA_88SV131
+	bool
+
 choice
 	prompt "Marvell Kirkwood board select"
 	optional
 
 config TARGET_OPENRD
 	bool "Marvell OpenRD Board"
+	select KW88F6281
+	select SHEEVA_88SV131
 
 config TARGET_DREAMPLUG
 	bool "DreamPlug Board"
+	select KW88F6281
+	select SHEEVA_88SV131
 
 config TARGET_DS109
 	bool "Synology DS109"
+	select KW88F6281
+	select SHEEVA_88SV131
 
 config TARGET_GURUPLUG
 	bool "GuruPlug Board"
+	select KW88F6281
+	select SHEEVA_88SV131
 
 config TARGET_SHEEVAPLUG
 	bool "SheevaPlug Board"
+	select FEROCEON_88FR131
+	select KW88F6281
 
 config TARGET_LSXL
 	bool "lsxl Board"
+	select FEROCEON_88FR131
+	select KW88F6281
 
 config TARGET_POGO_E02
 	bool "pogo_e02 Board"
+	select FEROCEON_88FR131
+	select KW88F6281
 
 config TARGET_DNS325
 	bool "dns325 Board"
+	select FEROCEON_88FR131
+	select KW88F6281
 
 config TARGET_ICONNECT
 	bool "iconnect Board"
+	select FEROCEON_88FR131
+	select KW88F6281
 
 config TARGET_KM_KIRKWOOD
 	bool "KM Kirkwood Board"
+	select FEROCEON_88FR131
+	select KW88F6281
 	select VENDOR_KM
 
 config TARGET_NET2BIG_V2
 	bool "LaCie 2Big Network v2 NAS Board"
+	select FEROCEON_88FR131
+	select KW88F6281
 
 config TARGET_NETSPACE_V2
 	bool "LaCie netspace_v2 Board"
+	select FEROCEON_88FR131
 
 config TARGET_IB62X0
 	bool "ib62x0 Board"
+	select FEROCEON_88FR131
+	select KW88F6281
 
 config TARGET_DOCKSTAR
 	bool "Dockstar Board"
+	select FEROCEON_88FR131
+	select KW88F6281
 
 config TARGET_GOFLEXHOME
 	bool "GoFlex Home Board"
+	select FEROCEON_88FR131
+	select KW88F6281
 
 config TARGET_NAS220
 	bool "BlackArmor NAS220"
+	select FEROCEON_88FR131
+	select KW88F6192
 
 config TARGET_NSA310S
 	bool "Zyxel NSA310S"
+	select FEROCEON_88FR131
+	select KW88F6192
 
 config TARGET_SBx81LIFKW
 	bool "Allied Telesis SBx81GS24/SBx81GT40/SBx81XS6/SBx81XS16"
+	select FEROCEON_88FR131
+	select KW88F6281
 
 config TARGET_SBx81LIFXCAT
 	bool "Allied Telesis SBx81GP24/SBx81GT24"
+	select FEROCEON_88FR131
+	select KW88F6281
 
 endchoice