Rename "apic" and "apic_cluster" to "lapic" and "lapic_cluster"

in device trees. Adapt sconfig as necessary.

Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Peter Stuge <peter@stuge.se>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5525 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

src/mainboard/a-trend/atc-6220/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/intel/i440bx		# Northbridge
-  device apic_cluster 0 on		# APIC cluster
+  device lapic_cluster 0 on		# APIC cluster
     chip cpu/intel/slot_1		# CPU
-      device apic 0 on end		# APIC
+      device lapic 0 on end		# APIC
     end
   end
   device pci_domain 0 on		# PCI domain

src/mainboard/a-trend/atc-6240/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/intel/i440bx		# Northbridge
-  device apic_cluster 0 on		# APIC cluster
+  device lapic_cluster 0 on		# APIC cluster
     chip cpu/intel/slot_1		# CPU
-      device apic 0 on end		# APIC
+      device lapic 0 on end		# APIC
     end
   end
   device pci_domain 0 on		# PCI domain

src/mainboard/abit/be6-ii_v2_0/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/intel/i440bx		# Northbridge
-  device apic_cluster 0 on		# APIC cluster
+  device lapic_cluster 0 on		# APIC cluster
     chip cpu/intel/slot_1		# CPU
-      device apic 0 on end		# APIC
+      device lapic 0 on end		# APIC
     end
   end
   device pci_domain 0 on		# PCI domain

src/mainboard/amd/db800/devicetree.cb

@@ -59,9 +59,9 @@ chip northbridge/amd/lx
 		end
 	end
 	# APIC cluster is late CPU init.
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/amd/model_lx
-			device apic 0 on end
+			device lapic 0 on end
 		end
 	end
 end

src/mainboard/amd/dbm690t/devicetree.cb

@@ -9,9 +9,9 @@
 #Define gfx_reconfiguration, 0: short reconfiguration, 1(default): long reconfiguration
 #Define gfx_link_width, 0: x16, 1: x1, 2: x2, 3: x4, 4: x8, 5: x12 (not supported), 6: x16
 chip northbridge/amd/amdk8/root_complex
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/amd/socket_S1G1
-		device apic 0 on end
+		device lapic 0 on end
 		end
 	end
 	device pci_domain 0 on

src/mainboard/amd/mahogany/devicetree.cb

@@ -9,9 +9,9 @@
 #Define gfx_reconfiguration, 0: short reconfiguration, 1(default): long reconfiguration
 #Define gfx_link_width, 0: x16, 1: x1, 2: x2, 3: x4, 4: x8, 5: x12 (not supported), 6: x16
 chip northbridge/amd/amdk8/root_complex
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/amd/socket_AM2
-		device apic 0 on end
+		device lapic 0 on end
 		end
 	end
 	device pci_domain 0 on

src/mainboard/amd/mahogany_fam10/devicetree.cb

@@ -1,8 +1,8 @@
 # sample config for amd/mahogany_fam10
 chip northbridge/amd/amdfam10/root_complex
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/amd/socket_AM2r2  #L1 and DDR2
-			 device apic 0 on end
+			 device lapic 0 on end
 		end
 	end
 	device pci_domain 0 on

src/mainboard/amd/norwich/devicetree.cb

@@ -32,9 +32,9 @@ chip northbridge/amd/lx
 		end
 	end
 	# APIC cluster is late CPU init.
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/amd/model_lx
-			device apic 0 on end
+			device lapic 0 on end
 		end
 	end
 end

src/mainboard/amd/pistachio/devicetree.cb

@@ -9,9 +9,9 @@
 #Define gfx_reconfiguration, 0: short reconfiguration, 1(default): long reconfiguration
 #Define gfx_link_width, 0: x16, 1: x1, 2: x2, 3: x4, 4: x8, 5: x12 (not supported), 6: x16
 chip northbridge/amd/amdk8/root_complex
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/amd/socket_AM2
-		device apic 0 on end
+		device lapic 0 on end
 		end
 	end
 	device pci_domain 0 on

src/mainboard/amd/rumba/devicetree.cb

@@ -1,9 +1,9 @@
 chip northbridge/amd/gx2
 	register "setupflash" = "0"
   	#register "irqmap" = "0xaa5b"
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/amd/model_gx2
-			device apic 0 on end
+			device lapic 0 on end
 		end
 	end
   	device pci_domain 0 on

src/mainboard/amd/serengeti_cheetah/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex
-        device apic_cluster 0 on
+        device lapic_cluster 0 on
                 chip cpu/amd/socket_F
-                        device apic 0 on end
+                        device lapic 0 on end
                 end
         end
 	device pci_domain 0 on

