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/google/butterfly/Kconfig | 1 - src/mainboard/google/butterfly/devicetree.cb | 4 +--- src/mainboard/google/link/Kconfig | 1 - src/mainboard/google/link/devicetree.cb | 4 +--- src/mainboard/google/parrot/Kconfig | 1 - src/mainboard/google/parrot/devicetree.cb | 4 +--- src/mainboard/google/stout/Kconfig | 1 - src/mainboard/google/stout/devicetree.cb | 4 +--- 8 files changed, 4 insertions(+), 16 deletions(-) (limited to 'src/mainboard/google') diff --git a/src/mainboard/google/butterfly/Kconfig b/src/mainboard/google/butterfly/Kconfig index 37377ec178..570a1b3573 100644 --- a/src/mainboard/google/butterfly/Kconfig +++ b/src/mainboard/google/butterfly/Kconfig @@ -3,7 +3,6 @@ if BOARD_GOOGLE_BUTTERFLY config BOARD_SPECIFIC_OPTIONS def_bool y select SYSTEM_TYPE_LAPTOP - select CPU_INTEL_SOCKET_RPGA989 select NORTHBRIDGE_INTEL_SANDYBRIDGE select SOUTHBRIDGE_INTEL_C216 select EC_QUANTA_ENE_KB3940Q diff --git a/src/mainboard/google/butterfly/devicetree.cb b/src/mainboard/google/butterfly/devicetree.cb index b54ca9a785..d8a0ee1c31 100644 --- a/src/mainboard/google/butterfly/devicetree.cb +++ b/src/mainboard/google/butterfly/devicetree.cb @@ -22,11 +22,9 @@ chip northbridge/intel/sandybridge register "max_mem_clock_mhz" = "666" # DDR3-1333 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_acpower" = "1" # ACPI(C1) = MWAIT(C1) diff --git a/src/mainboard/google/link/Kconfig b/src/mainboard/google/link/Kconfig index 98b256d595..fea82f6756 100644 --- a/src/mainboard/google/link/Kconfig +++ b/src/mainboard/google/link/Kconfig @@ -3,7 +3,6 @@ if BOARD_GOOGLE_LINK config BOARD_SPECIFIC_OPTIONS def_bool y select SYSTEM_TYPE_LAPTOP - select CPU_INTEL_SOCKET_RPGA989 select NORTHBRIDGE_INTEL_IVYBRIDGE select SOUTHBRIDGE_INTEL_C216 select BOARD_ROMSIZE_KB_8192 diff --git a/src/mainboard/google/link/devicetree.cb b/src/mainboard/google/link/devicetree.cb index c3b93f0206..1b27a69b54 100644 --- a/src/mainboard/google/link/devicetree.cb +++ b/src/mainboard/google/link/devicetree.cb @@ -21,11 +21,9 @@ chip northbridge/intel/sandybridge register "max_mem_clock_mhz" = "666" 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_acpower" = "1" # ACPI(C1) = MWAIT(C1) diff --git a/src/mainboard/google/parrot/Kconfig b/src/mainboard/google/parrot/Kconfig index 3bbf5a84b6..f2c9b20a1c 100644 --- a/src/mainboard/google/parrot/Kconfig +++ b/src/mainboard/google/parrot/Kconfig @@ -3,7 +3,6 @@ if BOARD_GOOGLE_PARROT config BOARD_SPECIFIC_OPTIONS def_bool y select SYSTEM_TYPE_LAPTOP - select CPU_INTEL_SOCKET_RPGA989 select NORTHBRIDGE_INTEL_IVYBRIDGE select SOUTHBRIDGE_INTEL_C216 select EC_COMPAL_ENE932 diff --git a/src/mainboard/google/parrot/devicetree.cb b/src/mainboard/google/parrot/devicetree.cb index e6c8a06da7..046db97585 100644 --- a/src/mainboard/google/parrot/devicetree.cb +++ b/src/mainboard/google/parrot/devicetree.cb @@ -21,11 +21,9 @@ chip northbridge/intel/sandybridge register "max_mem_clock_mhz" = "666" 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_acpower" = "1" # ACPI(C1) = MWAIT(C1) diff --git a/src/mainboard/google/stout/Kconfig b/src/mainboard/google/stout/Kconfig index bfd45ea600..c9b67ccee1 100644 --- a/src/mainboard/google/stout/Kconfig +++ b/src/mainboard/google/stout/Kconfig @@ -3,7 +3,6 @@ if BOARD_GOOGLE_STOUT config BOARD_SPECIFIC_OPTIONS def_bool y select SYSTEM_TYPE_LAPTOP - select CPU_INTEL_SOCKET_RPGA989 select NORTHBRIDGE_INTEL_IVYBRIDGE select SOUTHBRIDGE_INTEL_C216 select EC_QUANTA_IT8518 diff --git a/src/mainboard/google/stout/devicetree.cb b/src/mainboard/google/stout/devicetree.cb index 31407820a1..ddcf4e22d1 100644 --- a/src/mainboard/google/stout/devicetree.cb +++ b/src/mainboard/google/stout/devicetree.cb @@ -23,11 +23,9 @@ chip northbridge/intel/sandybridge register "max_mem_clock_mhz" = "666" 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 "tcc_offset" = "5" # TCC of 95C -- cgit v1.2.3