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

6 files changed, 14 insertions, 14 deletions

diff --git a/src/mainboard/intel/d945gclf/devicetree.cb b/src/mainboard/intel/d945gclf/devicetree.cb
index 01a0bc67a5..c808cdc763 100644
--- a/src/mainboard/intel/d945gclf/devicetree.cb
+++ b/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
 
diff --git a/src/mainboard/intel/eagleheights/devicetree.cb b/src/mainboard/intel/eagleheights/devicetree.cb
index e5bbf20297..e628ddab7b 100644
--- a/src/mainboard/intel/eagleheights/devicetree.cb
+++ b/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
diff --git a/src/mainboard/intel/jarrell/devicetree.cb b/src/mainboard/intel/jarrell/devicetree.cb
index 3a40899b29..a187d23041 100644
--- a/src/mainboard/intel/jarrell/devicetree.cb
+++ b/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
diff --git a/src/mainboard/intel/mtarvon/devicetree.cb b/src/mainboard/intel/mtarvon/devicetree.cb
index 1a11859b09..8585b54e17 100644
--- a/src/mainboard/intel/mtarvon/devicetree.cb
+++ b/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
diff --git a/src/mainboard/intel/truxton/devicetree.cb b/src/mainboard/intel/truxton/devicetree.cb
index a21c2f4eae..7563f028f9 100644
--- a/src/mainboard/intel/truxton/devicetree.cb
+++ b/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
diff --git a/src/mainboard/intel/xe7501devkit/devicetree.cb b/src/mainboard/intel/xe7501devkit/devicetree.cb
index efa0d88216..327545785f 100644
--- a/src/mainboard/intel/xe7501devkit/devicetree.cb
+++ b/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