14 files changed, 22 insertions, 24 deletions

diff --git a/src/cpu/intel/haswell/Kconfig b/src/cpu/intel/haswell/Kconfig
index 741b6770ec..00fb1d7c57 100644
--- a/src/cpu/intel/haswell/Kconfig
+++ b/src/cpu/intel/haswell/Kconfig
@@ -12,6 +12,8 @@ config CPU_SPECIFIC_OPTIONS
 	select ARCH_RAMSTAGE_X86_32
 	select BACKUP_DEFAULT_SMM_REGION
 	select SMP
+	select MMX
+	select SSE
 	select SSE2
 	select UDELAY_TSC
 	select TSC_CONSTANT_RATE
diff --git a/src/cpu/intel/haswell/Makefile.inc b/src/cpu/intel/haswell/Makefile.inc
index 82d3beccdd..0db047565c 100644
--- a/src/cpu/intel/haswell/Makefile.inc
+++ b/src/cpu/intel/haswell/Makefile.inc
@@ -14,3 +14,11 @@ smm-$(CONFIG_HAVE_SMI_HANDLER) += tsc_freq.c
 smm-$(CONFIG_MONOTONIC_TIMER_MSR) += monotonic_timer.c
 
 cpu_incs += $(src)/cpu/intel/haswell/cache_as_ram.inc
+
+subdirs-y += ../../x86/tsc
+subdirs-y += ../../x86/mtrr
+subdirs-y += ../../x86/lapic
+subdirs-y += ../../x86/cache
+subdirs-y += ../../x86/smm
+subdirs-y += ../microcode
+subdirs-y += ../turbo
diff --git a/src/mainboard/google/bolt/Kconfig b/src/mainboard/google/bolt/Kconfig
index c901b8f6dd..1ec399e910 100644
--- a/src/mainboard/google/bolt/Kconfig
+++ b/src/mainboard/google/bolt/Kconfig
@@ -2,7 +2,7 @@ if BOARD_GOOGLE_BOLT
 
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
-	select CPU_INTEL_SOCKET_RPGA989
+	select CPU_INTEL_HASWELL
 	select NORTHBRIDGE_INTEL_HASWELL
 	select SOUTHBRIDGE_INTEL_LYNXPOINT
 	select INTEL_LYNXPOINT_LP
diff --git a/src/mainboard/google/bolt/devicetree.cb b/src/mainboard/google/bolt/devicetree.cb
index f514bb4ff7..1d1eab52a9 100644
--- a/src/mainboard/google/bolt/devicetree.cb
+++ b/src/mainboard/google/bolt/devicetree.cb
@@ -22,10 +22,8 @@ chip northbridge/intel/haswell
 	register "gpu_panel_power_backlight_off_delay" = "2000"	# 200ms
 
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_rPGA989
-			device lapic 0 on end
-		end
 		chip cpu/intel/haswell
+			device lapic 0 on end
 			# Magic APIC ID to locate this chip
 			device lapic 0xACAC off end
 
diff --git a/src/mainboard/google/falco/Kconfig b/src/mainboard/google/falco/Kconfig
index c836110f35..0f020f5248 100644
--- a/src/mainboard/google/falco/Kconfig
+++ b/src/mainboard/google/falco/Kconfig
@@ -3,7 +3,7 @@ if BOARD_GOOGLE_FALCO
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select SYSTEM_TYPE_LAPTOP
-	select CPU_INTEL_SOCKET_RPGA989
+	select CPU_INTEL_HASWELL
 	select NORTHBRIDGE_INTEL_HASWELL
 	select SOUTHBRIDGE_INTEL_LYNXPOINT
 	select INTEL_LYNXPOINT_LP
diff --git a/src/mainboard/google/falco/devicetree.cb b/src/mainboard/google/falco/devicetree.cb
index 428a0609aa..7a8e757877 100644
--- a/src/mainboard/google/falco/devicetree.cb
+++ b/src/mainboard/google/falco/devicetree.cb
@@ -22,10 +22,8 @@ chip northbridge/intel/haswell
 	register "gpu_panel_power_backlight_off_delay" = "2100"	# 210ms (T6)
 
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_rPGA989
-			device lapic 0 on end
-		end
 		chip cpu/intel/haswell
+			device lapic 0 on end
 			# Magic APIC ID to locate this chip
 			device lapic 0xACAC off end
 
diff --git a/src/mainboard/google/panther/Kconfig b/src/mainboard/google/panther/Kconfig
index 6fdb46c303..f1721665d9 100644
--- a/src/mainboard/google/panther/Kconfig
+++ b/src/mainboard/google/panther/Kconfig
@@ -2,7 +2,7 @@ if BOARD_GOOGLE_PANTHER
 
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
-	select CPU_INTEL_SOCKET_RPGA989
+	select CPU_INTEL_HASWELL
 	select NORTHBRIDGE_INTEL_HASWELL
 	select SOUTHBRIDGE_INTEL_LYNXPOINT
 	select INTEL_LYNXPOINT_LP
