Matt DeVillier (matt.devillier@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10037
-gerrit
commit 652d421834e9e61494bcdd2d80f152aaa907d319 Author: Matt DeVillier matt.devillier@gmail.com Date: Thu Apr 30 01:19:16 2015 -0500
cpu/intel/haswell: remove dependency on socket_rpga989
Remove dependency of Haswell on cpu/intel/socket_rpga989 code, which is a carry-over from Sandy Bridge/Ivy Bridge and older coreboot conventions where features were structured around socket types.
Add CPU-specific options to Kconfig and required subdirs to Makefile.inc which are curently included with socket_rpga989.
TEST=successfully built and booted on google/panther
Change-Id: Ic788e2928df107d11ea2d2eca7613490aaed395c Signed-off-by: Matt DeVillier matt.devillier@gmail.com --- src/cpu/intel/haswell/Kconfig | 2 ++ src/cpu/intel/haswell/Makefile.inc | 8 ++++++++ src/mainboard/google/bolt/Kconfig | 2 +- src/mainboard/google/bolt/devicetree.cb | 4 +--- src/mainboard/google/falco/Kconfig | 2 +- src/mainboard/google/falco/devicetree.cb | 4 +--- src/mainboard/google/panther/Kconfig | 2 +- src/mainboard/google/panther/devicetree.cb | 8 +++----- src/mainboard/google/peppy/Kconfig | 2 +- src/mainboard/google/peppy/devicetree.cb | 4 +--- src/mainboard/google/slippy/Kconfig | 2 +- src/mainboard/google/slippy/devicetree.cb | 4 +--- src/mainboard/intel/baskingridge/Kconfig | 2 +- src/mainboard/intel/baskingridge/devicetree.cb | 4 +--- 14 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/src/cpu/intel/haswell/Kconfig b/src/cpu/intel/haswell/Kconfig index 741b677..00fb1d7 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 82d3bec..0db0475 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 c901b8f..1ec399e 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 f514bb4..1d1eab5 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 c836110..0f020f5 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 428a060..7a8e757 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 6fdb46c..f172166 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 d37b622..ad39edc 100644 --- a/src/mainboard/google/panther/devicetree.cb +++ b/src/mainboard/google/panther/devicetree.cb @@ -10,11 +10,9 @@ 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 # Magic APIC ID to locate this chip + device lapic 0 on end device lapic 0xACAC off end
register "c1_battery" = "2" # ACPI(C1) = MWAIT(C1E) @@ -123,12 +121,12 @@ chip northbridge/intel/haswell io 0x60 = 0x720 io 0x62 = 0x730 end - device pnp 2e.5 on + device pnp 2e.5 off io 0x60 = 0x60 io 0x62 = 0x64 irq 0x70 = 1 end # Keyboard - device pnp 2e.6 on + device pnp 2e.6 off irq 0x70 = 12 end # Mouse device pnp 2e.a off end # IR diff --git a/src/mainboard/google/peppy/Kconfig b/src/mainboard/google/peppy/Kconfig index 05234d0..6affd34 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 4c0d02d..894d3ef 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 48e5825..2857c0a 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 06ca93c..f50882c 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 485ff75..b636e5b 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 a173aaa..cd341d1 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