From 7e6946a74c714ff109c35d97001b22c9e868aaea Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Mon, 21 Jan 2019 17:55:02 +0100 Subject: 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 Reviewed-on: https://review.coreboot.org/c/31031 Reviewed-by: HAOUAS Elyes Reviewed-by: Tristan Corrick Tested-by: build bot (Jenkins) --- src/mainboard/intel/dcp847ske/Kconfig | 1 - src/mainboard/intel/dcp847ske/devicetree.cb | 4 +--- src/mainboard/intel/emeraldlake2/Kconfig | 1 - src/mainboard/intel/emeraldlake2/devicetree.cb | 4 +--- 4 files changed, 2 insertions(+), 8 deletions(-) (limited to 'src/mainboard/intel') diff --git a/src/mainboard/intel/dcp847ske/Kconfig b/src/mainboard/intel/dcp847ske/Kconfig index 0086bb7fbb..aafabac8cb 100644 --- a/src/mainboard/intel/dcp847ske/Kconfig +++ b/src/mainboard/intel/dcp847ske/Kconfig @@ -3,7 +3,6 @@ if BOARD_INTEL_DCP847SKE config BOARD_SPECIFIC_OPTIONS def_bool y select BOARD_ROMSIZE_KB_8192 - select CPU_INTEL_SOCKET_RPGA989 select SUPERIO_NUVOTON_NCT6776 select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES diff --git a/src/mainboard/intel/dcp847ske/devicetree.cb b/src/mainboard/intel/dcp847ske/devicetree.cb index 342e1167d1..ac152d85f9 100644 --- a/src/mainboard/intel/dcp847ske/devicetree.cb +++ b/src/mainboard/intel/dcp847ske/devicetree.cb @@ -13,11 +13,9 @@ chip northbridge/intel/sandybridge register "gpu_dp_b_hotplug" = "0x06" device cpu_cluster 0x0 on - chip cpu/intel/socket_rPGA989 - device lapic 0x0 on end - end chip cpu/intel/model_206ax # Magic APIC ID to locate this chip + device lapic 0x0 on end device lapic 0xacac off end register "c1_battery" = "1" diff --git a/src/mainboard/intel/emeraldlake2/Kconfig b/src/mainboard/intel/emeraldlake2/Kconfig index ba5fda70b6..eeb441ce68 100644 --- a/src/mainboard/intel/emeraldlake2/Kconfig +++ b/src/mainboard/intel/emeraldlake2/Kconfig @@ -2,7 +2,6 @@ if BOARD_INTEL_EMERALDLAKE2 config BOARD_SPECIFIC_OPTIONS def_bool y - select CPU_INTEL_SOCKET_RPGA989 select NORTHBRIDGE_INTEL_IVYBRIDGE select SOUTHBRIDGE_INTEL_C216 select SUPERIO_SMSC_SIO1007 diff --git a/src/mainboard/intel/emeraldlake2/devicetree.cb b/src/mainboard/intel/emeraldlake2/devicetree.cb index ebfc055eba..60072b0995 100644 --- a/src/mainboard/intel/emeraldlake2/devicetree.cb +++ b/src/mainboard/intel/emeraldlake2/devicetree.cb @@ -13,11 +13,9 @@ chip northbridge/intel/sandybridge 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/model_206ax # Magic APIC ID to locate this chip + device lapic 0x0 on end device lapic 0xacac off end register "c1_battery" = "3" # ACPI(C1) = MWAIT(C3) -- cgit v1.2.3