3 files changed, 26 insertions, 30 deletions

diff --git a/src/mainboard/jetway/Kconfig b/src/mainboard/jetway/Kconfig
index dd631da11b..80236650ab 100644
--- a/src/mainboard/jetway/Kconfig
+++ b/src/mainboard/jetway/Kconfig
@@ -1,8 +1,20 @@
+if VENDOR_JETWAY
+
 choice
 	prompt "Mainboard model"
-	depends on VENDOR_JETWAY
+
+config BOARD_JETWAY_J7F24
+	bool "J7F24"
+config BOARD_JETWAY_PA78VM5
+	bool "PA78VM5 (Fam10)"
+
+endchoice
 
 source "src/mainboard/jetway/j7f24/Kconfig"
 source "src/mainboard/jetway/pa78vm5/Kconfig"
-endchoice
 
+config MAINBOARD_VENDOR
+	string
+	default "Jetway"
+
+endif # VENDOR_JETWAY
diff --git a/src/mainboard/jetway/j7f24/Kconfig b/src/mainboard/jetway/j7f24/Kconfig
index 5742a5d298..e8ea4489b9 100644
--- a/src/mainboard/jetway/j7f24/Kconfig
+++ b/src/mainboard/jetway/j7f24/Kconfig
@@ -1,6 +1,8 @@
 # FIXME: There is no such board, "J7F24" is probably too generic and/or wrong.
-config BOARD_JETWAY_J7F24
-	bool "J7F24"
+if BOARD_JETWAY_J7F24
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_VIA_C7
 	select NORTHBRIDGE_VIA_CN700
@@ -13,19 +15,17 @@ config BOARD_JETWAY_J7F24
 config MAINBOARD_DIR
 	string
 	default jetway/j7f24
-	depends on BOARD_JETWAY_J7F24
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "J7f24"
-	depends on BOARD_JETWAY_J7F24
 
 config RAMBASE
 	hex
 	default 0x4000
-	depends on BOARD_JETWAY_J7F24
 
 config IRQ_SLOT_COUNT
 	int
 	default 10
-	depends on BOARD_JETWAY_J7F24
+
+endif # BOARD_JETWAY_J7F24
diff --git a/src/mainboard/jetway/pa78vm5/Kconfig b/src/mainboard/jetway/pa78vm5/Kconfig
index 722fee7ec5..23ad721c9c 100644
--- a/src/mainboard/jetway/pa78vm5/Kconfig
+++ b/src/mainboard/jetway/pa78vm5/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_JETWAY_PA78VM5
-	bool "PA78VM5 (Fam10)"
+if BOARD_JETWAY_PA78VM5
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_AM2R2
 	select NORTHBRIDGE_AMD_AMDFAM10
@@ -27,99 +29,81 @@ config BOARD_JETWAY_PA78VM5
 config MAINBOARD_DIR
 	string
 	default jetway/pa78vm5
-	depends on BOARD_JETWAY_PA78VM5
 
 config APIC_ID_OFFSET
 	hex
 	default 0x0
-	depends on BOARD_JETWAY_PA78VM5
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "PA78VM5 (Fam10)"
-	depends on BOARD_JETWAY_PA78VM5
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_JETWAY_PA78VM5
 
 config MAX_CPUS
 	int
 	default 8
-	depends on BOARD_JETWAY_PA78VM5
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 2
-	depends on BOARD_JETWAY_PA78VM5
 
 config HW_MEM_HOLE_SIZE_AUTO_INC
 	bool
 	default n
-	depends on BOARD_JETWAY_PA78VM5
 
 config MEM_TRAIN_SEQ
 	int
 	default 2
-	depends on BOARD_JETWAY_PA78VM5
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 1
-	depends on BOARD_JETWAY_PA78VM5
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x1
-	depends on BOARD_JETWAY_PA78VM5
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x0
-	depends on BOARD_JETWAY_PA78VM5
 
 config IRQ_SLOT_COUNT
 	int
 	default 11
-	depends on BOARD_JETWAY_PA78VM5
 
 config AMD_UCODE_PATCH_FILE
 	string
 	default "mc_patch_010000b6.h"
-	depends on BOARD_JETWAY_PA78VM5
 
 config RAMTOP
 	hex
 	default 0x2000000
-	depends on BOARD_JETWAY_PA78VM5
 
 config HEAP_SIZE
 	hex
 	default 0xc0000
-	depends on BOARD_JETWAY_PA78VM5
 
 config ACPI_SSDTX_NUM
 	int
 	default 0
-	depends on BOARD_JETWAY_PA78VM5
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x3060
-	depends on BOARD_JETWAY_PA78VM5
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
 	default 0x1022
-	depends on BOARD_JETWAY_PA78VM5
 
 config RAMBASE
 	hex
 	default 0x200000
-	depends on BOARD_JETWAY_PA78VM5
 
 config COMPRESS
 	hex
 	default 0
-	depends on BOARD_JETWAY_PA78VM5
+
+endif # BOARD_JETWAY_PA78VM5