src/mainboard/amd/serengeti_cheetah_fam10/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/amd/amdfam10/root_complex
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/amd/socket_F_1207  #L1 and DDR2
-			 device apic 0 on end
+			 device lapic 0 on end
 		end
 	end
 	device pci_domain 0 on

src/mainboard/amd/tilapia_fam10/devicetree.cb

@@ -1,8 +1,8 @@
 # sample config for amd/tilapia_fam10
 chip northbridge/amd/amdfam10/root_complex
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/amd/socket_AM3  #L1 and DDR3
-			 device apic 0 on end
+			 device lapic 0 on end
 		end
 	end
 	device pci_domain 0 on

src/mainboard/arima/hdama/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/amd/socket_940
-			device apic 0 on end
+			device lapic 0 on end
 		end
 	end
 	device pci_domain 0 on

src/mainboard/artecgroup/dbe61/devicetree.cb

@@ -32,9 +32,9 @@ chip northbridge/amd/lx
 		end
 	end
 	# APIC cluster is late CPU init.
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/amd/model_lx
-			device apic 0 on end
+			device lapic 0 on end
 		end
 	end
 

src/mainboard/asrock/939a785gmh/devicetree.cb

@@ -9,9 +9,9 @@
 #Define gfx_reconfiguration, 0: short reconfiguration, 1(default): long reconfiguration
 #Define gfx_link_width, 0: x16, 1: x1, 2: x2, 3: x4, 4: x8, 5: x12 (not supported), 6: x16
 chip northbridge/amd/amdk8/root_complex
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/amd/socket_939
-		device apic 0 on end
+		device lapic 0 on end
 		end
 	end
 	device pci_domain 0 on

src/mainboard/asus/a8n_e/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex		# Root complex
-  device apic_cluster 0 on			# APIC cluster
+  device lapic_cluster 0 on			# APIC cluster
     chip cpu/amd/socket_939			# Socket 939 CPU
-      device apic 0 on end			# APIC
+      device lapic 0 on end			# APIC
     end
   end
 

src/mainboard/asus/a8v-e_se/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex		# Root complex
-  device apic_cluster 0 on			# APIC cluster
+  device lapic_cluster 0 on			# APIC cluster
     chip cpu/amd/socket_939			# CPU
-      device apic 0 on end			# APIC
+      device lapic 0 on end			# APIC
     end
   end
   device pci_domain 0 on			# PCI domain

src/mainboard/asus/m2v-mx_se/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex		# Root complex
-  device apic_cluster 0 on			# APIC cluster
+  device lapic_cluster 0 on			# APIC cluster
     chip cpu/amd/socket_AM2			# CPU
-      device apic 0 on end			# APIC
+      device lapic 0 on end			# APIC
     end
   end
   device pci_domain 0 on			# PCI domain

src/mainboard/asus/mew-am/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/intel/i82810		# Northbridge
-  device apic_cluster 0 on		# APIC cluster
+  device lapic_cluster 0 on		# APIC cluster
     chip cpu/intel/socket_PGA370	# CPU
-      device apic 0 on end		# APIC
+      device lapic 0 on end		# APIC
     end
   end
   device pci_domain 0 on		# PCI domain

src/mainboard/asus/p2b-d/devicetree.cb

@@ -1,10 +1,10 @@
 chip northbridge/intel/i440bx		# Northbridge
-  device apic_cluster 0 on		# APIC cluster
+  device lapic_cluster 0 on		# APIC cluster
     chip cpu/intel/slot_1		# CPU
-      device apic 0 on end		# APIC
+      device lapic 0 on end		# APIC
     end
     chip cpu/intel/slot_1		# CPU
-      device apic 1 on end		# APIC
+      device lapic 1 on end		# APIC
     end
   end
   device pci_domain 0 on		# PCI domain

src/mainboard/asus/p2b-ds/devicetree.cb

@@ -1,10 +1,10 @@
 chip northbridge/intel/i440bx		# Northbridge
-  device apic_cluster 0 on		# APIC cluster
+  device lapic_cluster 0 on		# APIC cluster
     chip cpu/intel/slot_1		# CPU
-      device apic 0 on end		# APIC
+      device lapic 0 on end		# APIC
     end
     chip cpu/intel/slot_1		# CPU
-      device apic 1 on end		# APIC
+      device lapic 1 on end		# APIC
     end
   end
   device pci_domain 0 on		# PCI domain

src/mainboard/asus/p2b-f/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/intel/i440bx		# Northbridge
-  device apic_cluster 0 on		# APIC cluster
+  device lapic_cluster 0 on		# APIC cluster
     chip cpu/intel/slot_1		# CPU
-      device apic 0 on end		# APIC
+      device lapic 0 on end		# APIC
     end
   end
   device pci_domain 0 on		# PCI domain

