sconfig: rename lapic_cluster -> cpu_cluster

The name lapic_cluster is a bit misleading, since the construct is not local
APIC specific by concept. As implementations and hardware change, be more
generic about our naming. This will allow us to support non-x86 systems without
adding new keywords.

Change-Id: Icd7f5fcf6f54d242eabb5e14ee151eec8d6cceb1
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Signed-off-by: David Hendricks <dhendrix@chromium.org>
Reviewed-on: http://review.coreboot.org/2377
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
diff --git a/src/include/device/path.h b/src/include/device/path.h
index c59b49e..00fb727 100644
--- a/src/include/device/path.h
+++ b/src/include/device/path.h
@@ -9,7 +9,7 @@
 	DEVICE_PATH_I2C,
 	DEVICE_PATH_APIC,
 	DEVICE_PATH_DOMAIN,
-	DEVICE_PATH_APIC_CLUSTER,
+	DEVICE_PATH_CPU_CLUSTER,
 	DEVICE_PATH_CPU,
 	DEVICE_PATH_CPU_BUS,
 	DEVICE_PATH_IOAPIC,
@@ -50,7 +50,7 @@
 	unsigned ioapic_id;
 };
 
-struct apic_cluster_path
+struct cpu_cluster_path
 {
 	unsigned cluster;
 };
@@ -69,15 +69,15 @@
 struct device_path {
 	enum device_path_type type;
 	union {
-		struct pci_path          pci;
-		struct pnp_path          pnp;
-		struct i2c_path          i2c;
-		struct apic_path         apic;
-		struct ioapic_path	 ioapic;
-		struct domain_path	 domain;
-		struct apic_cluster_path apic_cluster;
-		struct cpu_path          cpu;
-		struct cpu_bus_path      cpu_bus;
+		struct pci_path		pci;
+		struct pnp_path		pnp;
+		struct i2c_path		i2c;
+		struct apic_path	apic;
+		struct ioapic_path	ioapic;
+		struct domain_path	domain;
+		struct cpu_cluster_path cpu_cluster;
+		struct cpu_path		cpu;
+		struct cpu_bus_path	cpu_bus;
 	};
 };