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

9 files changed, 23 insertions, 23 deletions

diff --git a/src/mainboard/supermicro/h8dme/devicetree.cb b/src/mainboard/supermicro/h8dme/devicetree.cb
index f6f75efb65..3a5aa79a38 100644
--- a/src/mainboard/supermicro/h8dme/devicetree.cb
+++ b/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
diff --git a/src/mainboard/supermicro/h8dmr/devicetree.cb b/src/mainboard/supermicro/h8dmr/devicetree.cb
index 67920c4657..a730514799 100644
--- a/src/mainboard/supermicro/h8dmr/devicetree.cb
+++ b/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
diff --git a/src/mainboard/supermicro/h8dmr_fam10/devicetree.cb b/src/mainboard/supermicro/h8dmr_fam10/devicetree.cb
index c142dcb290..adbe04d68c 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/devicetree.cb
+++ b/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
diff --git a/src/mainboard/supermicro/h8qme_fam10/devicetree.cb b/src/mainboard/supermicro/h8qme_fam10/devicetree.cb
index 5759f40ccf..d6f31fa82c 100644
--- a/src/mainboard/supermicro/h8qme_fam10/devicetree.cb
+++ b/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
diff --git a/src/mainboard/supermicro/x6dai_g/devicetree.cb b/src/mainboard/supermicro/x6dai_g/devicetree.cb
index 038964e9ad..c8ce779ca2 100644
--- a/src/mainboard/supermicro/x6dai_g/devicetree.cb
+++ b/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
diff --git a/src/mainboard/supermicro/x6dhe_g/devicetree.cb b/src/mainboard/supermicro/x6dhe_g/devicetree.cb
index 075acfc232..6dd6b17d66 100644
--- a/src/mainboard/supermicro/x6dhe_g/devicetree.cb
+++ b/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
diff --git a/src/mainboard/supermicro/x6dhe_g2/devicetree.cb b/src/mainboard/supermicro/x6dhe_g2/devicetree.cb
index bbc4e76778..04110b0eb7 100644
--- a/src/mainboard/supermicro/x6dhe_g2/devicetree.cb
+++ b/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
diff --git a/src/mainboard/supermicro/x6dhr_ig/devicetree.cb b/src/mainboard/supermicro/x6dhr_ig/devicetree.cb
index b989e76e8a..df778ed61b 100644
--- a/src/mainboard/supermicro/x6dhr_ig/devicetree.cb
+++ b/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"
diff --git a/src/mainboard/supermicro/x6dhr_ig2/devicetree.cb b/src/mainboard/supermicro/x6dhr_ig2/devicetree.cb
index ed3fa65219..77c9e9d7cb 100644
--- a/src/mainboard/supermicro/x6dhr_ig2/devicetree.cb
+++ b/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"