src/mainboard/asus/p2b-ls/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/intel/i440bx		# Northbridge
-  device apic_cluster 0 on		# APIC cluster
+  device lapic_cluster 0 on		# APIC cluster
     chip cpu/intel/slot_1		# CPU
-      device apic 0 on end		# APIC
+      device lapic 0 on end		# APIC
     end
   end
   device pci_domain 0 on		# PCI domain

src/mainboard/asus/p2b/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/intel/i440bx		# Northbridge
-  device apic_cluster 0 on		# APIC cluster
+  device lapic_cluster 0 on		# APIC cluster
     chip cpu/intel/slot_1		# CPU
-      device apic 0 on end		# APIC
+      device lapic 0 on end		# APIC
     end
   end
   device pci_domain 0 on		# PCI domain

src/mainboard/asus/p3b-f/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/intel/i440bx		# Northbridge
-  device apic_cluster 0 on		# APIC cluster
+  device lapic_cluster 0 on		# APIC cluster
     chip cpu/intel/slot_1		# CPU
-      device apic 0 on end		# APIC
+      device lapic 0 on end		# APIC
     end
   end
   device pci_domain 0 on		# PCI domain

src/mainboard/azza/pt-6ibd/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/intel/i440bx		# Northbridge
-  device apic_cluster 0 on		# APIC cluster
+  device lapic_cluster 0 on		# APIC cluster
     chip cpu/intel/slot_1		# CPU
-      device apic 0 on end		# APIC
+      device lapic 0 on end		# APIC
     end
   end
   device pci_domain 0 on		# PCI domain

src/mainboard/bcom/winnetp680/devicetree.cb

@@ -56,9 +56,9 @@ chip northbridge/via/cn700			# Northbridge
       device pci 12.0 on end			# Ethernet
     end
   end
-  device apic_cluster 0 on			# APIC cluster
+  device lapic_cluster 0 on			# APIC cluster
     chip cpu/via/model_c7			# VIA C7
-      device apic 0 on end			# APIC
+      device lapic 0 on end			# APIC
     end
   end
 end

src/mainboard/biostar/m6tba/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/intel/i440bx		# Northbridge
-  device apic_cluster 0 on		# APIC cluster
+  device lapic_cluster 0 on		# APIC cluster
     chip cpu/intel/slot_1		# CPU
-      device apic 0 on end		# APIC
+      device lapic 0 on end		# APIC
     end
   end
   device pci_domain 0 on		# PCI domain

src/mainboard/broadcom/blast/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex
-        device apic_cluster 0 on
+        device lapic_cluster 0 on
                 chip cpu/amd/socket_940
-                        device apic 0 on end
+                        device lapic 0 on end
                 end
         end
 	device pci_domain 0 on

src/mainboard/compaq/deskpro_en_sff_p600/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/intel/i440bx		# Northbridge
-  device apic_cluster 0 on		# APIC cluster
+  device lapic_cluster 0 on		# APIC cluster
     chip cpu/intel/slot_1		# CPU
-      device apic 0 on end		# APIC
+      device lapic 0 on end		# APIC
     end
   end
   device pci_domain 0 on		# PCI domain

src/mainboard/dell/s1850/devicetree.cb

@@ -58,12 +58,12 @@ chip northbridge/intel/e7520 # mch
 		device pci 04.0 on end
 		device pci 06.0 on end
 	end
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/intel/socket_mPGA604 # cpu 0
-			device apic 0 on end
+			device lapic 0 on end
 		end
 		chip cpu/intel/socket_mPGA604 # cpu 1
-			device apic 6 on end
+			device lapic 6 on end
 		end
 	end
 	register "intrline" = "0x00070100"

src/mainboard/digitallogic/adl855pc/devicetree.cb

@@ -51,9 +51,9 @@ chip northbridge/intel/i855
                 	end
 		end
 	end
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/intel/socket_mPGA479M
-			device apic 0 on end
+			device lapic 0 on end
 		end
 	end
 end

src/mainboard/digitallogic/msm800sev/devicetree.cb

@@ -76,9 +76,9 @@ chip northbridge/amd/lx
 	end
 
 	# APIC cluster is late CPU init.
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/amd/model_lx
-			device apic 0 on end
+			device lapic 0 on end
 		end
 	end
 

src/mainboard/gigabyte/ga-6bxc/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/intel/i440bx		# Northbridge
-  device apic_cluster 0 on		# APIC cluster
+  device lapic_cluster 0 on		# APIC cluster
     chip cpu/intel/slot_1		# CPU
-      device apic 0 on end		# APIC
+      device lapic 0 on end		# APIC
     end
   end
   device pci_domain 0 on		# PCI domain

src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex
-        device apic_cluster 0 on
+        device lapic_cluster 0 on
                 chip cpu/amd/socket_AM2
-                        device apic 0 on end
+                        device lapic 0 on end
                 end
         end
 	device pci_domain 0 on

