14 files changed, 25 insertions, 56 deletions

diff --git a/src/cpu/amd/socket_940/Kconfig b/src/cpu/amd/socket_940/Kconfig
index 260d360faf..e477e1a643 100644
--- a/src/cpu/amd/socket_940/Kconfig
+++ b/src/cpu/amd/socket_940/Kconfig
@@ -1,19 +1,11 @@
 config CPU_AMD_SOCKET_940
 	bool
-	default false
+	default n
+	#Opteron K8 1G HT Support
+	select K8_HT_FREQ_1G_SUPPORT
+	select CPU_AMD_MODEL_FXX
 
 config K8_REV_F_SUPPORT
 	bool
 	default n
 	depends on CPU_AMD_SOCKET_940
-
-#Opteron K8 1G HT Support
-config K8_HT_FREQ_1G_SUPPORT
-	bool
-	default y
-	depends on CPU_AMD_SOCKET_940
-
-config CPU_AMD_MODEL_FXX
-	bool
-	default y
-	depends on CPU_AMD_SOCKET_940
diff --git a/src/cpu/amd/socket_AM2/Kconfig b/src/cpu/amd/socket_AM2/Kconfig
index 6e2cd1c84c..c030f79bef 100644
--- a/src/cpu/amd/socket_AM2/Kconfig
+++ b/src/cpu/amd/socket_AM2/Kconfig
@@ -1,23 +1,15 @@
 config CPU_AMD_SOCKET_AM2
 	bool
-	default false
+	default n
+	select K8_REV_F_SUPPORT
+	# Opteron K8 1G HT support
+	select K8_HT_FREQ_1G_SUPPORT
 
 config CPU_SOCKET_TYPE
 	hex
 	default 0x11
 	depends on CPU_AMD_SOCKET_AM2
 
-config K8_REV_F_SUPPORT
-	bool
-	default y
-	depends on CPU_AMD_SOCKET_AM2
-
-# Opteron K8 1G HT support
-config K8_HT_FREQ_1G_SUPPORT
-	bool
-	default y
-	depends on CPU_AMD_SOCKET_AM2
-
 # DDR2 and REG
 config DIMM_SUPPORT
 	hex
diff --git a/src/cpu/amd/socket_F/Kconfig b/src/cpu/amd/socket_F/Kconfig
index 4cf6eac654..c0aad0f167 100644
--- a/src/cpu/amd/socket_F/Kconfig
+++ b/src/cpu/amd/socket_F/Kconfig
@@ -1,23 +1,15 @@
 config CPU_AMD_SOCKET_F
 	bool
-	default false
+	default n
+	select K8_REV_F_SUPPORT
+	# Opteron K8 1G HT support
+	select K8_HT_FREQ_1G_SUPPORT
 
 config CPU_SOCKET_TYPE
 	hex
 	default 0x10
 	depends on CPU_AMD_SOCKET_F
 
-config K8_REV_F_SUPPORT
-	bool
-	default y
-	depends on CPU_AMD_SOCKET_F
-
-# Opteron K8 1G HT support
-config K8_HT_FREQ_1G_SUPPORT
-	bool
-	default y
-	depends on CPU_AMD_SOCKET_F
-
 # DDR2 and REG
 config DIMM_SUPPORT
 	hex
diff --git a/src/cpu/amd/socket_S1G1/Kconfig b/src/cpu/amd/socket_S1G1/Kconfig
index a894506a59..0e81cf5c95 100644
--- a/src/cpu/amd/socket_S1G1/Kconfig
+++ b/src/cpu/amd/socket_S1G1/Kconfig
@@ -1,22 +1,14 @@
 config CPU_AMD_SOCKET_S1G1
         bool
-	default false
-
-config K8_REV_F_SUPPORT
-	bool
-	default true
-	depends on CPU_AMD_SOCKET_S1G1
+	default n
+	select K8_REV_F_SUPPORT
+	select K8_HT_FREQ_1G_SUPPORT
 
 config CPU_SOCKET_TYPE
 	hex
 	default 0x12
 	depends on CPU_AMD_SOCKET_S1G1
 
-config K8_HT_FREQ_1G_SUPPORT
-	bool
-	default y
-	depends on CPU_AMD_SOCKET_S1G1
-
 #DDR2 and REG, S1G1
 config DIMM_SUPPORT
 	hex
diff --git a/src/cpu/emulation/qemu-x86/Kconfig b/src/cpu/emulation/qemu-x86/Kconfig
index 842fbfd3b4..47f564b0cc 100644
--- a/src/cpu/emulation/qemu-x86/Kconfig
+++ b/src/cpu/emulation/qemu-x86/Kconfig
@@ -1,4 +1,4 @@
 config CPU_EMULATION_QEMU_X86
 	bool
-	default false
+	default n
 
