summaryrefslogtreecommitdiff
path: root/src/mainboard/hp
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2019-01-21 17:55:02 +0100
committerPatrick Georgi <pgeorgi@google.com>2019-01-24 13:39:19 +0000
commit7e6946a74c714ff109c35d97001b22c9e868aaea (patch)
tree98899e89dc00f8e5504f06d84eb6dc44227b4c80 /src/mainboard/hp
parentd6c15d0c8c39015994a180da82c3e6f9538b42de (diff)
cpu/intel/model_206ax: Remove the notion of sockets
With the memory controller the separate sockets becomes a useless distinction. They all used the same code anyway. UNTESTED: This also updates autoport. Change-Id: I044d434a5b8fca75db9eb193c7ffc60f3c78212b Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-on: https://review.coreboot.org/c/31031 Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr> Reviewed-by: Tristan Corrick <tristan@corrick.kiwi> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard/hp')
-rw-r--r--src/mainboard/hp/2570p/Kconfig1
-rw-r--r--src/mainboard/hp/2570p/devicetree.cb4
-rw-r--r--src/mainboard/hp/2760p/Kconfig1
-rw-r--r--src/mainboard/hp/2760p/devicetree.cb4
-rw-r--r--src/mainboard/hp/8460p/Kconfig1
-rw-r--r--src/mainboard/hp/8460p/devicetree.cb4
-rw-r--r--src/mainboard/hp/8470p/Kconfig1
-rw-r--r--src/mainboard/hp/8470p/devicetree.cb4
-rw-r--r--src/mainboard/hp/8770w/Kconfig1
-rw-r--r--src/mainboard/hp/8770w/devicetree.cb4
-rw-r--r--src/mainboard/hp/compaq_8200_elite_sff/Kconfig1
-rw-r--r--src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb4
-rw-r--r--src/mainboard/hp/folio_9470m/Kconfig1
-rw-r--r--src/mainboard/hp/folio_9470m/devicetree.cb4
-rw-r--r--src/mainboard/hp/revolve_810_g1/Kconfig1
-rw-r--r--src/mainboard/hp/revolve_810_g1/devicetree.cb4
16 files changed, 8 insertions, 32 deletions
diff --git a/src/mainboard/hp/2570p/Kconfig b/src/mainboard/hp/2570p/Kconfig
index 4d9d120f60..03a059821c 100644
--- a/src/mainboard/hp/2570p/Kconfig
+++ b/src/mainboard/hp/2570p/Kconfig
@@ -18,7 +18,6 @@ if BOARD_HP_2570P
config BOARD_SPECIFIC_OPTIONS
def_bool y
select BOARD_ROMSIZE_KB_16384
- select CPU_INTEL_SOCKET_RPGA989
select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES
select INTEL_INT15
diff --git a/src/mainboard/hp/2570p/devicetree.cb b/src/mainboard/hp/2570p/devicetree.cb
index e1f0cca01d..585d61d134 100644
--- a/src/mainboard/hp/2570p/devicetree.cb
+++ b/src/mainboard/hp/2570p/devicetree.cb
@@ -31,9 +31,6 @@ chip northbridge/intel/sandybridge
register "gpu_panel_power_up_delay" = "300"
register "gpu_pch_backlight" = "0x0d9c0d9c"
device cpu_cluster 0x0 on
- chip cpu/intel/socket_rPGA989
- device lapic 0x0 on end
- end
chip cpu/intel/model_206ax
register "c1_acpower" = "1"
register "c1_battery" = "1"
@@ -41,6 +38,7 @@ chip northbridge/intel/sandybridge
register "c2_battery" = "3"
register "c3_acpower" = "5"
register "c3_battery" = "5"
+ device lapic 0x0 on end
device lapic 0xacac off end
end
end
diff --git a/src/mainboard/hp/2760p/Kconfig b/src/mainboard/hp/2760p/Kconfig
index c698df643d..9b3f78b124 100644
--- a/src/mainboard/hp/2760p/Kconfig
+++ b/src/mainboard/hp/2760p/Kconfig
@@ -18,7 +18,6 @@ if BOARD_HP_2760P
config BOARD_SPECIFIC_OPTIONS
def_bool y
select BOARD_ROMSIZE_KB_8192
- select CPU_INTEL_SOCKET_RPGA989
select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES
select INTEL_INT15
diff --git a/src/mainboard/hp/2760p/devicetree.cb b/src/mainboard/hp/2760p/devicetree.cb
index 15f8943318..515d20f761 100644
--- a/src/mainboard/hp/2760p/devicetree.cb
+++ b/src/mainboard/hp/2760p/devicetree.cb
@@ -31,9 +31,6 @@ chip northbridge/intel/sandybridge
register "gpu_panel_power_up_delay" = "300"
register "gpu_pch_backlight" = "0x02880288"
device cpu_cluster 0x0 on
- chip cpu/intel/socket_rPGA989
- device lapic 0x0 on end
- end
chip cpu/intel/model_206ax
register "c1_acpower" = "1"
register "c1_battery" = "1"
@@ -41,6 +38,7 @@ chip northbridge/intel/sandybridge
register "c2_battery" = "3"
register "c3_acpower" = "5"
register "c3_battery" = "5"
+ device lapic 0x0 on end
device lapic 0xacac off end
end
end
diff --git a/src/mainboard/hp/8460p/Kconfig b/src/mainboard/hp/8460p/Kconfig
index a86cf8fd6b..a4b0a4a6b6 100644
--- a/src/mainboard/hp/8460p/Kconfig
+++ b/src/mainboard/hp/8460p/Kconfig
@@ -18,7 +18,6 @@ if BOARD_HP_8460P
config BOARD_SPECIFIC_OPTIONS
def_bool y
select BOARD_ROMSIZE_KB_8192
- select CPU_INTEL_SOCKET_RPGA989
select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES
select INTEL_INT15
diff --git a/src/mainboard/hp/8460p/devicetree.cb b/src/mainboard/hp/8460p/devicetree.cb
index 2964cc8166..79259b4def 100644
--- a/src/mainboard/hp/8460p/devicetree.cb
+++ b/src/mainboard/hp/8460p/devicetree.cb
@@ -31,9 +31,6 @@ chip northbridge/intel/sandybridge
register "gpu_panel_power_up_delay" = "300"
register "gpu_pch_backlight" = "0x02880288"
device cpu_cluster 0x0 on
- chip cpu/intel/socket_rPGA989
- device lapic 0x0 on end
- end
chip cpu/intel/model_206ax
register "c1_acpower" = "1"
register "c1_battery" = "1"
@@ -41,6 +38,7 @@ chip northbridge/intel/sandybridge
register "c2_battery" = "3"
register "c3_acpower" = "5"
register "c3_battery" = "5"
+ device lapic 0x0 on end
device lapic 0xacac off end
end
end
diff --git a/src/mainboard/hp/8470p/Kconfig b/src/mainboard/hp/8470p/Kconfig
index b73aae2c9b..2dafbe2dd6 100644
--- a/src/mainboard/hp/8470p/Kconfig
+++ b/src/mainboard/hp/8470p/Kconfig
@@ -18,7 +18,6 @@ if BOARD_HP_8470P
config BOARD_SPECIFIC_OPTIONS
def_bool y
select BOARD_ROMSIZE_KB_16384
- select CPU_INTEL_SOCKET_RPGA989
select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES
select INTEL_INT15
diff --git a/src/mainboard/hp/8470p/devicetree.cb b/src/mainboard/hp/8470p/devicetree.cb
index cf55d888a1..2a115cc62a 100644
--- a/src/mainboard/hp/8470p/devicetree.cb
+++ b/src/mainboard/hp/8470p/devicetree.cb
@@ -31,9 +31,6 @@ chip northbridge/intel/sandybridge
register "gpu_panel_power_up_delay" = "300"
register "gpu_pch_backlight" = "0x0d9c0d9c"
device cpu_cluster 0x0 on
- chip cpu/intel/socket_rPGA989
- device lapic 0x0 on end
- end
chip cpu/intel/model_206ax
register "c1_acpower" = "1"
register "c1_battery" = "1"
@@ -41,6 +38,7 @@ chip northbridge/intel/sandybridge
register "c2_battery" = "3"
register "c3_acpower" = "5"
register "c3_battery" = "5"
+ device lapic 0x0 on end
device lapic 0xacac off end
end
end
diff --git a/src/mainboard/hp/8770w/Kconfig b/src/mainboard/hp/8770w/Kconfig
index 1ab9c60eab..ad07c8ca4e 100644
--- a/src/mainboard/hp/8770w/Kconfig
+++ b/src/mainboard/hp/8770w/Kconfig
@@ -19,7 +19,6 @@ if BOARD_HP_8770W
config BOARD_SPECIFIC_OPTIONS
def_bool y
select BOARD_ROMSIZE_KB_16384
- select CPU_INTEL_SOCKET_RPGA989
select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES
select INTEL_INT15
diff --git a/src/mainboard/hp/8770w/devicetree.cb b/src/mainboard/hp/8770w/devicetree.cb
index eb9ae22592..7d74c940de 100644
--- a/src/mainboard/hp/8770w/devicetree.cb
+++ b/src/mainboard/hp/8770w/devicetree.cb
@@ -17,9 +17,6 @@
chip northbridge/intel/sandybridge
device cpu_cluster 0x0 on
- chip cpu/intel/socket_rPGA989
- device lapic 0x0 on end
- end
chip cpu/intel/model_206ax
register "c1_acpower" = "1"
register "c1_battery" = "1"
@@ -27,6 +24,7 @@ chip northbridge/intel/sandybridge
register "c2_battery" = "3"
register "c3_acpower" = "5"
register "c3_battery" = "5"
+ device lapic 0x0 on end
device lapic 0xacac off end
end
end
diff --git a/src/mainboard/hp/compaq_8200_elite_sff/Kconfig b/src/mainboard/hp/compaq_8200_elite_sff/Kconfig
index 48132a821e..79e18a8756 100644
--- a/src/mainboard/hp/compaq_8200_elite_sff/Kconfig
+++ b/src/mainboard/hp/compaq_8200_elite_sff/Kconfig
@@ -3,7 +3,6 @@ if BOARD_HEWLETT_PACKARD_HP_COMPAQ_8200_ELITE_SFF_PC
config BOARD_SPECIFIC_OPTIONS
def_bool y
select BOARD_ROMSIZE_KB_8192
- select CPU_INTEL_SOCKET_LGA1155
select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES
select INTEL_INT15
diff --git a/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb b/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb
index 9d79a08a21..95659beaf5 100644
--- a/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb
+++ b/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb
@@ -24,9 +24,6 @@ chip northbridge/intel/sandybridge
register "gpu_dp_d_hotplug" = "0"
device cpu_cluster 0x0 on
- chip cpu/intel/socket_LGA1155
- device lapic 0x0 on end
- end
chip cpu/intel/model_206ax
register "c1_acpower" = "1"
register "c1_battery" = "1"
@@ -34,6 +31,7 @@ chip northbridge/intel/sandybridge
register "c2_battery" = "3"
register "c3_acpower" = "5"
register "c3_battery" = "5"
+ device lapic 0x0 on end
device lapic 0xacac off end
end
end
diff --git a/src/mainboard/hp/folio_9470m/Kconfig b/src/mainboard/hp/folio_9470m/Kconfig
index 7b3642efd6..c4ae48db85 100644
--- a/src/mainboard/hp/folio_9470m/Kconfig
+++ b/src/mainboard/hp/folio_9470m/Kconfig
@@ -3,7 +3,6 @@ if BOARD_HP_FOLIO_9470M
config BOARD_SPECIFIC_OPTIONS
def_bool y
select BOARD_ROMSIZE_KB_16384
- select CPU_INTEL_SOCKET_RPGA989
select EC_HP_KBC1126
select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES
diff --git a/src/mainboard/hp/folio_9470m/devicetree.cb b/src/mainboard/hp/folio_9470m/devicetree.cb
index fd81a0d542..5d4e5b8ea2 100644
--- a/src/mainboard/hp/folio_9470m/devicetree.cb
+++ b/src/mainboard/hp/folio_9470m/devicetree.cb
@@ -31,9 +31,6 @@ chip northbridge/intel/sandybridge # FIXME: check gfx.ndid and gfx.did
register "gpu_panel_power_up_delay" = "300"
register "gpu_pch_backlight" = "0x0d9c0d9c"
device cpu_cluster 0x0 on
- chip cpu/intel/socket_rPGA989
- device lapic 0x0 on end
- end
chip cpu/intel/model_206ax # FIXME: check all registers
register "c1_acpower" = "1"
register "c1_battery" = "1"
@@ -41,6 +38,7 @@ chip northbridge/intel/sandybridge # FIXME: check gfx.ndid and gfx.did
register "c2_battery" = "3"
register "c3_acpower" = "5"
register "c3_battery" = "5"
+ device lapic 0x0 on end
device lapic 0xacac off end
end
end
diff --git a/src/mainboard/hp/revolve_810_g1/Kconfig b/src/mainboard/hp/revolve_810_g1/Kconfig
index 8562723f19..86c40bf3de 100644
--- a/src/mainboard/hp/revolve_810_g1/Kconfig
+++ b/src/mainboard/hp/revolve_810_g1/Kconfig
@@ -3,7 +3,6 @@ if BOARD_HP_REVOLVE_810_G1
config BOARD_SPECIFIC_OPTIONS
def_bool y
select BOARD_ROMSIZE_KB_16384
- select CPU_INTEL_SOCKET_RPGA989
select EC_HP_KBC1126
select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES
diff --git a/src/mainboard/hp/revolve_810_g1/devicetree.cb b/src/mainboard/hp/revolve_810_g1/devicetree.cb
index 1ee64f4176..4d0d6395eb 100644
--- a/src/mainboard/hp/revolve_810_g1/devicetree.cb
+++ b/src/mainboard/hp/revolve_810_g1/devicetree.cb
@@ -31,9 +31,6 @@ chip northbridge/intel/sandybridge # FIXME: check gfx.ndid and gfx.did
register "gpu_panel_power_up_delay" = "300"
register "gpu_pch_backlight" = "0x02880288"
device cpu_cluster 0x0 on
- chip cpu/intel/socket_rPGA989
- device lapic 0x0 on end
- end
chip cpu/intel/model_206ax # FIXME: check all registers
register "c1_acpower" = "1"
register "c1_battery" = "1"
@@ -41,6 +38,7 @@ chip northbridge/intel/sandybridge # FIXME: check gfx.ndid and gfx.did
register "c2_battery" = "3"
register "c3_acpower" = "5"
register "c3_battery" = "5"
+ device lapic 0x0 on end
device lapic 0xacac off end
end
end
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 20:58:17 +0000