src/mainboard/gigabyte/m57sli/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/amd/socket_AM2
-			device apic 0 on end
+			device lapic 0 on end
 		end
 end
 device pci_domain 0 on

src/mainboard/hp/dl145_g3/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/amd/socket_F
-			device apic 0 on end
+			device lapic 0 on end
 		end
 	end
 	device pci_domain 0 on

src/mainboard/hp/e_vectra_p2706t/devicetree.cb

@@ -1,8 +1,8 @@
 # TODO: i810E actually!
 chip northbridge/intel/i82810			# Northbridge
-  device apic_cluster 0 on			# APIC cluster
+  device lapic_cluster 0 on			# APIC cluster
     chip cpu/intel/socket_PGA370		# CPU
-      device apic 0 on end			# APIC
+      device lapic 0 on end			# APIC
     end
   end
   device pci_domain 0 on

src/mainboard/ibm/e325/devicetree.cb

@@ -69,12 +69,12 @@ chip northbridge/amd/amdk8/root_complex
 			device pci 19.3 on end
 		end
 	end
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/amd/socket_940
-			device apic 0 on end
+			device lapic 0 on end
 		end
 		chip cpu/amd/socket_940
-			device apic 1 on end
+			device lapic 1 on end
 		end
 	end
 end

src/mainboard/ibm/e326/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/amd/socket_940
-			device apic 0 on end
+			device lapic 0 on end
 		end
 	end
 

src/mainboard/iei/pcisa-lx-800-r10/devicetree.cb

@@ -67,9 +67,9 @@ chip northbridge/amd/lx
 		end
 	end
 	# APIC cluster is late CPU init.
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/amd/model_lx
-			device apic 0 on end
+			device lapic 0 on end
 		end
 	end
 end

src/mainboard/intel/d945gclf/devicetree.cb

@@ -19,9 +19,9 @@
 
 chip northbridge/intel/i945
 
-        device apic_cluster 0 on
+        device lapic_cluster 0 on
                 chip cpu/intel/socket_441
-                        device apic 0 on end
+                        device lapic 0 on end
                 end
         end
 

src/mainboard/intel/eagleheights/devicetree.cb

@@ -64,9 +64,9 @@ chip northbridge/intel/i3100
 			device pci 1f.4 on end # Performance counters
                 end
         end
-        device apic_cluster 0 on
+        device lapic_cluster 0 on
                 chip cpu/intel/bga956
-                        device apic 0 on end
+                        device lapic 0 on end
                 end
         end
 end

src/mainboard/intel/jarrell/devicetree.cb

@@ -68,12 +68,12 @@ chip northbridge/intel/e7520
 			register "gpio[41]" = "ICH5R_GPIO_USE_AS_GPIO | ICH5R_GPIO_SEL_INPUT"
 		end
 	end
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/intel/socket_mPGA604 # cpu 0
-			device apic 0 on end
+			device lapic 0 on end
 		end
 		chip cpu/intel/socket_mPGA604 # cpu 1
-			device apic 6 on end
+			device lapic 6 on end
 		end
 	end
 end

src/mainboard/intel/mtarvon/devicetree.cb

@@ -36,9 +36,9 @@ chip northbridge/intel/i3100
                         device pci 1f.3 on end # SMBus
                 end
         end
-        device apic_cluster 0 on
+        device lapic_cluster 0 on
                 chip cpu/intel/socket_mPGA479M
-                        device apic 0 on end
+                        device lapic 0 on end
                 end
         end
 end

src/mainboard/intel/truxton/devicetree.cb

@@ -46,9 +46,9 @@ chip northbridge/intel/i3100
                         device pci 1f.4 on end  # ?
                 end
         end
-        device apic_cluster 0 on
+        device lapic_cluster 0 on
                 chip cpu/intel/ep80579
-                        device apic 0 on end
+                        device lapic 0 on end
                 end
         end
 end

src/mainboard/intel/xe7501devkit/devicetree.cb

@@ -61,12 +61,12 @@ chip northbridge/intel/e7501
 			device pci 1f.6 off end # AC97 Modem
 		end # SB
 	end # PCI_DOMAIN
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/intel/socket_mPGA604
-			device apic 0 on end
+			device lapic 0 on end
 		end
 		chip cpu/intel/socket_mPGA604
-			device apic 6 on end
+			device lapic 6 on end
 		end
 	end
 end

src/mainboard/iwill/dk8_htx/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex
-        device apic_cluster 0 on
+        device lapic_cluster 0 on
                 chip cpu/amd/socket_940
-                        device apic 0 on end
+                        device lapic 0 on end
                 end
         end
 	device pci_domain 0 on

src/mainboard/iwill/dk8s2/devicetree.cb

