nb/intel/i945: Remove apic 0 from devicetree

This is added at runtime.

Change-Id: I1f684c800de6711d8b0a0aea0d59c8e21d22c14a
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/69299
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

9 files changed, 9 insertions, 55 deletions

diff --git a/src/mainboard/apple/macbook21/devicetree.cb b/src/mainboard/apple/macbook21/devicetree.cb
index a7832efeb1..dd701da7ed 100644
--- a/src/mainboard/apple/macbook21/devicetree.cb
+++ b/src/mainboard/apple/macbook21/devicetree.cb
@@ -13,13 +13,7 @@ chip northbridge/intel/i945
 	register "gpu_panel_power_backlight_off_delay" = "2380"
 	register "gpu_panel_power_cycle_delay" = "2"
 
-	device cpu_cluster 0 on
-		ops i945_cpu_bus_ops
-		chip cpu/intel/socket_m
-			device lapic 0 on end
-		end
-	end
-
+	device cpu_cluster 0 on ops i945_cpu_bus_ops end		# APIC cluster
 	register "pci_mmio_size" = "768"
 
 	device domain 0 on
diff --git a/src/mainboard/asus/p5gc-mx/devicetree.cb b/src/mainboard/asus/p5gc-mx/devicetree.cb
index 823882650e..f6d5f76ebb 100644
--- a/src/mainboard/asus/p5gc-mx/devicetree.cb
+++ b/src/mainboard/asus/p5gc-mx/devicetree.cb
@@ -2,12 +2,7 @@
 
 chip northbridge/intel/i945
 
-	device cpu_cluster 0 on
-		ops i945_cpu_bus_ops
-		chip cpu/intel/socket_LGA775
-			device lapic 0 on end
-		end
-	end
+	device cpu_cluster 0 on ops i945_cpu_bus_ops end		# APIC cluster
 
 	device domain 0 on
 		ops i945_pci_domain_ops
diff --git a/src/mainboard/getac/p470/devicetree.cb b/src/mainboard/getac/p470/devicetree.cb
index 2514ad4298..b12335e947 100644
--- a/src/mainboard/getac/p470/devicetree.cb
+++ b/src/mainboard/getac/p470/devicetree.cb
@@ -5,12 +5,7 @@ chip northbridge/intel/i945
 	register "gfx.ndid" = "2"
 	register "gfx.did" = "{ 0x80000100, 0x80000410, 0x80000320, 0x80000410, 0x00000005 }"
 
-	device cpu_cluster 0 on
-		ops i945_cpu_bus_ops
-		chip cpu/intel/socket_m
-			device lapic 0 on end
-		end
-	end
+	device cpu_cluster 0 on ops i945_cpu_bus_ops end		# APIC cluster
 
 	register "pci_mmio_size" = "768"
 
diff --git a/src/mainboard/ibase/mb899/devicetree.cb b/src/mainboard/ibase/mb899/devicetree.cb
index 51ca420557..611bd96dad 100644
--- a/src/mainboard/ibase/mb899/devicetree.cb
+++ b/src/mainboard/ibase/mb899/devicetree.cb
@@ -2,12 +2,7 @@ chip northbridge/intel/i945
 	# IGD Displays
 	register "gfx" = "GMA_STATIC_DISPLAYS(0)"
 
-	device cpu_cluster 0 on
-		ops i945_cpu_bus_ops
-		chip cpu/intel/socket_m
-			device lapic 0 on end
-		end
-	end
+	device cpu_cluster 0 on ops i945_cpu_bus_ops end		# APIC cluster
 
 	register "pci_mmio_size" = "768"
 
diff --git a/src/mainboard/intel/d945gclf/devicetree.cb b/src/mainboard/intel/d945gclf/devicetree.cb
index 5c72c72be9..4007e7ecc4 100644
--- a/src/mainboard/intel/d945gclf/devicetree.cb
+++ b/src/mainboard/intel/d945gclf/devicetree.cb
@@ -2,12 +2,7 @@
 
 chip northbridge/intel/i945
 
