aboutsummaryrefslogtreecommitdiffstats
path: root/src/mainboard
diff options
context:
space:
mode:
authorMatt DeVillier <matt.devillier@gmail.com>2015-04-30 01:19:16 -0500
committerPatrick Georgi <pgeorgi@google.com>2015-04-30 17:50:47 +0200
commit31769d99da7f97150ddc30174c7cc315ca6e7b1f (patch)
tree9ad50867ffea7f90491754e1638f3f6e4bc0241c /src/mainboard
parent40e2004abf4f763f38bfb12069b683554644734a (diff)
downloadcoreboot-31769d99da7f97150ddc30174c7cc315ca6e7b1f.tar.gz
coreboot-31769d99da7f97150ddc30174c7cc315ca6e7b1f.tar.xz
coreboot-31769d99da7f97150ddc30174c7cc315ca6e7b1f.zip
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> Reviewed-on: http://review.coreboot.org/10037 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/google/bolt/Kconfig2
-rw-r--r--src/mainboard/google/bolt/devicetree.cb4
-rw-r--r--src/mainboard/google/falco/Kconfig2
-rw-r--r--src/mainboard/google/falco/devicetree.cb4
-rw-r--r--src/mainboard/google/panther/Kconfig2
-rw-r--r--src/mainboard/google/panther/devicetree.cb4
-rw-r--r--src/mainboard/google/peppy/Kconfig2
-rw-r--r--src/mainboard/google/peppy/devicetree.cb4
-rw-r--r--src/mainboard/google/slippy/Kconfig2
-rw-r--r--src/mainboard/google/slippy/devicetree.cb4
-rw-r--r--src/mainboard/intel/baskingridge/Kconfig2
-rw-r--r--src/mainboard/intel/baskingridge/devicetree.cb4
12 files changed, 12 insertions, 24 deletions
diff --git a/src/mainboard/google/bolt/Kconfig b/src/mainboard/google/bolt/Kconfig
index c901b8f6d..1ec399e91 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 f514bb4ff..1d1eab52a 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 c836110f3..0f020f524 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 428a0609a..7a8e75787 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 6fdb46c30..f1721665d 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 d37b62226..2032fd426 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 05234d0eb..6affd3421 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 4c0d02d66..894d3ef90 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 48e58257b..2857c0a95 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 06ca93c9f..f50882cc6 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 485ff7567..b636e5bb6 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 a173aaa66..cd341d13f 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