@@ -77,12 +77,12 @@ chip northbridge/amd/amdk8/root_complex
 			device pci 19.3 on end
 		end
 	end
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/amd/socket_940
-			device apic 0 on end
+			device lapic 0 on end
 		end
 		chip cpu/amd/socket_940
-			device apic 1 on end
+			device lapic 1 on end
 		end
 	end
 end

src/mainboard/iwill/dk8x/devicetree.cb

@@ -56,12 +56,12 @@ chip northbridge/amd/amdk8/root_complex
 			device pci 19.3 on end
 		end
 	end
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/amd/socket_940
-			device apic 0 on end
+			device lapic 0 on end
 		end
 		chip cpu/amd/socket_940
-			device apic 1 on end
+			device lapic 1 on end
 		end
 	end
 end

src/mainboard/jetway/j7f24/devicetree.cb

@@ -54,9 +54,9 @@ chip northbridge/via/cn700			# Northbridge
       device pci 12.0 on end			# Ethernet
     end
   end
-  device apic_cluster 0 on			# APIC cluster
+  device lapic_cluster 0 on			# APIC cluster
     chip cpu/via/model_c7			# VIA C7
-      device apic 0 on end			# APIC
+      device lapic 0 on end			# APIC
     end
   end
 end

src/mainboard/kontron/986lcd-m/devicetree.cb

@@ -1,8 +1,8 @@
 chip northbridge/intel/i945
 
-        device apic_cluster 0 on
+        device lapic_cluster 0 on
                 chip cpu/intel/socket_mFCPGA478
-                        device apic 0 on end
+                        device lapic 0 on end
                 end
         end
 

src/mainboard/kontron/kt690/devicetree.cb

@@ -9,9 +9,9 @@
 #Define gfx_reconfiguration, 0: short reconfiguration, 1(default): long reconfiguration
 #Define gfx_link_width, 0: x16, 1: x1, 2: x2, 3: x4, 4: x8, 5: x12 (not supported), 6: x16
 chip northbridge/amd/amdk8/root_complex
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/amd/socket_S1G1
-		device apic 0 on end
+		device lapic 0 on end
 		end
 	end
 	device pci_domain 0 on

src/mainboard/lippert/roadrunner-lx/devicetree.cb

@@ -81,9 +81,9 @@ chip northbridge/amd/lx
     end
   end
   # APIC cluster is late CPU init.
-  device apic_cluster 0 on
+  device lapic_cluster 0 on
     chip cpu/amd/model_lx
-      device apic 0 on end
+      device lapic 0 on end
     end
   end
 end

src/mainboard/lippert/spacerunner-lx/devicetree.cb

@@ -82,9 +82,9 @@ chip northbridge/amd/lx
     end
   end
   # APIC cluster is late CPU init.
-  device apic_cluster 0 on
+  device lapic_cluster 0 on
     chip cpu/amd/model_lx
-      device apic 0 on end
+      device lapic 0 on end
     end
   end
 end

src/mainboard/mitac/6513wu/devicetree.cb

@@ -19,9 +19,9 @@
 ##
 
 chip northbridge/intel/i82810           # Northbridge
-  device apic_cluster 0 on              # APIC cluster
+  device lapic_cluster 0 on              # APIC cluster
     chip cpu/intel/socket_PGA370        # CPU
-      device apic 0 on end              # APIC
+      device lapic 0 on end              # APIC
     end
   end
   device pci_domain 0 on                # PCI domain

src/mainboard/msi/ms6119/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/intel/i440bx		# Northbridge
-  device apic_cluster 0 on		# APIC cluster
+  device lapic_cluster 0 on		# APIC cluster
     chip cpu/intel/slot_1		# CPU
-      device apic 0 on end		# APIC
+      device lapic 0 on end		# APIC
     end
   end
   device pci_domain 0 on		# PCI domain

src/mainboard/msi/ms6147/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/intel/i440bx		# Northbridge
-  device apic_cluster 0 on		# APIC cluster
+  device lapic_cluster 0 on		# APIC cluster
     chip cpu/intel/slot_1		# CPU
-      device apic 0 on end		# APIC
+      device lapic 0 on end		# APIC
     end
   end
   device pci_domain 0 on		# PCI domain

src/mainboard/msi/ms6156/devicetree.cb

@@ -19,9 +19,9 @@
 ##
 
 chip northbridge/intel/i440bx		# Northbridge
-  device apic_cluster 0 on		# APIC cluster
+  device lapic_cluster 0 on		# APIC cluster
     chip cpu/intel/slot_1		# CPU
-      device apic 0 on end		# APIC
+      device lapic 0 on end		# APIC
     end
   end
   device pci_domain 0 on		# PCI domain

src/mainboard/msi/ms6178/devicetree.cb