-	device cpu_cluster 0 on
-		ops i945_cpu_bus_ops
-		chip cpu/intel/socket_441
-			device lapic 0 on end
-		end
-	end
+	device cpu_cluster 0 on ops i945_cpu_bus_ops end		# APIC cluster
 
 	register "pci_mmio_size" = "768"
 
diff --git a/src/mainboard/kontron/986lcd-m/devicetree.cb b/src/mainboard/kontron/986lcd-m/devicetree.cb
index e58d8f3390..cd67480aa6 100644
--- a/src/mainboard/kontron/986lcd-m/devicetree.cb
+++ b/src/mainboard/kontron/986lcd-m/devicetree.cb
@@ -2,12 +2,7 @@ chip northbridge/intel/i945
 	# IGD Displays
 	register "gfx" = "GMA_STATIC_DISPLAYS(0)"
 
-	device cpu_cluster 0 on
-		ops i945_cpu_bus_ops
-		chip cpu/intel/socket_m
-			device lapic 0 on end
-		end
-	end
+	device cpu_cluster 0 on ops i945_cpu_bus_ops end		# APIC cluster
 
 	register "pci_mmio_size" = "768"
 
diff --git a/src/mainboard/lenovo/t60/devicetree.cb b/src/mainboard/lenovo/t60/devicetree.cb
index 7a9e9aec9d..913b732395 100644
--- a/src/mainboard/lenovo/t60/devicetree.cb
+++ b/src/mainboard/lenovo/t60/devicetree.cb
@@ -13,12 +13,7 @@ chip northbridge/intel/i945
 	register "gpu_panel_power_backlight_off_delay" = "2380"
 	register "gpu_panel_power_cycle_delay" = "2"
 
-	device cpu_cluster 0 on
-		ops i945_cpu_bus_ops
-		chip cpu/intel/socket_m
-			device lapic 0 on end
-		end
-	end
+	device cpu_cluster 0 on ops i945_cpu_bus_ops end		# APIC cluster
 
 	register "pci_mmio_size" = "768"
 
diff --git a/src/mainboard/lenovo/x60/devicetree.cb b/src/mainboard/lenovo/x60/devicetree.cb
index a41749a64a..d7c86a5282 100644
--- a/src/mainboard/lenovo/x60/devicetree.cb
+++ b/src/mainboard/lenovo/x60/devicetree.cb
@@ -13,12 +13,7 @@ chip northbridge/intel/i945
 	register "gpu_panel_power_backlight_off_delay" = "2380"
 	register "gpu_panel_power_cycle_delay" = "2"
 
-	device cpu_cluster 0 on
-		ops i945_cpu_bus_ops
-		chip cpu/intel/socket_m
-			device lapic 0 on end
-		end
-	end
+	device cpu_cluster 0 on ops i945_cpu_bus_ops end		# APIC cluster
 
 	register "pci_mmio_size" = "768"
 
diff --git a/src/mainboard/roda/rk886ex/devicetree.cb b/src/mainboard/roda/rk886ex/devicetree.cb
index eb0bdcdf7f..a3b00c1db7 100644
--- a/src/mainboard/roda/rk886ex/devicetree.cb
+++ b/src/mainboard/roda/rk886ex/devicetree.cb
@@ -4,12 +4,7 @@ chip northbridge/intel/i945
 	# IGD Displays
 	register "gfx" = "GMA_STATIC_DISPLAYS(0)"
 
-	device cpu_cluster 0 on
-		ops i945_cpu_bus_ops
-		chip cpu/intel/socket_m
-			device lapic 0 on end
-		end
-	end
+	device cpu_cluster 0 on ops i945_cpu_bus_ops end		# APIC cluster
 
 	register "pci_mmio_size" = "768"