nb/intel/x4x: Remove apic 0 from devicetree
This is added at runtime.
Change-Id: I7716f8a972e2280179aa6aee00488b22413c0c73
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/69298
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
diff --git a/src/mainboard/acer/g43t-am3/devicetree.cb b/src/mainboard/acer/g43t-am3/devicetree.cb
index 1f2bc08..94067a6 100644
--- a/src/mainboard/acer/g43t-am3/devicetree.cb
+++ b/src/mainboard/acer/g43t-am3/devicetree.cb
@@ -1,12 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
chip northbridge/intel/x4x # Northbridge
- device cpu_cluster 0 on
- ops x4x_cpu_bus_ops # APIC cluster
- chip cpu/intel/socket_LGA775
- device lapic 0 on end
- end
- end
+ device cpu_cluster 0 on ops x4x_cpu_bus_ops end # APIC cluster
device domain 0 on
ops x4x_pci_domain_ops # PCI domain
subsystemid 0x8086 0x0028 inherit
diff --git a/src/mainboard/asrock/g41c-gs/variants/g41c-gs-r2/devicetree.cb b/src/mainboard/asrock/g41c-gs/variants/g41c-gs-r2/devicetree.cb
index 28b24d8..3eeeafd 100644
--- a/src/mainboard/asrock/g41c-gs/variants/g41c-gs-r2/devicetree.cb
+++ b/src/mainboard/asrock/g41c-gs/variants/g41c-gs-r2/devicetree.cb
@@ -1,12 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
chip northbridge/intel/x4x # Northbridge
- device cpu_cluster 0 on
- ops x4x_cpu_bus_ops # APIC cluster
- chip cpu/intel/socket_LGA775
- device lapic 0 on end
- end
- end
+ device cpu_cluster 0 on ops x4x_cpu_bus_ops end # APIC cluster
device domain 0 on
ops x4x_pci_domain_ops # PCI domain
subsystemid 0x1458 0x5000 inherit
diff --git a/src/mainboard/asrock/g41c-gs/variants/g41c-gs/devicetree.cb b/src/mainboard/asrock/g41c-gs/variants/g41c-gs/devicetree.cb
index 7daa4a4..3b1f7fa 100644
--- a/src/mainboard/asrock/g41c-gs/variants/g41c-gs/devicetree.cb
+++ b/src/mainboard/asrock/g41c-gs/variants/g41c-gs/devicetree.cb
@@ -1,12 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
chip northbridge/intel/x4x # Northbridge
- device cpu_cluster 0 on
- ops x4x_cpu_bus_ops # APIC cluster
- chip cpu/intel/socket_LGA775
- device lapic 0 on end
- end
- end
+ device cpu_cluster 0 on ops x4x_cpu_bus_ops end # APIC cluster
device domain 0 on
ops x4x_pci_domain_ops # PCI domain
subsystemid 0x1458 0x5000 inherit
diff --git a/src/mainboard/asrock/g41c-gs/variants/g41m-gs/devicetree.cb b/src/mainboard/asrock/g41c-gs/variants/g41m-gs/devicetree.cb
index a5d205c..c041c63 100644
--- a/src/mainboard/asrock/g41c-gs/variants/g41m-gs/devicetree.cb
+++ b/src/mainboard/asrock/g41c-gs/variants/g41m-gs/devicetree.cb
@@ -1,12 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
chip northbridge/intel/x4x # Northbridge
- device cpu_cluster 0 on
- ops x4x_cpu_bus_ops # APIC cluster
- chip cpu/intel/socket_LGA775
- device lapic 0 on end
- end
- end
+ device cpu_cluster 0 on ops x4x_cpu_bus_ops end # APIC cluster
device domain 0 on
ops x4x_pci_domain_ops # PCI domain
subsystemid 0x1458 0x5000 inherit
diff --git a/src/mainboard/asrock/g41c-gs/variants/g41m-s3/devicetree.cb b/src/mainboard/asrock/g41c-gs/variants/g41m-s3/devicetree.cb
index 83fc040..a89388f 100644
--- a/src/mainboard/asrock/g41c-gs/variants/g41m-s3/devicetree.cb
+++ b/src/mainboard/asrock/g41c-gs/variants/g41m-s3/devicetree.cb
@@ -1,12 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
chip northbridge/intel/x4x # Northbridge
- device cpu_cluster 0 on
- ops x4x_cpu_bus_ops # APIC cluster
- chip cpu/intel/socket_LGA775
- device lapic 0 on end
- end
- end
+ device cpu_cluster 0 on ops x4x_cpu_bus_ops end # APIC cluster
device domain 0 on
ops x4x_pci_domain_ops # PCI domain
subsystemid 0x1458 0x5000 inherit
diff --git a/src/mainboard/asrock/g41c-gs/variants/g41m-vs3-r2/devicetree.cb b/src/mainboard/asrock/g41c-gs/variants/g41m-vs3-r2/devicetree.cb
index 0dbe8d9..353e80b 100644
--- a/src/mainboard/asrock/g41c-gs/variants/g41m-vs3-r2/devicetree.cb
+++ b/src/mainboard/asrock/g41c-gs/variants/g41m-vs3-r2/devicetree.cb
@@ -1,12 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
chip northbridge/intel/x4x # Northbridge
- device cpu_cluster 0 on
- ops x4x_cpu_bus_ops # APIC cluster
- chip cpu/intel/socket_LGA775
- device lapic 0 on end
- end
- end
+ device cpu_cluster 0 on ops x4x_cpu_bus_ops end # APIC cluster
device domain 0 on
ops x4x_pci_domain_ops # PCI domain
subsystemid 0x1458 0x5000 inherit
diff --git a/src/mainboard/asus/p5qc/variants/p5q/devicetree.cb b/src/mainboard/asus/p5qc/variants/p5q/devicetree.cb
index d7d4655..4b1d290 100644
--- a/src/mainboard/asus/p5qc/variants/p5q/devicetree.cb
+++ b/src/mainboard/asus/p5qc/variants/p5q/devicetree.cb
@@ -1,12 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
chip northbridge/intel/x4x # Northbridge
- device cpu_cluster 0 on
- ops x4x_cpu_bus_ops # APIC cluster
- chip cpu/intel/socket_LGA775
- device lapic 0 on end
- end
- end
+ device cpu_cluster 0 on ops x4x_cpu_bus_ops end # APIC cluster
device domain 0 on
ops x4x_pci_domain_ops # PCI domain
device pci 0.0 on end # Host Bridge
diff --git a/src/mainboard/asus/p5qc/variants/p5q_pro/devicetree.cb b/src/mainboard/asus/p5qc/variants/p5q_pro/devicetree.cb
index d6dbc2d..b1b0106 100644
--- a/src/mainboard/asus/p5qc/variants/p5q_pro/devicetree.cb
+++ b/src/mainboard/asus/p5qc/variants/p5q_pro/devicetree.cb
@@ -1,12 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
chip northbridge/intel/x4x # Northbridge
- device cpu_cluster 0 on
- ops x4x_cpu_bus_ops # APIC cluster
- chip cpu/intel/socket_LGA775
- device lapic 0 on end
- end
- end
+ device cpu_cluster 0 on ops x4x_cpu_bus_ops end # APIC cluster
device domain 0 on
ops x4x_pci_domain_ops # PCI domain
device pci 0.0 on end # Host Bridge
diff --git a/src/mainboard/asus/p5qc/variants/p5q_se/devicetree.cb b/src/mainboard/asus/p5qc/variants/p5q_se/devicetree.cb
index f099ab2..602ef02 100644
--- a/src/mainboard/asus/p5qc/variants/p5q_se/devicetree.cb
+++ b/src/mainboard/asus/p5qc/variants/p5q_se/devicetree.cb
@@ -1,12 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
chip northbridge/intel/x4x # Northbridge
- device cpu_cluster 0 on
- ops x4x_cpu_bus_ops # APIC cluster
- chip cpu/intel/socket_LGA775
- device lapic 0 on end
- end
- end
+ device cpu_cluster 0 on ops x4x_cpu_bus_ops end # APIC cluster
device domain 0 on
ops x4x_pci_domain_ops # PCI domain
device pci 0.0 on end # Host Bridge
diff --git a/src/mainboard/asus/p5qc/variants/p5qc/devicetree.cb b/src/mainboard/asus/p5qc/variants/p5qc/devicetree.cb
index 54f9dcf..6e7d142 100644
--- a/src/mainboard/asus/p5qc/variants/p5qc/devicetree.cb
+++ b/src/mainboard/asus/p5qc/variants/p5qc/devicetree.cb
@@ -1,12 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
chip northbridge/intel/x4x # Northbridge
- device cpu_cluster 0 on
- ops x4x_cpu_bus_ops # APIC cluster
- chip cpu/intel/socket_LGA775
- device lapic 0 on end
- end
- end
+ device cpu_cluster 0 on ops x4x_cpu_bus_ops end # APIC cluster
device domain 0 on
ops x4x_pci_domain_ops # PCI domain
device pci 0.0 on end # Host Bridge
diff --git a/src/mainboard/asus/p5qc/variants/p5ql_pro/devicetree.cb b/src/mainboard/asus/p5qc/variants/p5ql_pro/devicetree.cb
index f099ab2..602ef02 100644
--- a/src/mainboard/asus/p5qc/variants/p5ql_pro/devicetree.cb
+++ b/src/mainboard/asus/p5qc/variants/p5ql_pro/devicetree.cb
@@ -1,12 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
chip northbridge/intel/x4x # Northbridge
- device cpu_cluster 0 on
- ops x4x_cpu_bus_ops # APIC cluster
- chip cpu/intel/socket_LGA775
- device lapic 0 on end
- end
- end
+ device cpu_cluster 0 on ops x4x_cpu_bus_ops end # APIC cluster
device domain 0 on
ops x4x_pci_domain_ops # PCI domain
device pci 0.0 on end # Host Bridge
diff --git a/src/mainboard/asus/p5ql-em/devicetree.cb b/src/mainboard/asus/p5ql-em/devicetree.cb
index 8e061f2..a8982f1 100644
--- a/src/mainboard/asus/p5ql-em/devicetree.cb
+++ b/src/mainboard/asus/p5ql-em/devicetree.cb
@@ -1,12 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
chip northbridge/intel/x4x # Northbridge
- device cpu_cluster 0 on
- ops x4x_cpu_bus_ops # APIC cluster
- chip cpu/intel/socket_LGA775
- device lapic 0 on end
- end
- end
+ device cpu_cluster 0 on ops x4x_cpu_bus_ops end # APIC cluster
device domain 0 on
ops x4x_pci_domain_ops # PCI domain
device pci 0.0 on # Host Bridge
diff --git a/src/mainboard/asus/p5qpl-am/devicetree.cb b/src/mainboard/asus/p5qpl-am/devicetree.cb
index 602ba57..b70a6af 100644
--- a/src/mainboard/asus/p5qpl-am/devicetree.cb
+++ b/src/mainboard/asus/p5qpl-am/devicetree.cb
@@ -1,12 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
chip northbridge/intel/x4x # Northbridge
- device cpu_cluster 0 on
- ops x4x_cpu_bus_ops # APIC cluster
- chip cpu/intel/socket_LGA775
- device lapic 0 on end
- end
- end
+ device cpu_cluster 0 on ops x4x_cpu_bus_ops end # APIC cluster
device domain 0 on
ops x4x_pci_domain_ops # PCI domain
device pci 0.0 on end # Host Bridge
diff --git a/src/mainboard/foxconn/g41s-k/devicetree.cb b/src/mainboard/foxconn/g41s-k/devicetree.cb
index af15577..b63d204 100644
--- a/src/mainboard/foxconn/g41s-k/devicetree.cb
+++ b/src/mainboard/foxconn/g41s-k/devicetree.cb
@@ -1,12 +1,7 @@
## SPDX-License-Identifier: GPL-2.0-or-later
chip northbridge/intel/x4x # Northbridge
- device cpu_cluster 0 on
- ops x4x_cpu_bus_ops # APIC cluster
- chip cpu/intel/socket_LGA775
- device lapic 0 on end
- end
- end
+ device cpu_cluster 0 on ops x4x_cpu_bus_ops end # APIC cluster
device domain 0 on
ops x4x_pci_domain_ops # PCI domain
device pci 0.0 on end # Host Bridge
diff --git a/src/mainboard/gigabyte/ga-g41m-es2l/devicetree.cb b/src/mainboard/gigabyte/ga-g41m-es2l/devicetree.cb
index 5ec31eb..4f6d900 100644
--- a/src/mainboard/gigabyte/ga-g41m-es2l/devicetree.cb
+++ b/src/mainboard/gigabyte/ga-g41m-es2l/devicetree.cb
@@ -1,12 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
chip northbridge/intel/x4x # Northbridge
- device cpu_cluster 0 on
- ops x4x_cpu_bus_ops # APIC cluster
- chip cpu/intel/socket_LGA775
- device lapic 0 on end
- end
- end
+ device cpu_cluster 0 on ops x4x_cpu_bus_ops end # APIC cluster
device domain 0 on
ops x4x_pci_domain_ops # PCI domain
subsystemid 0x1458 0x5000 inherit
diff --git a/src/mainboard/intel/dg41wv/devicetree.cb b/src/mainboard/intel/dg41wv/devicetree.cb
index 06617f6..49d6f8b 100644
--- a/src/mainboard/intel/dg41wv/devicetree.cb
+++ b/src/mainboard/intel/dg41wv/devicetree.cb
@@ -1,12 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
chip northbridge/intel/x4x # Northbridge
- device cpu_cluster 0 on
- ops x4x_cpu_bus_ops # APIC cluster
- chip cpu/intel/socket_LGA775
- device lapic 0 on end
- end
- end
+ device cpu_cluster 0 on ops x4x_cpu_bus_ops end # APIC cluster
device domain 0 on
ops x4x_pci_domain_ops # PCI domain
subsystemid 0x1458 0x5000 inherit
diff --git a/src/mainboard/intel/dg43gt/devicetree.cb b/src/mainboard/intel/dg43gt/devicetree.cb
index 80d2bf7..c33509b 100644
--- a/src/mainboard/intel/dg43gt/devicetree.cb
+++ b/src/mainboard/intel/dg43gt/devicetree.cb
@@ -1,12 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
chip northbridge/intel/x4x # Northbridge
- device cpu_cluster 0 on
- ops x4x_cpu_bus_ops # APIC cluster
- chip cpu/intel/socket_LGA775
- device lapic 0 on end
- end
- end
+ device cpu_cluster 0 on ops x4x_cpu_bus_ops end # APIC cluster
device domain 0 on
ops x4x_pci_domain_ops # PCI domain
subsystemid 0x8086 0x0028 inherit
diff --git a/src/mainboard/lenovo/thinkcentre_a58/devicetree.cb b/src/mainboard/lenovo/thinkcentre_a58/devicetree.cb
index a8dea8d..4afbec9 100644
--- a/src/mainboard/lenovo/thinkcentre_a58/devicetree.cb
+++ b/src/mainboard/lenovo/thinkcentre_a58/devicetree.cb
@@ -1,12 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
chip northbridge/intel/x4x # Northbridge
- device cpu_cluster 0 on
- ops x4x_cpu_bus_ops # APIC cluster
- chip cpu/intel/socket_LGA775
- device lapic 0 on end
- end
- end
+ device cpu_cluster 0 on ops x4x_cpu_bus_ops end # APIC cluster
device domain 0 on
ops x4x_pci_domain_ops # PCI domain
subsystemid 0x17aa 0x304f inherit