@@ -19,9 +19,9 @@
 ##
 
 chip northbridge/intel/i82810			# Northbridge
-  device apic_cluster 0 on			# APIC cluster
+  device lapic_cluster 0 on			# APIC cluster
     chip cpu/intel/socket_PGA370		# CPU
-      device apic 0 on end			# APIC
+      device lapic 0 on end			# APIC
     end
   end
   device pci_domain 0 on

src/mainboard/msi/ms7135/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex		# Root complex
-  device apic_cluster 0 on			# APIC cluster
+  device lapic_cluster 0 on			# APIC cluster
     chip cpu/amd/socket_754			# Socket 754 CPU
-      device apic 0 on end			# APIC
+      device lapic 0 on end			# APIC
     end
   end
 

src/mainboard/msi/ms7260/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex		# Root complex
-  device apic_cluster 0 on			# APIC cluster
+  device lapic_cluster 0 on			# APIC cluster
     chip cpu/amd/socket_AM2			# CPU
-      device apic 0 on end			# APIC
+      device lapic 0 on end			# APIC
     end
   end
   device pci_domain 0 on			# PCI domain

src/mainboard/msi/ms9185/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex
-        device apic_cluster 0 on
+        device lapic_cluster 0 on
                 chip cpu/amd/socket_F
-                        device apic 0 on end
+                        device lapic 0 on end
                 end
         end
        device pci_domain 0 on

src/mainboard/msi/ms9282/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex
-        device apic_cluster 0 on
+        device lapic_cluster 0 on
                 chip cpu/amd/socket_F
-                        device apic 0 on end
+                        device lapic 0 on end
                 end
         end
 

src/mainboard/msi/ms9652_fam10/devicetree.cb

@@ -22,9 +22,9 @@
 ##
 
 chip northbridge/amd/amdfam10/root_complex
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/amd/socket_F_1207
-			device apic 0 on end
+			device lapic 0 on end
 		end
 	end
 	device pci_domain 0 on

src/mainboard/nec/powermate2000/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/intel/i82810			# Northbridge
-  device apic_cluster 0 on			# APIC cluster
+  device lapic_cluster 0 on			# APIC cluster
     chip cpu/intel/socket_PGA370		# CPU
-      device apic 0 on end			# APIC
+      device lapic 0 on end			# APIC
     end
   end
   device pci_domain 0 on

src/mainboard/newisys/khepri/devicetree.cb

@@ -1,10 +1,10 @@
 chip northbridge/amd/amdk8/root_complex
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/amd/socket_940
-			device apic 0 on end
+			device lapic 0 on end
 		end
 		chip cpu/amd/socket_940
-			device apic 1 on end
+			device lapic 1 on end
 		end
 	end
 

src/mainboard/nokia/ip530/devicetree.cb

@@ -19,9 +19,9 @@
 ##
 
 chip northbridge/intel/i440bx		# Northbridge
-  device apic_cluster 0 on		# APIC cluster
+  device lapic_cluster 0 on		# APIC cluster
     chip cpu/intel/socket_PGA370	# CPU
-      device apic 0 on end		# APIC
+      device lapic 0 on end		# APIC
     end
   end
   device pci_domain 0 on		# PCI domain

src/mainboard/nvidia/l1_2pvv/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/amd/socket_F
-			device apic 0 on end
+			device lapic 0 on end
 		end
 	end
 	device pci_domain 0 on

src/mainboard/olpc/btest/devicetree.cb

@@ -1,9 +1,9 @@
 chip northbridge/amd/gx2
 	register "irqmap" = "0xaa5b"
 	register "setupflash" = "0"
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/amd/model_gx2
-			device apic 0 on end
+			device lapic 0 on end
 		end
 	end
   	device pci_domain 0 on

src/mainboard/olpc/rev_a/devicetree.cb

@@ -1,9 +1,9 @@
 chip northbridge/amd/gx2
 	register "irqmap" = "0xaa5b"
 	register "setupflash" = "0"
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/amd/model_gx2
-			device apic 0 on end
+			device lapic 0 on end
 		end
 	end
   	device pci_domain 0 on

src/mainboard/pcengines/alix1c/devicetree.cb

@@ -76,9 +76,9 @@ chip northbridge/amd/lx
 	end
 
 	# APIC cluster is late CPU init.
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/amd/model_lx
-			device apic 0 on end
+			device lapic 0 on end
 		end
 	end
 

src/mainboard/rca/rm4100/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/intel/i82830		# Northbridge
-  device apic_cluster 0 on		# APIC cluster
+  device lapic_cluster 0 on		# APIC cluster
     chip cpu/intel/socket_mFCBGA479	# Mobile Celeron Micro-FCBGA Socket 479
-      device apic 0 on end		# APIC
+      device lapic 0 on end		# APIC
     end
   end
   device pci_domain 0 on		# PCI domain