diff --git a/src/mainboard/google/panther/devicetree.cb b/src/mainboard/google/panther/devicetree.cb
index d37b622268..2032fd426b 100644
--- a/src/mainboard/google/panther/devicetree.cb
+++ b/src/mainboard/google/panther/devicetree.cb
@@ -10,10 +10,8 @@ chip northbridge/intel/haswell
 	register "gpu_dp_b_hotplug" = "0x06"
 
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_rPGA989
-			device lapic 0 on end
-		end
 		chip cpu/intel/haswell
+			device lapic 0 on end
 			# Magic APIC ID to locate this chip
 			device lapic 0xACAC off end
 
diff --git a/src/mainboard/google/peppy/Kconfig b/src/mainboard/google/peppy/Kconfig
index 05234d0eb2..6affd34210 100644
--- a/src/mainboard/google/peppy/Kconfig
+++ b/src/mainboard/google/peppy/Kconfig
@@ -3,7 +3,7 @@ if BOARD_GOOGLE_PEPPY
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select SYSTEM_TYPE_LAPTOP
-	select CPU_INTEL_SOCKET_RPGA989
+	select CPU_INTEL_HASWELL
 	select NORTHBRIDGE_INTEL_HASWELL
 	select SOUTHBRIDGE_INTEL_LYNXPOINT
 	select INTEL_LYNXPOINT_LP
diff --git a/src/mainboard/google/peppy/devicetree.cb b/src/mainboard/google/peppy/devicetree.cb
index 4c0d02d662..894d3ef900 100644
--- a/src/mainboard/google/peppy/devicetree.cb
+++ b/src/mainboard/google/peppy/devicetree.cb
@@ -22,10 +22,8 @@ chip northbridge/intel/haswell
 	register "gpu_panel_power_backlight_off_delay" = "2100"	# 210ms
 
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_rPGA989
-			device lapic 0 on end
-		end
 		chip cpu/intel/haswell
+			device lapic 0 on end
 			# Magic APIC ID to locate this chip
 			device lapic 0xACAC off end
 
diff --git a/src/mainboard/google/slippy/Kconfig b/src/mainboard/google/slippy/Kconfig
index 48e58257b7..2857c0a95f 100644
--- a/src/mainboard/google/slippy/Kconfig
+++ b/src/mainboard/google/slippy/Kconfig
@@ -2,7 +2,7 @@ if BOARD_GOOGLE_SLIPPY
 
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
-	select CPU_INTEL_SOCKET_RPGA989
+	select CPU_INTEL_HASWELL
 	select NORTHBRIDGE_INTEL_HASWELL
 	select SOUTHBRIDGE_INTEL_LYNXPOINT
 	select INTEL_LYNXPOINT_LP
diff --git a/src/mainboard/google/slippy/devicetree.cb b/src/mainboard/google/slippy/devicetree.cb
index 06ca93c9f4..f50882cc6d 100644
--- a/src/mainboard/google/slippy/devicetree.cb
+++ b/src/mainboard/google/slippy/devicetree.cb
@@ -22,10 +22,8 @@ chip northbridge/intel/haswell
 	register "gpu_panel_power_backlight_off_delay" = "2100"	# 210ms
 
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_rPGA989
-			device lapic 0 on end
-		end
 		chip cpu/intel/haswell
+			device lapic 0 on end
 			# Magic APIC ID to locate this chip
 			device lapic 0xACAC off end
 
diff --git a/src/mainboard/intel/baskingridge/Kconfig b/src/mainboard/intel/baskingridge/Kconfig
index 485ff75672..b636e5bb69 100644
--- a/src/mainboard/intel/baskingridge/Kconfig
+++ b/src/mainboard/intel/baskingridge/Kconfig
@@ -2,7 +2,7 @@ if BOARD_INTEL_BASKING_RIDGE
 
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
-	select CPU_INTEL_SOCKET_RPGA989
+	select CPU_INTEL_HASWELL
 	select NORTHBRIDGE_INTEL_HASWELL
 	select SOUTHBRIDGE_INTEL_LYNXPOINT
 	select BOARD_ROMSIZE_KB_8192
diff --git a/src/mainboard/intel/baskingridge/devicetree.cb b/src/mainboard/intel/baskingridge/devicetree.cb
index a173aaa662..cd341d13f8 100644
--- a/src/mainboard/intel/baskingridge/devicetree.cb
+++ b/src/mainboard/intel/baskingridge/devicetree.cb
@@ -10,10 +10,8 @@ chip northbridge/intel/haswell
 	register "gpu_dp_b_hotplug" = "0x06"
 
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_rPGA989
-			device lapic 0 on end
-		end
 		chip cpu/intel/haswell
+			device lapic 0 on end
 			# Magic APIC ID to locate this chip
 			device lapic 0xACAC off end