diff --git a/src/cpu/intel/ep80579/Kconfig b/src/cpu/intel/ep80579/Kconfig
index 213ce8c7f0..681a89f34f 100644
--- a/src/cpu/intel/ep80579/Kconfig
+++ b/src/cpu/intel/ep80579/Kconfig
@@ -1,3 +1,3 @@
 config CPU_INTEL_EP80579
 	bool
-	default false
+	default n
diff --git a/src/cpu/intel/socket_PGA370/Kconfig b/src/cpu/intel/socket_PGA370/Kconfig
index d7098b060b..cb677235ee 100644
--- a/src/cpu/intel/socket_PGA370/Kconfig
+++ b/src/cpu/intel/socket_PGA370/Kconfig
@@ -20,4 +20,4 @@
 
 config CPU_INTEL_SOCKET_PGA370
 	bool
-	default false
+	default n
diff --git a/src/cpu/intel/socket_mFCPGA478/Kconfig b/src/cpu/intel/socket_mFCPGA478/Kconfig
index 0f01535ecd..7d3c22af69 100644
--- a/src/cpu/intel/socket_mFCPGA478/Kconfig
+++ b/src/cpu/intel/socket_mFCPGA478/Kconfig
@@ -1,3 +1,3 @@
 config CPU_INTEL_SOCKET_MFCPGA478
 	bool
-	default false
+	default n
diff --git a/src/cpu/intel/socket_mPGA478/Kconfig b/src/cpu/intel/socket_mPGA478/Kconfig
index e16d51efd3..5cbf9e846b 100644
--- a/src/cpu/intel/socket_mPGA478/Kconfig
+++ b/src/cpu/intel/socket_mPGA478/Kconfig
@@ -1,5 +1,5 @@
 config CPU_INTEL_SOCKET_MPGA478
 	bool
-	default false
+	default n
 	select CPU_INTEL_MODEL_69X
 	select CPU_INTEL_MODEL_6DX
diff --git a/src/cpu/intel/socket_mPGA479M/Kconfig b/src/cpu/intel/socket_mPGA479M/Kconfig
index ca2113e915..ff13a039e5 100644
--- a/src/cpu/intel/socket_mPGA479M/Kconfig
+++ b/src/cpu/intel/socket_mPGA479M/Kconfig
@@ -1,5 +1,5 @@
 config CPU_INTEL_SOCKET_MPGA479M
 	bool
-	default false
+	default n
 	select CPU_INTEL_MODEL_69X
 	select CPU_INTEL_MODEL_6DX
diff --git a/src/cpu/intel/socket_mPGA603/Kconfig b/src/cpu/intel/socket_mPGA603/Kconfig
index 460f3c59eb..6199af0b46 100644
--- a/src/cpu/intel/socket_mPGA603/Kconfig
+++ b/src/cpu/intel/socket_mPGA603/Kconfig
@@ -1,6 +1,6 @@
 config CPU_INTEL_SOCKET_MPGA603
 	bool
-	default false
+	default n
 	select CPU_INTEL_MODEL_F0X
 	select CPU_INTEL_MODEL_F1X
 	select CPU_INTEL_MODEL_F2X
diff --git a/src/cpu/intel/socket_mPGA604/Kconfig b/src/cpu/intel/socket_mPGA604/Kconfig
index 445ffeb13f..3e98150ba5 100644
--- a/src/cpu/intel/socket_mPGA604/Kconfig
+++ b/src/cpu/intel/socket_mPGA604/Kconfig
@@ -1,6 +1,6 @@
 config CPU_INTEL_SOCKET_MPGA604
 	bool
-	default false
+	default n
 	select CPU_INTEL_MODEL_F2X
 	select CPU_INTEL_MODEL_F3X
 	select CPU_INTEL_MODEL_F4X
diff --git a/src/mainboard/intel/xe7501devkit/Makefile.inc b/src/mainboard/intel/xe7501devkit/Makefile.inc
index a064b3dd46..0102b60f9b 100644
--- a/src/mainboard/intel/xe7501devkit/Makefile.inc
+++ b/src/mainboard/intel/xe7501devkit/Makefile.inc
@@ -1,7 +1,7 @@
 ROMCCFLAGS := -mcpu=p4
 obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi_tables.o
 ifeq ($(CONFIG_PCI_ROM_RUN),y)
-	ifeq ($(CONFIG_PCI_ROM_RUN),y)
+	ifeq ($(CONFIG_CONSOLE_VGA),y)
 		obj-y += vgarom.o
 	else
 		obj-y += no_vgarom.o
diff --git a/src/northbridge/intel/i440bx/Kconfig b/src/northbridge/intel/i440bx/Kconfig
index fe7124764f..b9ff5a4228 100644
--- a/src/northbridge/intel/i440bx/Kconfig
+++ b/src/northbridge/intel/i440bx/Kconfig
@@ -25,4 +25,5 @@ config NORTHBRIDGE_INTEL_I440BX
 config HAVE_HIGH_TABLES
 	bool
 	default y
+	depends on NORTHBRIDGE_INTEL_I440BX