src/mainboard/roda/rk886ex/devicetree.cb

@@ -21,9 +21,9 @@
 
 chip northbridge/intel/i945
 
-        device apic_cluster 0 on
+        device lapic_cluster 0 on
                 chip cpu/intel/socket_mFCPGA478
-                        device apic 0 on end
+                        device lapic 0 on end
                 end
         end
 

src/mainboard/soyo/sy-6ba-plus-iii/devicetree.cb

@@ -19,9 +19,9 @@
 ##
 
 chip northbridge/intel/i440bx		# Northbridge
-  device apic_cluster 0 on		# APIC cluster
+  device lapic_cluster 0 on		# APIC cluster
     chip cpu/intel/slot_1		# CPU
-      device apic 0 on end		# APIC
+      device lapic 0 on end		# APIC
     end
   end
   device pci_domain 0 on		# PCI domain

src/mainboard/sunw/ultra40/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex
-        device apic_cluster 0 on
+        device lapic_cluster 0 on
                 chip cpu/amd/socket_940
-                        device apic 0 on end
+                        device lapic 0 on end
                 end
         end
 	device pci_domain 0 on

src/mainboard/supermicro/h8dme/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex
-        device apic_cluster 0 on
+        device lapic_cluster 0 on
                 chip cpu/amd/socket_F
-                        device apic 0 on end
+                        device lapic 0 on end
                 end
         end
 	device pci_domain 0 on

src/mainboard/supermicro/h8dmr/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex
-        device apic_cluster 0 on
+        device lapic_cluster 0 on
                 chip cpu/amd/socket_F
-                        device apic 0 on end
+                        device lapic 0 on end
                 end
         end
 	device pci_domain 0 on

src/mainboard/supermicro/h8dmr_fam10/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/amd/amdfam10/root_complex
-        device apic_cluster 0 on
+        device lapic_cluster 0 on
                 chip cpu/amd/socket_F_1207
-                        device apic 0 on end
+                        device lapic 0 on end
                 end
         end
 	device pci_domain 0 on

src/mainboard/supermicro/h8qme_fam10/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/amd/amdfam10/root_complex
-        device apic_cluster 0 on
+        device lapic_cluster 0 on
                 chip cpu/amd/socket_F_1207
-                        device apic 0 on end
+                        device lapic 0 on end
                 end
         end
 	device pci_domain 0 on

src/mainboard/supermicro/x6dai_g/devicetree.cb

@@ -52,12 +52,12 @@ chip northbridge/intel/e7525 # mch
 		device pci 04.0 on end
 		device pci 08.0 on end
 	end
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/intel/socket_mPGA604 # cpu0
-			device apic 0 on end
+			device lapic 0 on end
 		end
 		chip cpu/intel/socket_mPGA604 # cpu1
-			device apic 6 on end
+			device lapic 6 on end
 		end
 	end
 end

src/mainboard/supermicro/x6dhe_g/devicetree.cb

@@ -75,12 +75,12 @@ chip northbridge/intel/e7520  # MCH
 		device 	pci 06.0 on end
 	end
 
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/intel/socket_mPGA604  	# CPU 0
-			device apic 0 on end
+			device lapic 0 on end
 		end
 		chip cpu/intel/socket_mPGA604 	# CPU 1
-			device apic 6 on end
+			device lapic 6 on end
 		end
 	end
 end

src/mainboard/supermicro/x6dhe_g2/devicetree.cb

@@ -75,12 +75,12 @@ chip northbridge/intel/e7520  # MCH
 		device 	pci 06.0 on end
 	end
 
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/intel/socket_mPGA604  	# CPU 0
-			device apic 0 on end
+			device lapic 0 on end
 		end
 		chip cpu/intel/socket_mPGA604 	# CPU 1
-			device apic 6 on end
+			device lapic 6 on end
 		end
 	end
 end

src/mainboard/supermicro/x6dhr_ig/devicetree.cb

@@ -71,12 +71,12 @@ chip northbridge/intel/e7520 # mch
 		end
 		device pci 06.0 on end
 	end
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/intel/socket_mPGA604 # cpu 0
-			device apic 0 on end
+			device lapic 0 on end
 		end
 		chip cpu/intel/socket_mPGA604 # cpu 1
-			device apic 6 on end
+			device lapic 6 on end
 		end
 	end
 	register "intrline" = "0x00070105"

src/mainboard/supermicro/x6dhr_ig2/devicetree.cb

@@ -62,12 +62,12 @@ chip northbridge/intel/e7520 # mch
 		device pci 04.0 on end
 		device pci 06.0 on end
 	end
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/intel/socket_mPGA604 # cpu 0
-			device apic 0 on end
+			device lapic 0 on end
 		end
 		chip cpu/intel/socket_mPGA604 # cpu 1
