diff options
| author | Arthur Heymans <arthur@aheymans.xyz> | 2019-01-21 17:55:02 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2019-01-24 13:39:19 +0000 |
| commit | 7e6946a74c714ff109c35d97001b22c9e868aaea (patch) | |
| tree | 98899e89dc00f8e5504f06d84eb6dc44227b4c80 /src/mainboard/asus | |
| parent | d6c15d0c8c39015994a180da82c3e6f9538b42de (diff) | |
| download | coreboot-7e6946a74c714ff109c35d97001b22c9e868aaea.tar.xz | |
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/asus')
| -rw-r--r-- | src/mainboard/asus/maximus_iv_gene-z/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/asus/maximus_iv_gene-z/devicetree.cb | 4 | ||||
| -rw-r--r-- | src/mainboard/asus/p8h61-m_lx/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/asus/p8h61-m_lx/devicetree.cb | 4 | ||||
| -rw-r--r-- | src/mainboard/asus/p8h61-m_pro/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/asus/p8h61-m_pro/devicetree.cb | 4 |
6 files changed, 3 insertions, 12 deletions
diff --git a/src/mainboard/asus/maximus_iv_gene-z/Kconfig b/src/mainboard/asus/maximus_iv_gene-z/Kconfig index c6e0dcebda..4669cabf30 100644 --- a/src/mainboard/asus/maximus_iv_gene-z/Kconfig +++ b/src/mainboard/asus/maximus_iv_gene-z/Kconfig @@ -19,7 +19,6 @@ if BOARD_ASUS_MAXIMUS_IV_GENE_Z 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 HAVE_OPTION_TABLE diff --git a/src/mainboard/asus/maximus_iv_gene-z/devicetree.cb b/src/mainboard/asus/maximus_iv_gene-z/devicetree.cb index a3f456400c..4b80f393f6 100644 --- a/src/mainboard/asus/maximus_iv_gene-z/devicetree.cb +++ b/src/mainboard/asus/maximus_iv_gene-z/devicetree.cb @@ -16,9 +16,6 @@ chip northbridge/intel/sandybridge device cpu_cluster 0 on - chip cpu/intel/socket_LGA1155 - device lapic 0 on end - end chip cpu/intel/model_206ax register "c1_acpower" = "1" register "c1_battery" = "1" @@ -26,6 +23,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/asus/p8h61-m_lx/Kconfig b/src/mainboard/asus/p8h61-m_lx/Kconfig index 0960803546..cc2f8a9979 100644 --- a/src/mainboard/asus/p8h61-m_lx/Kconfig +++ b/src/mainboard/asus/p8h61-m_lx/Kconfig @@ -19,7 +19,6 @@ if BOARD_ASUS_P8H61_M_LX config BOARD_SPECIFIC_OPTIONS def_bool y select BOARD_ROMSIZE_KB_4096 - select CPU_INTEL_SOCKET_LGA1155 select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE diff --git a/src/mainboard/asus/p8h61-m_lx/devicetree.cb b/src/mainboard/asus/p8h61-m_lx/devicetree.cb index 5a40b314ff..ef8071fabb 100644 --- a/src/mainboard/asus/p8h61-m_lx/devicetree.cb +++ b/src/mainboard/asus/p8h61-m_lx/devicetree.cb @@ -16,9 +16,6 @@ chip northbridge/intel/sandybridge device cpu_cluster 0 on - chip cpu/intel/socket_LGA1155 - device lapic 0 on end - end chip cpu/intel/model_206ax register "c1_acpower" = "1" register "c1_battery" = "1" @@ -26,6 +23,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/asus/p8h61-m_pro/Kconfig b/src/mainboard/asus/p8h61-m_pro/Kconfig index 8fcc6509c8..4d2418703a 100644 --- a/src/mainboard/asus/p8h61-m_pro/Kconfig +++ b/src/mainboard/asus/p8h61-m_pro/Kconfig @@ -19,7 +19,6 @@ config BOARD_SPECIFIC_OPTIONS def_bool y select ARCH_X86 select BOARD_ROMSIZE_KB_4096 - select CPU_INTEL_SOCKET_LGA1155 select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES select NORTHBRIDGE_INTEL_IVYBRIDGE diff --git a/src/mainboard/asus/p8h61-m_pro/devicetree.cb b/src/mainboard/asus/p8h61-m_pro/devicetree.cb index fb12153757..9407aab548 100644 --- a/src/mainboard/asus/p8h61-m_pro/devicetree.cb +++ b/src/mainboard/asus/p8h61-m_pro/devicetree.cb @@ -17,9 +17,6 @@ chip northbridge/intel/sandybridge register "gfx.did" = "{ 0x80000100, 0x80000240, 0x80000410 }" register "gfx.ndid" = "3" 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" @@ -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 |