-			device apic 6 on end
+			device lapic 6 on end
 		end
 	end
 	register "intrline" = "0x00070105"

src/mainboard/technexion/tim5690/devicetree.cb

@@ -9,9 +9,9 @@
 #Define gfx_reconfiguration, 0: short reconfiguration, 1(default): long reconfiguration
 #Define gfx_link_width, 0: x16, 1: x1, 2: x2, 3: x4, 4: x8, 5: x12 (not supported), 6: x16
 chip northbridge/amd/amdk8/root_complex
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/amd/socket_S1G1
-		device apic 0 on end
+		device lapic 0 on end
 		end
 	end
 	device pci_domain 0 on

src/mainboard/technexion/tim8690/devicetree.cb

@@ -9,9 +9,9 @@
 #Define gfx_reconfiguration, 0: short reconfiguration, 1(default): long reconfiguration
 #Define gfx_link_width, 0: x16, 1: x1, 2: x2, 3: x4, 4: x8, 5: x12 (not supported), 6: x16
 chip northbridge/amd/amdk8/root_complex
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/amd/socket_S1G1
-		device apic 0 on end
+		device lapic 0 on end
 		end
 	end
 	device pci_domain 0 on

src/mainboard/thomson/ip1000/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/intel/i82830		# Northbridge
-  device apic_cluster 0 on		# APIC cluster
+  device lapic_cluster 0 on		# APIC cluster
     chip cpu/intel/socket_mFCBGA479	# Low Voltage PIII Micro-FCBGA Socket 479
-      device apic 0 on end		# APIC
+      device lapic 0 on end		# APIC
     end
   end
 

src/mainboard/tyan/s1846/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/intel/i440bx		# Northbridge
-  device apic_cluster 0 on		# APIC cluster
+  device lapic_cluster 0 on		# APIC cluster
     chip cpu/intel/slot_1		# CPU
-      device apic 0 on end		# APIC
+      device lapic 0 on end		# APIC
     end
   end
   device pci_domain 0 on		# PCI domain

src/mainboard/tyan/s2735/devicetree.cb

@@ -73,12 +73,12 @@ chip northbridge/intel/e7501
 		        device pci 1f.6 off end
 		end # SB
         end # PCI_DOMAIN
-        device apic_cluster 0 on
+        device lapic_cluster 0 on
                 chip cpu/intel/socket_mPGA604
-                        device apic 0 on end
+                        device lapic 0 on end
                 end
                 chip cpu/intel/socket_mPGA604
-                        device apic 6 on end
+                        device lapic 6 on end
                 end
         end
 end

src/mainboard/tyan/s2850/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex
-        device apic_cluster 0 on
+        device lapic_cluster 0 on
                 chip cpu/amd/socket_940
-                        device apic 0 on end
+                        device lapic 0 on end
                 end
         end
 	device pci_domain 0 on

src/mainboard/tyan/s2875/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex
-        device apic_cluster 0 on
+        device lapic_cluster 0 on
                 chip cpu/amd/socket_940
-                        device apic 0 on end
+                        device lapic 0 on end
                 end
         end
 	device pci_domain 0 on

src/mainboard/tyan/s2880/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex
-        device apic_cluster 0 on
+        device lapic_cluster 0 on
                 chip cpu/amd/socket_940
-                        device apic 0 on end
+                        device lapic 0 on end
                 end
         end
 	device pci_domain 0 on

src/mainboard/tyan/s2881/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex
-        device apic_cluster 0 on
+        device lapic_cluster 0 on
                 chip cpu/amd/socket_940
-                        device apic 0 on end
+                        device lapic 0 on end
                 end
         end
 	device pci_domain 0 on

src/mainboard/tyan/s2882/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex
-        device apic_cluster 0 on
+        device lapic_cluster 0 on
                 chip cpu/amd/socket_940
-                        device apic 0 on end
+                        device lapic 0 on end
                 end
         end
 

src/mainboard/tyan/s2885/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex
-        device apic_cluster 0 on
+        device lapic_cluster 0 on
                 chip cpu/amd/socket_940
-                        device apic 0 on end
+                        device lapic 0 on end
                 end
         end
 	device pci_domain 0 on

src/mainboard/tyan/s2891/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/amd/socket_940
-			device apic 0 on end
+			device lapic 0 on end
 		end
 	end
 	device pci_domain 0 on

src/mainboard/tyan/s2892/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/amd/socket_940
-			device apic 0 on end
+			device lapic 0 on end
 		end
 	end
 	device pci_domain 0 on

src/mainboard/tyan/s2895/devicetree.cb

@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/amd/socket_940
-			device apic 0 on end
+			device lapic 0 on end
 		end
 	end
 	device pci_domain 0 on