From 0aa37c488bf785466e0db9897805ebf287af48eb Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Tue, 12 Feb 2013 15:20:54 -0800 Subject: 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 Signed-off-by: David Hendricks Reviewed-on: http://review.coreboot.org/2377 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich --- src/arch/x86/boot/acpi.c | 2 +- src/arch/x86/boot/mpspec.c | 2 +- src/cpu/amd/sc520/sc520.c | 2 +- src/cpu/intel/speedstep/acpi.c | 2 +- src/device/device_util.c | 14 +++++++------- src/include/device/path.h | 22 +++++++++++----------- src/mainboard/a-trend/atc-6220/devicetree.cb | 2 +- src/mainboard/a-trend/atc-6240/devicetree.cb | 2 +- src/mainboard/aaeon/pfm-540i_revb/devicetree.cb | 2 +- src/mainboard/abit/be6-ii_v2_0/devicetree.cb | 2 +- src/mainboard/advansus/a785e-i/devicetree.cb | 2 +- src/mainboard/amd/bimini_fam10/devicetree.cb | 2 +- src/mainboard/amd/db800/devicetree.cb | 2 +- src/mainboard/amd/dbm690t/devicetree.cb | 2 +- src/mainboard/amd/dinar/devicetree.cb | 2 +- src/mainboard/amd/inagua/devicetree.cb | 2 +- src/mainboard/amd/mahogany/devicetree.cb | 2 +- src/mainboard/amd/mahogany_fam10/devicetree.cb | 2 +- src/mainboard/amd/norwich/devicetree.cb | 2 +- src/mainboard/amd/parmer/devicetree.cb | 2 +- src/mainboard/amd/persimmon/devicetree.cb | 2 +- src/mainboard/amd/pistachio/devicetree.cb | 2 +- src/mainboard/amd/rumba/devicetree.cb | 2 +- src/mainboard/amd/serengeti_cheetah/devicetree.cb | 2 +- .../amd/serengeti_cheetah_fam10/devicetree.cb | 2 +- src/mainboard/amd/south_station/devicetree.cb | 2 +- src/mainboard/amd/thatcher/devicetree.cb | 2 +- src/mainboard/amd/tilapia_fam10/devicetree.cb | 2 +- src/mainboard/amd/torpedo/devicetree.cb | 2 +- src/mainboard/amd/union_station/devicetree.cb | 2 +- src/mainboard/aopen/dxplplusu/devicetree.cb | 2 +- src/mainboard/arima/hdama/devicetree.cb | 2 +- src/mainboard/artecgroup/dbe61/devicetree.cb | 2 +- src/mainboard/asrock/939a785gmh/devicetree.cb | 2 +- src/mainboard/asrock/e350m1/devicetree.cb | 2 +- src/mainboard/asus/a8n_e/devicetree.cb | 2 +- src/mainboard/asus/a8v-e_deluxe/devicetree.cb | 2 +- src/mainboard/asus/a8v-e_se/devicetree.cb | 2 +- src/mainboard/asus/dsbf/devicetree.cb | 2 +- src/mainboard/asus/k8v-x/devicetree.cb | 2 +- src/mainboard/asus/m2n-e/devicetree.cb | 2 +- src/mainboard/asus/m2v-mx_se/devicetree.cb | 2 +- src/mainboard/asus/m2v/devicetree.cb | 2 +- src/mainboard/asus/m4a78-em/devicetree.cb | 2 +- src/mainboard/asus/m4a785-m/devicetree.cb | 2 +- src/mainboard/asus/m4a785t-m/devicetree.cb | 2 +- src/mainboard/asus/m5a88-v/devicetree.cb | 2 +- src/mainboard/asus/mew-am/devicetree.cb | 2 +- src/mainboard/asus/p2b-d/devicetree.cb | 2 +- src/mainboard/asus/p2b-ds/devicetree.cb | 2 +- src/mainboard/asus/p2b-f/devicetree.cb | 2 +- src/mainboard/asus/p2b-ls/devicetree.cb | 2 +- src/mainboard/asus/p2b/devicetree.cb | 2 +- src/mainboard/asus/p3b-f/devicetree.cb | 2 +- src/mainboard/avalue/eax-785e/devicetree.cb | 2 +- src/mainboard/azza/pt-6ibd/devicetree.cb | 2 +- src/mainboard/bachmann/ot200/devicetree.cb | 2 +- src/mainboard/bcom/winnetp680/devicetree.cb | 2 +- src/mainboard/biostar/m6tba/devicetree.cb | 2 +- src/mainboard/broadcom/blast/devicetree.cb | 2 +- .../compaq/deskpro_en_sff_p600/devicetree.cb | 2 +- src/mainboard/digitallogic/adl855pc/devicetree.cb | 2 +- src/mainboard/digitallogic/msm800sev/devicetree.cb | 2 +- src/mainboard/ecs/p6iwp-fe/devicetree.cb | 2 +- src/mainboard/getac/p470/devicetree.cb | 2 +- src/mainboard/gigabyte/ga-6bxc/devicetree.cb | 2 +- src/mainboard/gigabyte/ga-6bxe/devicetree.cb | 2 +- src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb | 2 +- src/mainboard/gigabyte/m57sli/devicetree.cb | 2 +- src/mainboard/gigabyte/ma785gm/devicetree.cb | 2 +- src/mainboard/gigabyte/ma785gmt/devicetree.cb | 2 +- src/mainboard/gigabyte/ma78gm/devicetree.cb | 2 +- src/mainboard/google/butterfly/devicetree.cb | 2 +- src/mainboard/google/parrot/devicetree.cb | 2 +- src/mainboard/hp/dl145_g1/devicetree.cb | 2 +- src/mainboard/hp/dl145_g3/devicetree.cb | 2 +- src/mainboard/hp/dl165_g6_fam10/devicetree.cb | 2 +- src/mainboard/hp/e_vectra_p2706t/devicetree.cb | 2 +- src/mainboard/ibase/mb899/devicetree.cb | 2 +- src/mainboard/ibm/e325/devicetree.cb | 2 +- src/mainboard/ibm/e326/devicetree.cb | 2 +- src/mainboard/iei/kino-780am2-fam10/devicetree.cb | 2 +- src/mainboard/iei/pcisa-lx-800-r10/devicetree.cb | 2 +- src/mainboard/iei/pm-lx-800-r11/devicetree.cb | 2 +- src/mainboard/iei/pm-lx2-800-r10/devicetree.cb | 2 +- src/mainboard/intel/d810e2cb/devicetree.cb | 2 +- src/mainboard/intel/d945gclf/devicetree.cb | 2 +- src/mainboard/intel/eagleheights/devicetree.cb | 2 +- src/mainboard/intel/emeraldlake2/devicetree.cb | 2 +- src/mainboard/intel/jarrell/devicetree.cb | 2 +- src/mainboard/intel/mtarvon/devicetree.cb | 2 +- src/mainboard/intel/truxton/devicetree.cb | 2 +- src/mainboard/intel/xe7501devkit/devicetree.cb | 2 +- src/mainboard/iwave/iWRainbowG6/devicetree.cb | 2 +- src/mainboard/iwill/dk8_htx/devicetree.cb | 2 +- src/mainboard/iwill/dk8s2/devicetree.cb | 2 +- src/mainboard/iwill/dk8x/devicetree.cb | 2 +- src/mainboard/jetway/j7f24/devicetree.cb | 2 +- src/mainboard/jetway/pa78vm5/devicetree.cb | 2 +- src/mainboard/kontron/986lcd-m/devicetree.cb | 2 +- src/mainboard/kontron/kt690/devicetree.cb | 2 +- src/mainboard/lanner/em8510/devicetree.cb | 2 +- src/mainboard/lenovo/t60/devicetree.cb | 2 +- src/mainboard/lenovo/x60/devicetree.cb | 2 +- src/mainboard/lippert/frontrunner/devicetree.cb | 2 +- src/mainboard/lippert/hurricane-lx/devicetree.cb | 2 +- src/mainboard/lippert/literunner-lx/devicetree.cb | 2 +- src/mainboard/lippert/roadrunner-lx/devicetree.cb | 2 +- src/mainboard/lippert/spacerunner-lx/devicetree.cb | 2 +- src/mainboard/mitac/6513wu/devicetree.cb | 2 +- src/mainboard/msi/ms6119/devicetree.cb | 2 +- src/mainboard/msi/ms6147/devicetree.cb | 2 +- src/mainboard/msi/ms6156/devicetree.cb | 2 +- src/mainboard/msi/ms6178/devicetree.cb | 2 +- src/mainboard/msi/ms7135/devicetree.cb | 2 +- src/mainboard/msi/ms7260/devicetree.cb | 2 +- src/mainboard/msi/ms9185/devicetree.cb | 2 +- src/mainboard/msi/ms9282/devicetree.cb | 2 +- src/mainboard/msi/ms9652_fam10/devicetree.cb | 2 +- src/mainboard/nec/powermate2000/devicetree.cb | 2 +- src/mainboard/newisys/khepri/devicetree.cb | 2 +- src/mainboard/nokia/ip530/devicetree.cb | 2 +- src/mainboard/nvidia/l1_2pvv/devicetree.cb | 2 +- src/mainboard/pcengines/alix1c/devicetree.cb | 2 +- src/mainboard/pcengines/alix2d/devicetree.cb | 2 +- src/mainboard/rca/rm4100/devicetree.cb | 2 +- src/mainboard/roda/rk886ex/devicetree.cb | 2 +- src/mainboard/roda/rk9/devicetree.cb | 2 +- src/mainboard/samsung/lumpy/devicetree.cb | 2 +- src/mainboard/samsung/stumpy/devicetree.cb | 2 +- src/mainboard/siemens/sitemp_g1p1/devicetree.cb | 2 +- src/mainboard/soyo/sy-6ba-plus-iii/devicetree.cb | 2 +- src/mainboard/sunw/ultra40/devicetree.cb | 2 +- src/mainboard/supermicro/h8dme/devicetree.cb | 2 +- src/mainboard/supermicro/h8dmr/devicetree.cb | 2 +- src/mainboard/supermicro/h8dmr_fam10/devicetree.cb | 2 +- src/mainboard/supermicro/h8qgi/devicetree.cb | 2 +- src/mainboard/supermicro/h8qme_fam10/devicetree.cb | 2 +- src/mainboard/supermicro/h8scm/devicetree.cb | 2 +- src/mainboard/supermicro/h8scm_fam10/devicetree.cb | 2 +- src/mainboard/supermicro/x6dai_g/devicetree.cb | 2 +- src/mainboard/supermicro/x6dhe_g/devicetree.cb | 2 +- src/mainboard/supermicro/x6dhe_g2/devicetree.cb | 2 +- src/mainboard/supermicro/x6dhr_ig/devicetree.cb | 2 +- src/mainboard/supermicro/x6dhr_ig2/devicetree.cb | 2 +- src/mainboard/supermicro/x7db8/devicetree.cb | 2 +- src/mainboard/technexion/tim5690/devicetree.cb | 2 +- src/mainboard/technexion/tim8690/devicetree.cb | 2 +- src/mainboard/thomson/ip1000/devicetree.cb | 2 +- src/mainboard/traverse/geos/devicetree.cb | 2 +- src/mainboard/tyan/s1846/devicetree.cb | 2 +- src/mainboard/tyan/s2735/devicetree.cb | 2 +- src/mainboard/tyan/s2850/devicetree.cb | 2 +- src/mainboard/tyan/s2875/devicetree.cb | 2 +- src/mainboard/tyan/s2880/devicetree.cb | 2 +- src/mainboard/tyan/s2881/devicetree.cb | 2 +- src/mainboard/tyan/s2882/devicetree.cb | 2 +- src/mainboard/tyan/s2885/devicetree.cb | 2 +- src/mainboard/tyan/s2891/devicetree.cb | 2 +- src/mainboard/tyan/s2892/devicetree.cb | 2 +- src/mainboard/tyan/s2895/devicetree.cb | 2 +- src/mainboard/tyan/s2912/devicetree.cb | 2 +- src/mainboard/tyan/s2912_fam10/devicetree.cb | 2 +- src/mainboard/tyan/s4880/devicetree.cb | 2 +- src/mainboard/tyan/s4882/devicetree.cb | 2 +- src/mainboard/tyan/s8226/devicetree.cb | 2 +- src/mainboard/via/epia-cn/devicetree.cb | 2 +- src/mainboard/via/epia-m/devicetree.cb | 2 +- src/mainboard/via/epia-m700/acpi_tables.c | 2 +- src/mainboard/via/epia-m700/devicetree.cb | 2 +- src/mainboard/via/epia-n/acpi_tables.c | 2 +- src/mainboard/via/epia-n/devicetree.cb | 2 +- src/mainboard/via/epia/devicetree.cb | 2 +- src/mainboard/via/pc2500e/devicetree.cb | 2 +- src/mainboard/via/vt8454c/devicetree.cb | 2 +- src/mainboard/winent/pl6064/devicetree.cb | 2 +- src/mainboard/wyse/s50/devicetree.cb | 2 +- src/northbridge/amd/agesa/family10/northbridge.c | 2 +- src/northbridge/amd/agesa/family12/northbridge.c | 2 +- src/northbridge/amd/agesa/family14/northbridge.c | 4 ++-- src/northbridge/amd/agesa/family15/northbridge.c | 4 ++-- src/northbridge/amd/agesa/family15tn/northbridge.c | 4 ++-- src/northbridge/amd/amdfam10/acpi.c | 6 +++--- src/northbridge/amd/amdfam10/northbridge.c | 2 +- src/northbridge/amd/amdk8/acpi.c | 4 ++-- src/northbridge/amd/amdk8/northbridge.c | 2 +- src/northbridge/amd/gx1/northbridge.c | 4 ++-- src/northbridge/amd/gx2/northbridge.c | 2 +- src/northbridge/amd/lx/northbridge.c | 2 +- src/northbridge/intel/e7501/northbridge.c | 2 +- src/northbridge/intel/e7505/northbridge.c | 2 +- src/northbridge/intel/e7520/northbridge.c | 2 +- src/northbridge/intel/e7525/northbridge.c | 2 +- src/northbridge/intel/gm45/northbridge.c | 2 +- src/northbridge/intel/i3100/northbridge.c | 2 +- src/northbridge/intel/i440bx/northbridge.c | 2 +- src/northbridge/intel/i440lx/northbridge.c | 2 +- src/northbridge/intel/i5000/northbridge.c | 2 +- src/northbridge/intel/i82810/northbridge.c | 2 +- src/northbridge/intel/i82830/northbridge.c | 2 +- src/northbridge/intel/i855/northbridge.c | 2 +- src/northbridge/intel/i945/northbridge.c | 2 +- src/northbridge/intel/sandybridge/northbridge.c | 2 +- src/northbridge/intel/sch/northbridge.c | 2 +- src/northbridge/via/cn400/northbridge.c | 2 +- src/northbridge/via/cn700/northbridge.c | 2 +- src/northbridge/via/cx700/northbridge.c | 2 +- src/northbridge/via/vt8601/northbridge.c | 2 +- src/northbridge/via/vt8623/northbridge.c | 2 +- src/northbridge/via/vx800/northbridge.c | 2 +- src/southbridge/intel/i82371eb/acpi_tables.c | 2 +- 211 files changed, 234 insertions(+), 234 deletions(-) (limited to 'src') diff --git a/src/arch/x86/boot/acpi.c b/src/arch/x86/boot/acpi.c index 730e53e1d1..fc862f4088 100644 --- a/src/arch/x86/boot/acpi.c +++ b/src/arch/x86/boot/acpi.c @@ -146,7 +146,7 @@ unsigned long acpi_create_madt_lapics(unsigned long current) for (cpu = all_devices; cpu; cpu = cpu->next) { if ((cpu->path.type != DEVICE_PATH_APIC) || - (cpu->bus->dev->path.type != DEVICE_PATH_APIC_CLUSTER)) { + (cpu->bus->dev->path.type != DEVICE_PATH_CPU_CLUSTER)) { continue; } if (!cpu->enabled) diff --git a/src/arch/x86/boot/mpspec.c b/src/arch/x86/boot/mpspec.c index 5d014343d3..8c380e5511 100644 --- a/src/arch/x86/boot/mpspec.c +++ b/src/arch/x86/boot/mpspec.c @@ -152,7 +152,7 @@ void smp_write_processors(struct mp_config_table *mc) for(cpu = all_devices; cpu; cpu = cpu->next) { unsigned long cpu_flag; if ((cpu->path.type != DEVICE_PATH_APIC) || - (cpu->bus->dev->path.type != DEVICE_PATH_APIC_CLUSTER)) + (cpu->bus->dev->path.type != DEVICE_PATH_CPU_CLUSTER)) { continue; } diff --git a/src/cpu/amd/sc520/sc520.c b/src/cpu/amd/sc520/sc520.c index b0824a74a8..607982823c 100644 --- a/src/cpu/amd/sc520/sc520.c +++ b/src/cpu/amd/sc520/sc520.c @@ -194,7 +194,7 @@ static void enable_dev(struct device *dev) /* This is never hit as none of the sc520 boards have * an APIC cluster defined */ - else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) { + else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) { dev->ops = &cpu_bus_ops; } #endif diff --git a/src/cpu/intel/speedstep/acpi.c b/src/cpu/intel/speedstep/acpi.c index dfcc82e2da..483e81309e 100644 --- a/src/cpu/intel/speedstep/acpi.c +++ b/src/cpu/intel/speedstep/acpi.c @@ -48,7 +48,7 @@ static int determine_total_number_of_cores(void) int count = 0; for(cpu = all_devices; cpu; cpu = cpu->next) { if ((cpu->path.type != DEVICE_PATH_APIC) || - (cpu->bus->dev->path.type != DEVICE_PATH_APIC_CLUSTER)) { + (cpu->bus->dev->path.type != DEVICE_PATH_CPU_CLUSTER)) { continue; } if (!cpu->enabled) { diff --git a/src/device/device_util.c b/src/device/device_util.c index 60f555af3c..9b9bc40735 100644 --- a/src/device/device_util.c +++ b/src/device/device_util.c @@ -209,9 +209,9 @@ const char *dev_path(device_t dev) sprintf(buffer, "DOMAIN: %04x", dev->path.domain.domain); break; - case DEVICE_PATH_APIC_CLUSTER: - sprintf(buffer, "APIC_CLUSTER: %01x", - dev->path.apic_cluster.cluster); + case DEVICE_PATH_CPU_CLUSTER: + sprintf(buffer, "CPU_CLUSTER: %01x", + dev->path.cpu_cluster.cluster); break; case DEVICE_PATH_CPU: sprintf(buffer, "CPU: %02x", dev->path.cpu.id); @@ -274,9 +274,9 @@ int path_eq(struct device_path *path1, struct device_path *path2) case DEVICE_PATH_DOMAIN: equal = (path1->domain.domain == path2->domain.domain); break; - case DEVICE_PATH_APIC_CLUSTER: - equal = (path1->apic_cluster.cluster - == path2->apic_cluster.cluster); + case DEVICE_PATH_CPU_CLUSTER: + equal = (path1->cpu_cluster.cluster + == path2->cpu_cluster.cluster); break; case DEVICE_PATH_CPU: equal = (path1->cpu.id == path2->cpu.id); @@ -859,7 +859,7 @@ int dev_count_cpu(void) for (cpu = all_devices; cpu; cpu = cpu->next) { if ((cpu->path.type != DEVICE_PATH_APIC) || - (cpu->bus->dev->path.type != DEVICE_PATH_APIC_CLUSTER)) + (cpu->bus->dev->path.type != DEVICE_PATH_CPU_CLUSTER)) continue; if (!cpu->enabled) continue; diff --git a/src/include/device/path.h b/src/include/device/path.h index c59b49ed24..00fb727009 100644 --- a/src/include/device/path.h +++ b/src/include/device/path.h @@ -9,7 +9,7 @@ enum device_path_type { 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 @@ struct ioapic_path unsigned ioapic_id; }; -struct apic_cluster_path +struct cpu_cluster_path { unsigned cluster; }; @@ -69,15 +69,15 @@ struct cpu_bus_path 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; }; }; diff --git a/src/mainboard/a-trend/atc-6220/devicetree.cb b/src/mainboard/a-trend/atc-6220/devicetree.cb index 3e83186e7d..0dea9aedfb 100644 --- a/src/mainboard/a-trend/atc-6220/devicetree.cb +++ b/src/mainboard/a-trend/atc-6220/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/intel/i440bx # Northbridge - device lapic_cluster 0 on # APIC cluster + device cpu_cluster 0 on # APIC cluster chip cpu/intel/slot_1 # CPU device lapic 0 on end # APIC end diff --git a/src/mainboard/a-trend/atc-6240/devicetree.cb b/src/mainboard/a-trend/atc-6240/devicetree.cb index 7625fa6e42..e0bfdac065 100644 --- a/src/mainboard/a-trend/atc-6240/devicetree.cb +++ b/src/mainboard/a-trend/atc-6240/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/intel/i440bx # Northbridge - device lapic_cluster 0 on # APIC cluster + device cpu_cluster 0 on # APIC cluster chip cpu/intel/slot_1 # CPU device lapic 0 on end # APIC end diff --git a/src/mainboard/aaeon/pfm-540i_revb/devicetree.cb b/src/mainboard/aaeon/pfm-540i_revb/devicetree.cb index 9737b010e2..221b80ce68 100644 --- a/src/mainboard/aaeon/pfm-540i_revb/devicetree.cb +++ b/src/mainboard/aaeon/pfm-540i_revb/devicetree.cb @@ -65,7 +65,7 @@ chip northbridge/amd/lx end end # APIC cluster is late CPU init. - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/geode_lx device lapic 0 on end end diff --git a/src/mainboard/abit/be6-ii_v2_0/devicetree.cb b/src/mainboard/abit/be6-ii_v2_0/devicetree.cb index a85a86162e..3a6648a14d 100644 --- a/src/mainboard/abit/be6-ii_v2_0/devicetree.cb +++ b/src/mainboard/abit/be6-ii_v2_0/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/intel/i440bx # Northbridge - device lapic_cluster 0 on # APIC cluster + device cpu_cluster 0 on # APIC cluster chip cpu/intel/slot_1 # CPU device lapic 0 on end # APIC end diff --git a/src/mainboard/advansus/a785e-i/devicetree.cb b/src/mainboard/advansus/a785e-i/devicetree.cb index a356f79560..f7db1cce58 100644 --- a/src/mainboard/advansus/a785e-i/devicetree.cb +++ b/src/mainboard/advansus/a785e-i/devicetree.cb @@ -1,6 +1,6 @@ # sample config for advansus/A785E-I chip northbridge/amd/amdfam10/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_ASB2 #L1 and DDR3 device lapic 0 on end end diff --git a/src/mainboard/amd/bimini_fam10/devicetree.cb b/src/mainboard/amd/bimini_fam10/devicetree.cb index cc624664e0..25676f0d03 100644 --- a/src/mainboard/amd/bimini_fam10/devicetree.cb +++ b/src/mainboard/amd/bimini_fam10/devicetree.cb @@ -1,6 +1,6 @@ # sample config for amd/bimini_fam10 chip northbridge/amd/amdfam10/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_ASB2 #L1 and DDR3 device lapic 0 on end end diff --git a/src/mainboard/amd/db800/devicetree.cb b/src/mainboard/amd/db800/devicetree.cb index 1a1db6d5f6..3331a12ee5 100644 --- a/src/mainboard/amd/db800/devicetree.cb +++ b/src/mainboard/amd/db800/devicetree.cb @@ -59,7 +59,7 @@ chip northbridge/amd/lx end end # APIC cluster is late CPU init. - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/geode_lx device lapic 0 on end end diff --git a/src/mainboard/amd/dbm690t/devicetree.cb b/src/mainboard/amd/dbm690t/devicetree.cb index b92a66656a..8dd971eef2 100644 --- a/src/mainboard/amd/dbm690t/devicetree.cb +++ b/src/mainboard/amd/dbm690t/devicetree.cb @@ -9,7 +9,7 @@ #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 lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_S1G1 device lapic 0 on end end diff --git a/src/mainboard/amd/dinar/devicetree.cb b/src/mainboard/amd/dinar/devicetree.cb index 9e2c61a6aa..9fb255eb04 100644 --- a/src/mainboard/amd/dinar/devicetree.cb +++ b/src/mainboard/amd/dinar/devicetree.cb @@ -18,7 +18,7 @@ # chip northbridge/amd/agesa/family15/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/agesa/family15 device lapic 0x20 on end end diff --git a/src/mainboard/amd/inagua/devicetree.cb b/src/mainboard/amd/inagua/devicetree.cb index b0d5fcb884..f0037042e1 100644 --- a/src/mainboard/amd/inagua/devicetree.cb +++ b/src/mainboard/amd/inagua/devicetree.cb @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # chip northbridge/amd/agesa/family14/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/agesa/family14 device lapic 0 on end end diff --git a/src/mainboard/amd/mahogany/devicetree.cb b/src/mainboard/amd/mahogany/devicetree.cb index 11f4b3c582..56efd84247 100644 --- a/src/mainboard/amd/mahogany/devicetree.cb +++ b/src/mainboard/amd/mahogany/devicetree.cb @@ -9,7 +9,7 @@ #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 lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_AM2 device lapic 0 on end end diff --git a/src/mainboard/amd/mahogany_fam10/devicetree.cb b/src/mainboard/amd/mahogany_fam10/devicetree.cb index c5cbb1cdd1..4fd77b7ce3 100644 --- a/src/mainboard/amd/mahogany_fam10/devicetree.cb +++ b/src/mainboard/amd/mahogany_fam10/devicetree.cb @@ -1,6 +1,6 @@ # sample config for amd/mahogany_fam10 chip northbridge/amd/amdfam10/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_AM2r2 #L1 and DDR2 device lapic 0 on end end diff --git a/src/mainboard/amd/norwich/devicetree.cb b/src/mainboard/amd/norwich/devicetree.cb index 6a0299bffe..93effaa717 100644 --- a/src/mainboard/amd/norwich/devicetree.cb +++ b/src/mainboard/amd/norwich/devicetree.cb @@ -32,7 +32,7 @@ chip northbridge/amd/lx end end # APIC cluster is late CPU init. - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/geode_lx device lapic 0 on end end diff --git a/src/mainboard/amd/parmer/devicetree.cb b/src/mainboard/amd/parmer/devicetree.cb index 9942ffe8dc..be48439204 100644 --- a/src/mainboard/amd/parmer/devicetree.cb +++ b/src/mainboard/amd/parmer/devicetree.cb @@ -18,7 +18,7 @@ # chip northbridge/amd/agesa/family15tn/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/agesa/family15tn device lapic 10 on end end diff --git a/src/mainboard/amd/persimmon/devicetree.cb b/src/mainboard/amd/persimmon/devicetree.cb index 1eab2f53da..fce7d101c0 100644 --- a/src/mainboard/amd/persimmon/devicetree.cb +++ b/src/mainboard/amd/persimmon/devicetree.cb @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # chip northbridge/amd/agesa/family14/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/agesa/family14 device lapic 0 on end end diff --git a/src/mainboard/amd/pistachio/devicetree.cb b/src/mainboard/amd/pistachio/devicetree.cb index 4f16ea7e46..760e5abb00 100644 --- a/src/mainboard/amd/pistachio/devicetree.cb +++ b/src/mainboard/amd/pistachio/devicetree.cb @@ -9,7 +9,7 @@ #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 lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_AM2 device lapic 0 on end end diff --git a/src/mainboard/amd/rumba/devicetree.cb b/src/mainboard/amd/rumba/devicetree.cb index db51f654d4..a7a352f8f7 100644 --- a/src/mainboard/amd/rumba/devicetree.cb +++ b/src/mainboard/amd/rumba/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/gx2 - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/geode_gx2 device lapic 0 on end end diff --git a/src/mainboard/amd/serengeti_cheetah/devicetree.cb b/src/mainboard/amd/serengeti_cheetah/devicetree.cb index ac0e00e772..1fea190ec6 100644 --- a/src/mainboard/amd/serengeti_cheetah/devicetree.cb +++ b/src/mainboard/amd/serengeti_cheetah/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdk8/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_F device lapic 0 on end end diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/devicetree.cb b/src/mainboard/amd/serengeti_cheetah_fam10/devicetree.cb index 40805c6d0e..972632be5c 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/devicetree.cb +++ b/src/mainboard/amd/serengeti_cheetah_fam10/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdfam10/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_F_1207 #L1 and DDR2 device lapic 0 on end end diff --git a/src/mainboard/amd/south_station/devicetree.cb b/src/mainboard/amd/south_station/devicetree.cb index be6f52e62b..16373fe4e9 100644 --- a/src/mainboard/amd/south_station/devicetree.cb +++ b/src/mainboard/amd/south_station/devicetree.cb @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # chip northbridge/amd/agesa/family14/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/agesa/family14 device lapic 0 on end end diff --git a/src/mainboard/amd/thatcher/devicetree.cb b/src/mainboard/amd/thatcher/devicetree.cb index e468ccedb0..f2847665a2 100644 --- a/src/mainboard/amd/thatcher/devicetree.cb +++ b/src/mainboard/amd/thatcher/devicetree.cb @@ -18,7 +18,7 @@ # chip northbridge/amd/agesa/family15tn/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/agesa/family15tn device lapic 10 on end end diff --git a/src/mainboard/amd/tilapia_fam10/devicetree.cb b/src/mainboard/amd/tilapia_fam10/devicetree.cb index ae25336b72..9315440000 100644 --- a/src/mainboard/amd/tilapia_fam10/devicetree.cb +++ b/src/mainboard/amd/tilapia_fam10/devicetree.cb @@ -1,6 +1,6 @@ # sample config for amd/tilapia_fam10 chip northbridge/amd/amdfam10/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_AM3 #L1 and DDR3 device lapic 0 on end end diff --git a/src/mainboard/amd/torpedo/devicetree.cb b/src/mainboard/amd/torpedo/devicetree.cb index bd4f49b0f2..73df206d64 100755 --- a/src/mainboard/amd/torpedo/devicetree.cb +++ b/src/mainboard/amd/torpedo/devicetree.cb @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # chip northbridge/amd/agesa/family12/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/agesa/family12 device lapic 0 on end end diff --git a/src/mainboard/amd/union_station/devicetree.cb b/src/mainboard/amd/union_station/devicetree.cb index 4f08cfb054..7642262e03 100644 --- a/src/mainboard/amd/union_station/devicetree.cb +++ b/src/mainboard/amd/union_station/devicetree.cb @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # chip northbridge/amd/agesa/family14/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/agesa/family14 device lapic 0 on end end diff --git a/src/mainboard/aopen/dxplplusu/devicetree.cb b/src/mainboard/aopen/dxplplusu/devicetree.cb index 54614622b2..f43aec8b07 100644 --- a/src/mainboard/aopen/dxplplusu/devicetree.cb +++ b/src/mainboard/aopen/dxplplusu/devicetree.cb @@ -21,7 +21,7 @@ chip northbridge/intel/e7505 - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/intel/socket_mPGA604 device lapic 0 on end device lapic 6 on end diff --git a/src/mainboard/arima/hdama/devicetree.cb b/src/mainboard/arima/hdama/devicetree.cb index fbf29c5661..2035117101 100644 --- a/src/mainboard/arima/hdama/devicetree.cb +++ b/src/mainboard/arima/hdama/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdk8/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_940 device lapic 0 on end end diff --git a/src/mainboard/artecgroup/dbe61/devicetree.cb b/src/mainboard/artecgroup/dbe61/devicetree.cb index 2f1f80233e..d270f3d793 100644 --- a/src/mainboard/artecgroup/dbe61/devicetree.cb +++ b/src/mainboard/artecgroup/dbe61/devicetree.cb @@ -32,7 +32,7 @@ chip northbridge/amd/lx end end # APIC cluster is late CPU init. - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/geode_lx device lapic 0 on end end diff --git a/src/mainboard/asrock/939a785gmh/devicetree.cb b/src/mainboard/asrock/939a785gmh/devicetree.cb index 5f81d83000..f246dcfb31 100644 --- a/src/mainboard/asrock/939a785gmh/devicetree.cb +++ b/src/mainboard/asrock/939a785gmh/devicetree.cb @@ -10,7 +10,7 @@ #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 lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_939 device lapic 0 on end end diff --git a/src/mainboard/asrock/e350m1/devicetree.cb b/src/mainboard/asrock/e350m1/devicetree.cb index 1fed8ac7f7..bc2beb1c07 100644 --- a/src/mainboard/asrock/e350m1/devicetree.cb +++ b/src/mainboard/asrock/e350m1/devicetree.cb @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # chip northbridge/amd/agesa/family14/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/agesa/family14 device lapic 0 on end end diff --git a/src/mainboard/asus/a8n_e/devicetree.cb b/src/mainboard/asus/a8n_e/devicetree.cb index dbb27dc51a..c864de7911 100644 --- a/src/mainboard/asus/a8n_e/devicetree.cb +++ b/src/mainboard/asus/a8n_e/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdk8/root_complex # Root complex - device lapic_cluster 0 on # (L)APIC cluster + device cpu_cluster 0 on # (L)APIC cluster chip cpu/amd/socket_939 # CPU socket device lapic 0 on end # Local APIC of the CPU end diff --git a/src/mainboard/asus/a8v-e_deluxe/devicetree.cb b/src/mainboard/asus/a8v-e_deluxe/devicetree.cb index b77601dd53..5e56acca0a 100644 --- a/src/mainboard/asus/a8v-e_deluxe/devicetree.cb +++ b/src/mainboard/asus/a8v-e_deluxe/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdk8/root_complex # Root complex - device lapic_cluster 0 on # APIC cluster + device cpu_cluster 0 on # APIC cluster chip cpu/amd/socket_939 # CPU device lapic 0 on end # APIC end diff --git a/src/mainboard/asus/a8v-e_se/devicetree.cb b/src/mainboard/asus/a8v-e_se/devicetree.cb index 5ace9ea416..f2d078a74e 100644 --- a/src/mainboard/asus/a8v-e_se/devicetree.cb +++ b/src/mainboard/asus/a8v-e_se/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdk8/root_complex # Root complex - device lapic_cluster 0 on # APIC cluster + device cpu_cluster 0 on # APIC cluster chip cpu/amd/socket_939 # CPU device lapic 0 on end # APIC end diff --git a/src/mainboard/asus/dsbf/devicetree.cb b/src/mainboard/asus/dsbf/devicetree.cb index 958ab93523..b4d1b63ff8 100644 --- a/src/mainboard/asus/dsbf/devicetree.cb +++ b/src/mainboard/asus/dsbf/devicetree.cb @@ -22,7 +22,7 @@ chip northbridge/intel/i5000 - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/intel/socket_LGA771 device lapic 0 on end end diff --git a/src/mainboard/asus/k8v-x/devicetree.cb b/src/mainboard/asus/k8v-x/devicetree.cb index 74c96bad1d..6bb9bc8b47 100644 --- a/src/mainboard/asus/k8v-x/devicetree.cb +++ b/src/mainboard/asus/k8v-x/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdk8/root_complex # Root complex - device lapic_cluster 0 on # APIC cluster + device cpu_cluster 0 on # APIC cluster chip cpu/amd/socket_754 # CPU device lapic 0 on end # APIC end diff --git a/src/mainboard/asus/m2n-e/devicetree.cb b/src/mainboard/asus/m2n-e/devicetree.cb index 2d920177a4..7134dceed3 100644 --- a/src/mainboard/asus/m2n-e/devicetree.cb +++ b/src/mainboard/asus/m2n-e/devicetree.cb @@ -19,7 +19,7 @@ ## chip northbridge/amd/amdk8/root_complex # Root complex - device lapic_cluster 0 on # (L)APIC cluster + device cpu_cluster 0 on # (L)APIC cluster chip cpu/amd/socket_AM2 # CPU socket device lapic 0 on end # Local APIC of the CPU end diff --git a/src/mainboard/asus/m2v-mx_se/devicetree.cb b/src/mainboard/asus/m2v-mx_se/devicetree.cb index d3b5c1b505..213e3ea9c0 100644 --- a/src/mainboard/asus/m2v-mx_se/devicetree.cb +++ b/src/mainboard/asus/m2v-mx_se/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdk8/root_complex # Root complex - device lapic_cluster 0 on # APIC cluster + device cpu_cluster 0 on # APIC cluster chip cpu/amd/socket_AM2 # CPU device lapic 0 on end # APIC end diff --git a/src/mainboard/asus/m2v/devicetree.cb b/src/mainboard/asus/m2v/devicetree.cb index 3e52394cbe..61d94bad3f 100644 --- a/src/mainboard/asus/m2v/devicetree.cb +++ b/src/mainboard/asus/m2v/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdk8/root_complex # Root complex - device lapic_cluster 0 on # APIC cluster + device cpu_cluster 0 on # APIC cluster chip cpu/amd/socket_AM2 # CPU device lapic 0 on end # APIC end diff --git a/src/mainboard/asus/m4a78-em/devicetree.cb b/src/mainboard/asus/m4a78-em/devicetree.cb index bbf4b3d76c..e760c17e39 100644 --- a/src/mainboard/asus/m4a78-em/devicetree.cb +++ b/src/mainboard/asus/m4a78-em/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdfam10/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_AM3 #L1 and DDR2 device lapic 0 on end end diff --git a/src/mainboard/asus/m4a785-m/devicetree.cb b/src/mainboard/asus/m4a785-m/devicetree.cb index e6bd174f6c..4549ead77e 100644 --- a/src/mainboard/asus/m4a785-m/devicetree.cb +++ b/src/mainboard/asus/m4a785-m/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdfam10/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_AM3 #L1 and DDR2 device lapic 0 on end end diff --git a/src/mainboard/asus/m4a785t-m/devicetree.cb b/src/mainboard/asus/m4a785t-m/devicetree.cb index 2817b63a8a..9783989424 100644 --- a/src/mainboard/asus/m4a785t-m/devicetree.cb +++ b/src/mainboard/asus/m4a785t-m/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdfam10/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_AM3 #L1 and DDR2 device lapic 0 on end end diff --git a/src/mainboard/asus/m5a88-v/devicetree.cb b/src/mainboard/asus/m5a88-v/devicetree.cb index 1590b9fe4c..4b3142ede9 100644 --- a/src/mainboard/asus/m5a88-v/devicetree.cb +++ b/src/mainboard/asus/m5a88-v/devicetree.cb @@ -1,6 +1,6 @@ # sample config for advansus/A785E-I chip northbridge/amd/amdfam10/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_AM3 #L1 and DDR3 device lapic 0 on end end diff --git a/src/mainboard/asus/mew-am/devicetree.cb b/src/mainboard/asus/mew-am/devicetree.cb index cf04dc1617..8a20cab8a1 100644 --- a/src/mainboard/asus/mew-am/devicetree.cb +++ b/src/mainboard/asus/mew-am/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/intel/i82810 # Northbridge - device lapic_cluster 0 on # APIC cluster + device cpu_cluster 0 on # APIC cluster chip cpu/intel/socket_PGA370 # CPU device lapic 0 on end # APIC end diff --git a/src/mainboard/asus/p2b-d/devicetree.cb b/src/mainboard/asus/p2b-d/devicetree.cb index fb50362ecb..fe82a0d74d 100644 --- a/src/mainboard/asus/p2b-d/devicetree.cb +++ b/src/mainboard/asus/p2b-d/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/intel/i440bx # Northbridge - device lapic_cluster 0 on # (L)APIC cluster + device cpu_cluster 0 on # (L)APIC cluster chip cpu/intel/slot_1 # CPU socket 0 device lapic 0 on end # Local APIC of CPU 0 end diff --git a/src/mainboard/asus/p2b-ds/devicetree.cb b/src/mainboard/asus/p2b-ds/devicetree.cb index b7310dd1f3..b8e9e8580f 100644 --- a/src/mainboard/asus/p2b-ds/devicetree.cb +++ b/src/mainboard/asus/p2b-ds/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/intel/i440bx # Northbridge - device lapic_cluster 0 on # (L)APIC cluster + device cpu_cluster 0 on # (L)APIC cluster chip cpu/intel/slot_1 # CPU socket 0 device lapic 0 on end # Local APIC of CPU 0 end diff --git a/src/mainboard/asus/p2b-f/devicetree.cb b/src/mainboard/asus/p2b-f/devicetree.cb index f88a8f896a..5bee5ae96a 100644 --- a/src/mainboard/asus/p2b-f/devicetree.cb +++ b/src/mainboard/asus/p2b-f/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/intel/i440bx # Northbridge - device lapic_cluster 0 on # APIC cluster + device cpu_cluster 0 on # APIC cluster chip cpu/intel/slot_1 # CPU device lapic 0 on end # APIC end diff --git a/src/mainboard/asus/p2b-ls/devicetree.cb b/src/mainboard/asus/p2b-ls/devicetree.cb index 39f4246b0e..9a785da7b7 100644 --- a/src/mainboard/asus/p2b-ls/devicetree.cb +++ b/src/mainboard/asus/p2b-ls/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/intel/i440bx # Northbridge - device lapic_cluster 0 on # APIC cluster + device cpu_cluster 0 on # APIC cluster chip cpu/intel/slot_1 # CPU device lapic 0 on end # APIC end diff --git a/src/mainboard/asus/p2b/devicetree.cb b/src/mainboard/asus/p2b/devicetree.cb index 0feb7e45cb..84f0c2962d 100644 --- a/src/mainboard/asus/p2b/devicetree.cb +++ b/src/mainboard/asus/p2b/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/intel/i440bx # Northbridge - device lapic_cluster 0 on # APIC cluster + device cpu_cluster 0 on # APIC cluster chip cpu/intel/slot_1 # CPU device lapic 0 on end # APIC end diff --git a/src/mainboard/asus/p3b-f/devicetree.cb b/src/mainboard/asus/p3b-f/devicetree.cb index f88a8f896a..5bee5ae96a 100644 --- a/src/mainboard/asus/p3b-f/devicetree.cb +++ b/src/mainboard/asus/p3b-f/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/intel/i440bx # Northbridge - device lapic_cluster 0 on # APIC cluster + device cpu_cluster 0 on # APIC cluster chip cpu/intel/slot_1 # CPU device lapic 0 on end # APIC end diff --git a/src/mainboard/avalue/eax-785e/devicetree.cb b/src/mainboard/avalue/eax-785e/devicetree.cb index a2ac9f4c8d..42ddf01d7f 100644 --- a/src/mainboard/avalue/eax-785e/devicetree.cb +++ b/src/mainboard/avalue/eax-785e/devicetree.cb @@ -1,6 +1,6 @@ # sample config for avalue/EAX-785E chip northbridge/amd/amdfam10/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_AM3 #L1 and DDR3 device lapic 0 on end end diff --git a/src/mainboard/azza/pt-6ibd/devicetree.cb b/src/mainboard/azza/pt-6ibd/devicetree.cb index ce51b040b3..a2f5513e4d 100644 --- a/src/mainboard/azza/pt-6ibd/devicetree.cb +++ b/src/mainboard/azza/pt-6ibd/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/intel/i440bx # Northbridge - device lapic_cluster 0 on # APIC cluster + device cpu_cluster 0 on # APIC cluster chip cpu/intel/slot_1 # CPU device lapic 0 on end # APIC end diff --git a/src/mainboard/bachmann/ot200/devicetree.cb b/src/mainboard/bachmann/ot200/devicetree.cb index a49f267e51..1e61b3d357 100644 --- a/src/mainboard/bachmann/ot200/devicetree.cb +++ b/src/mainboard/bachmann/ot200/devicetree.cb @@ -32,7 +32,7 @@ chip northbridge/amd/lx end end # APIC cluster is late CPU init. - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/geode_lx device lapic 0 on end end diff --git a/src/mainboard/bcom/winnetp680/devicetree.cb b/src/mainboard/bcom/winnetp680/devicetree.cb index c324872dde..f0a086b642 100644 --- a/src/mainboard/bcom/winnetp680/devicetree.cb +++ b/src/mainboard/bcom/winnetp680/devicetree.cb @@ -56,7 +56,7 @@ chip northbridge/via/cn700 # Northbridge device pci 12.0 on end # Ethernet end end - device lapic_cluster 0 on # APIC cluster + device cpu_cluster 0 on # APIC cluster chip cpu/via/c7 # VIA C7 device lapic 0 on end # APIC end diff --git a/src/mainboard/biostar/m6tba/devicetree.cb b/src/mainboard/biostar/m6tba/devicetree.cb index c92f8a6055..0d35e9cb4a 100644 --- a/src/mainboard/biostar/m6tba/devicetree.cb +++ b/src/mainboard/biostar/m6tba/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/intel/i440bx # Northbridge - device lapic_cluster 0 on # APIC cluster + device cpu_cluster 0 on # APIC cluster chip cpu/intel/slot_1 # CPU device lapic 0 on end # APIC end diff --git a/src/mainboard/broadcom/blast/devicetree.cb b/src/mainboard/broadcom/blast/devicetree.cb index 5ad7cbf6c2..b1486a6cc1 100644 --- a/src/mainboard/broadcom/blast/devicetree.cb +++ b/src/mainboard/broadcom/blast/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdk8/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_940 device lapic 0 on end end diff --git a/src/mainboard/compaq/deskpro_en_sff_p600/devicetree.cb b/src/mainboard/compaq/deskpro_en_sff_p600/devicetree.cb index 4ddedfa4a7..def9e2f065 100644 --- a/src/mainboard/compaq/deskpro_en_sff_p600/devicetree.cb +++ b/src/mainboard/compaq/deskpro_en_sff_p600/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/intel/i440bx # Northbridge - device lapic_cluster 0 on # APIC cluster + device cpu_cluster 0 on # APIC cluster chip cpu/intel/slot_1 # CPU device lapic 0 on end # APIC end diff --git a/src/mainboard/digitallogic/adl855pc/devicetree.cb b/src/mainboard/digitallogic/adl855pc/devicetree.cb index 9eeb95f926..3a9603b155 100644 --- a/src/mainboard/digitallogic/adl855pc/devicetree.cb +++ b/src/mainboard/digitallogic/adl855pc/devicetree.cb @@ -48,7 +48,7 @@ chip northbridge/intel/i855 end end end - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/intel/socket_mPGA479M device lapic 0 on end end diff --git a/src/mainboard/digitallogic/msm800sev/devicetree.cb b/src/mainboard/digitallogic/msm800sev/devicetree.cb index 77dfbd0aad..839b767931 100644 --- a/src/mainboard/digitallogic/msm800sev/devicetree.cb +++ b/src/mainboard/digitallogic/msm800sev/devicetree.cb @@ -76,7 +76,7 @@ chip northbridge/amd/lx end # APIC cluster is late CPU init. - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/geode_lx device lapic 0 on end end diff --git a/src/mainboard/ecs/p6iwp-fe/devicetree.cb b/src/mainboard/ecs/p6iwp-fe/devicetree.cb index 180a2c98cb..7d3f0e2392 100644 --- a/src/mainboard/ecs/p6iwp-fe/devicetree.cb +++ b/src/mainboard/ecs/p6iwp-fe/devicetree.cb @@ -19,7 +19,7 @@ ## chip northbridge/intel/i82810 # Northbridge - device lapic_cluster 0 on # APIC cluster + device cpu_cluster 0 on # APIC cluster chip cpu/intel/socket_PGA370 # CPU device lapic 0 on end # APIC end diff --git a/src/mainboard/getac/p470/devicetree.cb b/src/mainboard/getac/p470/devicetree.cb index 10870a6a00..6256ca10ab 100644 --- a/src/mainboard/getac/p470/devicetree.cb +++ b/src/mainboard/getac/p470/devicetree.cb @@ -21,7 +21,7 @@ chip northbridge/intel/i945 - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/intel/socket_mFCPGA478 device lapic 0 on end end diff --git a/src/mainboard/gigabyte/ga-6bxc/devicetree.cb b/src/mainboard/gigabyte/ga-6bxc/devicetree.cb index a258515f3d..5b5c1ae325 100644 --- a/src/mainboard/gigabyte/ga-6bxc/devicetree.cb +++ b/src/mainboard/gigabyte/ga-6bxc/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/intel/i440bx # Northbridge - device lapic_cluster 0 on # APIC cluster + device cpu_cluster 0 on # APIC cluster chip cpu/intel/slot_1 # CPU device lapic 0 on end # APIC end diff --git a/src/mainboard/gigabyte/ga-6bxe/devicetree.cb b/src/mainboard/gigabyte/ga-6bxe/devicetree.cb index 0f3f201fd8..85f478559a 100644 --- a/src/mainboard/gigabyte/ga-6bxe/devicetree.cb +++ b/src/mainboard/gigabyte/ga-6bxe/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/intel/i440bx # Northbridge - device lapic_cluster 0 on # APIC cluster + device cpu_cluster 0 on # APIC cluster chip cpu/intel/slot_1 # CPU device lapic 0 on end # APIC end diff --git a/src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb b/src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb index 0bf93077df..c2aecadac9 100644 --- a/src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb +++ b/src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdk8/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_AM2 device lapic 0 on end end diff --git a/src/mainboard/gigabyte/m57sli/devicetree.cb b/src/mainboard/gigabyte/m57sli/devicetree.cb index 197f1cb8af..59029322e5 100644 --- a/src/mainboard/gigabyte/m57sli/devicetree.cb +++ b/src/mainboard/gigabyte/m57sli/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdk8/root_complex # Root complex - device lapic_cluster 0 on # (L)APIC cluster + device cpu_cluster 0 on # (L)APIC cluster chip cpu/amd/socket_AM2 # CPU socket device lapic 0 on end # Local APIC of the CPU end diff --git a/src/mainboard/gigabyte/ma785gm/devicetree.cb b/src/mainboard/gigabyte/ma785gm/devicetree.cb index 49bfe2a48c..c7d9932d42 100644 --- a/src/mainboard/gigabyte/ma785gm/devicetree.cb +++ b/src/mainboard/gigabyte/ma785gm/devicetree.cb @@ -1,6 +1,6 @@ # sample config for gigabyte/ma785gm chip northbridge/amd/amdfam10/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_AM3 #L1 and DDR2 device lapic 0 on end end diff --git a/src/mainboard/gigabyte/ma785gmt/devicetree.cb b/src/mainboard/gigabyte/ma785gmt/devicetree.cb index c7c0ae1399..bd98313f22 100644 --- a/src/mainboard/gigabyte/ma785gmt/devicetree.cb +++ b/src/mainboard/gigabyte/ma785gmt/devicetree.cb @@ -1,6 +1,6 @@ # sample config for gigabyte/ma785gmt chip northbridge/amd/amdfam10/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_AM3 #L1 and DDR3 device lapic 0 on end end diff --git a/src/mainboard/gigabyte/ma78gm/devicetree.cb b/src/mainboard/gigabyte/ma78gm/devicetree.cb index 2fb0f1b87b..8d81fbeeb4 100644 --- a/src/mainboard/gigabyte/ma78gm/devicetree.cb +++ b/src/mainboard/gigabyte/ma78gm/devicetree.cb @@ -1,6 +1,6 @@ # sample config for gigabyte/ma78gm chip northbridge/amd/amdfam10/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_AM2r2 #L1 and DDR2 device lapic 0 on end end diff --git a/src/mainboard/google/butterfly/devicetree.cb b/src/mainboard/google/butterfly/devicetree.cb index 6ab0f6fb98..ca8118abab 100644 --- a/src/mainboard/google/butterfly/devicetree.cb +++ b/src/mainboard/google/butterfly/devicetree.cb @@ -12,7 +12,7 @@ chip northbridge/intel/sandybridge register "gpu_panel_power_backlight_on_delay" = "2100" # T3: 210ms register "gpu_panel_power_backlight_off_delay" = "2100" # T4: 210ms - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/intel/socket_rPGA989 device lapic 0 on end end diff --git a/src/mainboard/google/parrot/devicetree.cb b/src/mainboard/google/parrot/devicetree.cb index 0b18613b31..cd65fbf9a4 100644 --- a/src/mainboard/google/parrot/devicetree.cb +++ b/src/mainboard/google/parrot/devicetree.cb @@ -15,7 +15,7 @@ chip northbridge/intel/sandybridge register "gpu_cpu_backlight" = "0x000001d4" register "gpu_pch_backlight" = "0x03aa0000" - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/intel/socket_rPGA989 device lapic 0 on end end diff --git a/src/mainboard/hp/dl145_g1/devicetree.cb b/src/mainboard/hp/dl145_g1/devicetree.cb index 7ad1505477..c955ac3b0b 100644 --- a/src/mainboard/hp/dl145_g1/devicetree.cb +++ b/src/mainboard/hp/dl145_g1/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdk8/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_940 device lapic 0 on end end diff --git a/src/mainboard/hp/dl145_g3/devicetree.cb b/src/mainboard/hp/dl145_g3/devicetree.cb index fee6dbd23b..7012cf97c5 100644 --- a/src/mainboard/hp/dl145_g3/devicetree.cb +++ b/src/mainboard/hp/dl145_g3/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdk8/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_F device lapic 0 on end end diff --git a/src/mainboard/hp/dl165_g6_fam10/devicetree.cb b/src/mainboard/hp/dl165_g6_fam10/devicetree.cb index 1da52efc20..2dbcb9b87b 100644 --- a/src/mainboard/hp/dl165_g6_fam10/devicetree.cb +++ b/src/mainboard/hp/dl165_g6_fam10/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdfam10/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_F_1207 device lapic 0 on end end diff --git a/src/mainboard/hp/e_vectra_p2706t/devicetree.cb b/src/mainboard/hp/e_vectra_p2706t/devicetree.cb index 0f1474b7ca..7de0c8399c 100644 --- a/src/mainboard/hp/e_vectra_p2706t/devicetree.cb +++ b/src/mainboard/hp/e_vectra_p2706t/devicetree.cb @@ -1,6 +1,6 @@ # TODO: i810E actually! chip northbridge/intel/i82810 # Northbridge - device lapic_cluster 0 on # APIC cluster + device cpu_cluster 0 on # APIC cluster chip cpu/intel/socket_PGA370 # CPU device lapic 0 on end # APIC end diff --git a/src/mainboard/ibase/mb899/devicetree.cb b/src/mainboard/ibase/mb899/devicetree.cb index 0d92bdb932..7e5076d8b7 100644 --- a/src/mainboard/ibase/mb899/devicetree.cb +++ b/src/mainboard/ibase/mb899/devicetree.cb @@ -1,6 +1,6 @@ chip northbridge/intel/i945 - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/intel/socket_mFCPGA478 device lapic 0 on end end diff --git a/src/mainboard/ibm/e325/devicetree.cb b/src/mainboard/ibm/e325/devicetree.cb index 9654b3f9a3..bdaee50efa 100644 --- a/src/mainboard/ibm/e325/devicetree.cb +++ b/src/mainboard/ibm/e325/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdk8/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_940 device lapic 0 on end end diff --git a/src/mainboard/ibm/e326/devicetree.cb b/src/mainboard/ibm/e326/devicetree.cb index 785f357cf1..1888987272 100644 --- a/src/mainboard/ibm/e326/devicetree.cb +++ b/src/mainboard/ibm/e326/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdk8/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_940 device lapic 0 on end end diff --git a/src/mainboard/iei/kino-780am2-fam10/devicetree.cb b/src/mainboard/iei/kino-780am2-fam10/devicetree.cb index 019582294b..d5c70330ad 100644 --- a/src/mainboard/iei/kino-780am2-fam10/devicetree.cb +++ b/src/mainboard/iei/kino-780am2-fam10/devicetree.cb @@ -1,6 +1,6 @@ # Config for iei/kino-780am2-fam10 chip northbridge/amd/amdfam10/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_AM2r2 #L1 and DDR2 device lapic 0 on end end diff --git a/src/mainboard/iei/pcisa-lx-800-r10/devicetree.cb b/src/mainboard/iei/pcisa-lx-800-r10/devicetree.cb index 5360fcc7da..a6dba308db 100644 --- a/src/mainboard/iei/pcisa-lx-800-r10/devicetree.cb +++ b/src/mainboard/iei/pcisa-lx-800-r10/devicetree.cb @@ -67,7 +67,7 @@ chip northbridge/amd/lx end end # APIC cluster is late CPU init. - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/geode_lx device lapic 0 on end end diff --git a/src/mainboard/iei/pm-lx-800-r11/devicetree.cb b/src/mainboard/iei/pm-lx-800-r11/devicetree.cb index 2bb840e2ba..2bf4b7f83b 100644 --- a/src/mainboard/iei/pm-lx-800-r11/devicetree.cb +++ b/src/mainboard/iei/pm-lx-800-r11/devicetree.cb @@ -93,7 +93,7 @@ chip northbridge/amd/lx end # APIC cluster is late CPU init. - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/geode_lx device lapic 0 on end end diff --git a/src/mainboard/iei/pm-lx2-800-r10/devicetree.cb b/src/mainboard/iei/pm-lx2-800-r10/devicetree.cb index 5b6d73a468..f2166af2f6 100644 --- a/src/mainboard/iei/pm-lx2-800-r10/devicetree.cb +++ b/src/mainboard/iei/pm-lx2-800-r10/devicetree.cb @@ -79,7 +79,7 @@ chip northbridge/amd/lx end end # APIC cluster is late CPU init. - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/geode_lx device lapic 0 on end end diff --git a/src/mainboard/intel/d810e2cb/devicetree.cb b/src/mainboard/intel/d810e2cb/devicetree.cb index f5afa92717..f8cc90652f 100644 --- a/src/mainboard/intel/d810e2cb/devicetree.cb +++ b/src/mainboard/intel/d810e2cb/devicetree.cb @@ -19,7 +19,7 @@ ## chip northbridge/intel/i82810 # Northbridge - device lapic_cluster 0 on # APIC cluster + device cpu_cluster 0 on # APIC cluster chip cpu/intel/socket_FC_PGA370 # CPU device lapic 0 on end # APIC end diff --git a/src/mainboard/intel/d945gclf/devicetree.cb b/src/mainboard/intel/d945gclf/devicetree.cb index 6a4b353e99..d389d8af14 100644 --- a/src/mainboard/intel/d945gclf/devicetree.cb +++ b/src/mainboard/intel/d945gclf/devicetree.cb @@ -19,7 +19,7 @@ chip northbridge/intel/i945 - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/intel/socket_441 device lapic 0 on end end diff --git a/src/mainboard/intel/eagleheights/devicetree.cb b/src/mainboard/intel/eagleheights/devicetree.cb index 5a272c15d5..b37750c7e6 100644 --- a/src/mainboard/intel/eagleheights/devicetree.cb +++ b/src/mainboard/intel/eagleheights/devicetree.cb @@ -64,7 +64,7 @@ chip northbridge/intel/i3100 device pci 1f.4 on end # Performance counters end end - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/intel/socket_BGA956 device lapic 0 on end end diff --git a/src/mainboard/intel/emeraldlake2/devicetree.cb b/src/mainboard/intel/emeraldlake2/devicetree.cb index 1d0ed42d3c..0bb42d6a9c 100644 --- a/src/mainboard/intel/emeraldlake2/devicetree.cb +++ b/src/mainboard/intel/emeraldlake2/devicetree.cb @@ -9,7 +9,7 @@ chip northbridge/intel/sandybridge # Enable DVI Hotplug with 6ms pulse register "gpu_dp_b_hotplug" = "0x06" - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/intel/socket_rPGA989 device lapic 0 on end end diff --git a/src/mainboard/intel/jarrell/devicetree.cb b/src/mainboard/intel/jarrell/devicetree.cb index b5c3ece796..501bc7ed45 100644 --- a/src/mainboard/intel/jarrell/devicetree.cb +++ b/src/mainboard/intel/jarrell/devicetree.cb @@ -69,7 +69,7 @@ chip northbridge/intel/e7520 register "gpio[41]" = "ICH5R_GPIO_USE_AS_GPIO | ICH5R_GPIO_SEL_INPUT" end end - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/intel/socket_mPGA604 # cpu 0 device lapic 0 on end end diff --git a/src/mainboard/intel/mtarvon/devicetree.cb b/src/mainboard/intel/mtarvon/devicetree.cb index 61ead86ee7..c1ff1d585a 100644 --- a/src/mainboard/intel/mtarvon/devicetree.cb +++ b/src/mainboard/intel/mtarvon/devicetree.cb @@ -37,7 +37,7 @@ chip northbridge/intel/i3100 device pci 1f.3 on end # SMBus end end - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/intel/socket_mPGA479M device lapic 0 on end end diff --git a/src/mainboard/intel/truxton/devicetree.cb b/src/mainboard/intel/truxton/devicetree.cb index 23e98d3582..05fb05ecf1 100644 --- a/src/mainboard/intel/truxton/devicetree.cb +++ b/src/mainboard/intel/truxton/devicetree.cb @@ -47,7 +47,7 @@ chip northbridge/intel/i3100 device pci 1f.4 on end # ? end end - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/intel/ep80579 device lapic 0 on end end diff --git a/src/mainboard/intel/xe7501devkit/devicetree.cb b/src/mainboard/intel/xe7501devkit/devicetree.cb index 75d918e3c8..215ed97e56 100644 --- a/src/mainboard/intel/xe7501devkit/devicetree.cb +++ b/src/mainboard/intel/xe7501devkit/devicetree.cb @@ -62,7 +62,7 @@ chip northbridge/intel/e7501 device pci 1f.6 off end # AC97 Modem end # SB end # PCI domain - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/intel/socket_mPGA604 device lapic 0 on end end diff --git a/src/mainboard/iwave/iWRainbowG6/devicetree.cb b/src/mainboard/iwave/iWRainbowG6/devicetree.cb index 7c46a8f209..84cfc4b203 100644 --- a/src/mainboard/iwave/iWRainbowG6/devicetree.cb +++ b/src/mainboard/iwave/iWRainbowG6/devicetree.cb @@ -1,6 +1,6 @@ chip northbridge/intel/sch - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/intel/socket_441 device lapic 0 on end end diff --git a/src/mainboard/iwill/dk8_htx/devicetree.cb b/src/mainboard/iwill/dk8_htx/devicetree.cb index 3f9bbcece0..544390dcfb 100644 --- a/src/mainboard/iwill/dk8_htx/devicetree.cb +++ b/src/mainboard/iwill/dk8_htx/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdk8/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_940 device lapic 0 on end end diff --git a/src/mainboard/iwill/dk8s2/devicetree.cb b/src/mainboard/iwill/dk8s2/devicetree.cb index 0220c309f9..fda8ca2838 100644 --- a/src/mainboard/iwill/dk8s2/devicetree.cb +++ b/src/mainboard/iwill/dk8s2/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdk8/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_940 device lapic 0 on end end diff --git a/src/mainboard/iwill/dk8x/devicetree.cb b/src/mainboard/iwill/dk8x/devicetree.cb index 5604d7fe22..ea7430bccd 100644 --- a/src/mainboard/iwill/dk8x/devicetree.cb +++ b/src/mainboard/iwill/dk8x/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdk8/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_940 device lapic 0 on end end diff --git a/src/mainboard/jetway/j7f24/devicetree.cb b/src/mainboard/jetway/j7f24/devicetree.cb index ace327766f..3b99b9c3b2 100644 --- a/src/mainboard/jetway/j7f24/devicetree.cb +++ b/src/mainboard/jetway/j7f24/devicetree.cb @@ -54,7 +54,7 @@ chip northbridge/via/cn700 # Northbridge device pci 12.0 on end # Ethernet end end - device lapic_cluster 0 on # APIC cluster + device cpu_cluster 0 on # APIC cluster chip cpu/via/c7 # VIA C7 device lapic 0 on end # APIC end diff --git a/src/mainboard/jetway/pa78vm5/devicetree.cb b/src/mainboard/jetway/pa78vm5/devicetree.cb index 116e7b5d9f..783e4ae9f3 100644 --- a/src/mainboard/jetway/pa78vm5/devicetree.cb +++ b/src/mainboard/jetway/pa78vm5/devicetree.cb @@ -1,6 +1,6 @@ # sample config for jetway/PA78VM5 chip northbridge/amd/amdfam10/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_AM2r2 #L1 and DDR2 device lapic 0 on end end diff --git a/src/mainboard/kontron/986lcd-m/devicetree.cb b/src/mainboard/kontron/986lcd-m/devicetree.cb index ee738b2964..65a96a0aa7 100644 --- a/src/mainboard/kontron/986lcd-m/devicetree.cb +++ b/src/mainboard/kontron/986lcd-m/devicetree.cb @@ -1,6 +1,6 @@ chip northbridge/intel/i945 - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/intel/socket_mFCPGA478 device lapic 0 on end end diff --git a/src/mainboard/kontron/kt690/devicetree.cb b/src/mainboard/kontron/kt690/devicetree.cb index dc4945beef..22bdae9b29 100644 --- a/src/mainboard/kontron/kt690/devicetree.cb +++ b/src/mainboard/kontron/kt690/devicetree.cb @@ -9,7 +9,7 @@ #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 lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_S1G1 device lapic 0 on end end diff --git a/src/mainboard/lanner/em8510/devicetree.cb b/src/mainboard/lanner/em8510/devicetree.cb index a7b43fda6a..257d894a27 100644 --- a/src/mainboard/lanner/em8510/devicetree.cb +++ b/src/mainboard/lanner/em8510/devicetree.cb @@ -48,7 +48,7 @@ chip northbridge/intel/i855 end end end - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/intel/socket_mPGA479M device lapic 0 on end end diff --git a/src/mainboard/lenovo/t60/devicetree.cb b/src/mainboard/lenovo/t60/devicetree.cb index 7bde52fb16..3973f3b25b 100644 --- a/src/mainboard/lenovo/t60/devicetree.cb +++ b/src/mainboard/lenovo/t60/devicetree.cb @@ -22,7 +22,7 @@ chip northbridge/intel/i945 - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/intel/socket_mFCPGA478 device lapic 0 on end end diff --git a/src/mainboard/lenovo/x60/devicetree.cb b/src/mainboard/lenovo/x60/devicetree.cb index d5d527418e..91daf3a65e 100644 --- a/src/mainboard/lenovo/x60/devicetree.cb +++ b/src/mainboard/lenovo/x60/devicetree.cb @@ -22,7 +22,7 @@ chip northbridge/intel/i945 - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/intel/socket_mFCPGA478 device lapic 0 on end end diff --git a/src/mainboard/lippert/frontrunner/devicetree.cb b/src/mainboard/lippert/frontrunner/devicetree.cb index 7046158774..a35c91c2ec 100644 --- a/src/mainboard/lippert/frontrunner/devicetree.cb +++ b/src/mainboard/lippert/frontrunner/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/gx2 - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/geode_gx2 device lapic 0 on end end diff --git a/src/mainboard/lippert/hurricane-lx/devicetree.cb b/src/mainboard/lippert/hurricane-lx/devicetree.cb index 98e0744f69..59aaa65ba2 100644 --- a/src/mainboard/lippert/hurricane-lx/devicetree.cb +++ b/src/mainboard/lippert/hurricane-lx/devicetree.cb @@ -82,7 +82,7 @@ chip northbridge/amd/lx end end # APIC cluster is late CPU init. - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/geode_lx device lapic 0 on end end diff --git a/src/mainboard/lippert/literunner-lx/devicetree.cb b/src/mainboard/lippert/literunner-lx/devicetree.cb index 65119fc50b..088ebca102 100644 --- a/src/mainboard/lippert/literunner-lx/devicetree.cb +++ b/src/mainboard/lippert/literunner-lx/devicetree.cb @@ -79,7 +79,7 @@ chip northbridge/amd/lx end end # APIC cluster is late CPU init. - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/geode_lx device lapic 0 on end end diff --git a/src/mainboard/lippert/roadrunner-lx/devicetree.cb b/src/mainboard/lippert/roadrunner-lx/devicetree.cb index f3bd5885fa..6599844d9a 100644 --- a/src/mainboard/lippert/roadrunner-lx/devicetree.cb +++ b/src/mainboard/lippert/roadrunner-lx/devicetree.cb @@ -81,7 +81,7 @@ chip northbridge/amd/lx end end # APIC cluster is late CPU init. - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/geode_lx device lapic 0 on end end diff --git a/src/mainboard/lippert/spacerunner-lx/devicetree.cb b/src/mainboard/lippert/spacerunner-lx/devicetree.cb index a4edbe8eed..9a56521230 100644 --- a/src/mainboard/lippert/spacerunner-lx/devicetree.cb +++ b/src/mainboard/lippert/spacerunner-lx/devicetree.cb @@ -82,7 +82,7 @@ chip northbridge/amd/lx end end # APIC cluster is late CPU init. - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/geode_lx device lapic 0 on end end diff --git a/src/mainboard/mitac/6513wu/devicetree.cb b/src/mainboard/mitac/6513wu/devicetree.cb index 4e995d9226..8ac7e8ecb5 100644 --- a/src/mainboard/mitac/6513wu/devicetree.cb +++ b/src/mainboard/mitac/6513wu/devicetree.cb @@ -19,7 +19,7 @@ ## chip northbridge/intel/i82810 # Northbridge - device lapic_cluster 0 on # APIC cluster + device cpu_cluster 0 on # APIC cluster chip cpu/intel/socket_PGA370 # CPU device lapic 0 on end # APIC end diff --git a/src/mainboard/msi/ms6119/devicetree.cb b/src/mainboard/msi/ms6119/devicetree.cb index 6829a3ab2c..159a4448b4 100644 --- a/src/mainboard/msi/ms6119/devicetree.cb +++ b/src/mainboard/msi/ms6119/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/intel/i440bx # Northbridge - device lapic_cluster 0 on # APIC cluster + device cpu_cluster 0 on # APIC cluster chip cpu/intel/slot_1 # CPU device lapic 0 on end # APIC end diff --git a/src/mainboard/msi/ms6147/devicetree.cb b/src/mainboard/msi/ms6147/devicetree.cb index 3792e212cf..55f2745916 100644 --- a/src/mainboard/msi/ms6147/devicetree.cb +++ b/src/mainboard/msi/ms6147/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/intel/i440bx # Northbridge - device lapic_cluster 0 on # APIC cluster + device cpu_cluster 0 on # APIC cluster chip cpu/intel/slot_1 # CPU device lapic 0 on end # APIC end diff --git a/src/mainboard/msi/ms6156/devicetree.cb b/src/mainboard/msi/ms6156/devicetree.cb index e038513b8a..901470f528 100644 --- a/src/mainboard/msi/ms6156/devicetree.cb +++ b/src/mainboard/msi/ms6156/devicetree.cb @@ -19,7 +19,7 @@ ## chip northbridge/intel/i440bx # Northbridge - device lapic_cluster 0 on # APIC cluster + device cpu_cluster 0 on # APIC cluster chip cpu/intel/slot_1 # CPU device lapic 0 on end # APIC end diff --git a/src/mainboard/msi/ms6178/devicetree.cb b/src/mainboard/msi/ms6178/devicetree.cb index c91ea0a306..481ea0b6c8 100644 --- a/src/mainboard/msi/ms6178/devicetree.cb +++ b/src/mainboard/msi/ms6178/devicetree.cb @@ -19,7 +19,7 @@ ## chip northbridge/intel/i82810 # Northbridge - device lapic_cluster 0 on # APIC cluster + device cpu_cluster 0 on # APIC cluster chip cpu/intel/socket_PGA370 # CPU device lapic 0 on end # APIC end diff --git a/src/mainboard/msi/ms7135/devicetree.cb b/src/mainboard/msi/ms7135/devicetree.cb index 9546acda40..a0c39b4194 100644 --- a/src/mainboard/msi/ms7135/devicetree.cb +++ b/src/mainboard/msi/ms7135/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdk8/root_complex # Root complex - device lapic_cluster 0 on # (L)APIC cluster + device cpu_cluster 0 on # (L)APIC cluster chip cpu/amd/socket_754 # CPU socket device lapic 0 on end # Local APIC of the CPU end diff --git a/src/mainboard/msi/ms7260/devicetree.cb b/src/mainboard/msi/ms7260/devicetree.cb index fe320ecd79..b35bb5847b 100644 --- a/src/mainboard/msi/ms7260/devicetree.cb +++ b/src/mainboard/msi/ms7260/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdk8/root_complex # Root complex - device lapic_cluster 0 on # (L)APIC cluster + device cpu_cluster 0 on # (L)APIC cluster chip cpu/amd/socket_AM2 # CPU socket device lapic 0 on end # Local APIC of the CPU end diff --git a/src/mainboard/msi/ms9185/devicetree.cb b/src/mainboard/msi/ms9185/devicetree.cb index b41a1624cd..75822eafaf 100644 --- a/src/mainboard/msi/ms9185/devicetree.cb +++ b/src/mainboard/msi/ms9185/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdk8/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_F device lapic 0 on end end diff --git a/src/mainboard/msi/ms9282/devicetree.cb b/src/mainboard/msi/ms9282/devicetree.cb index 8b46deb74f..f61d6a3ace 100644 --- a/src/mainboard/msi/ms9282/devicetree.cb +++ b/src/mainboard/msi/ms9282/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdk8/root_complex # Root complex - device lapic_cluster 0 on # (L)APIC cluster + device cpu_cluster 0 on # (L)APIC cluster chip cpu/amd/socket_F # CPU socket device lapic 0 on end # Local APIC of the CPU end diff --git a/src/mainboard/msi/ms9652_fam10/devicetree.cb b/src/mainboard/msi/ms9652_fam10/devicetree.cb index 4060ae50dd..0a9d9f163f 100644 --- a/src/mainboard/msi/ms9652_fam10/devicetree.cb +++ b/src/mainboard/msi/ms9652_fam10/devicetree.cb @@ -22,7 +22,7 @@ ## chip northbridge/amd/amdfam10/root_complex # Root complex - device lapic_cluster 0 on # (L)APIC cluster + device cpu_cluster 0 on # (L)APIC cluster chip cpu/amd/socket_F_1207 # CPU socket device lapic 0 on end # Local APIC of the CPU end diff --git a/src/mainboard/nec/powermate2000/devicetree.cb b/src/mainboard/nec/powermate2000/devicetree.cb index daa7551240..cd4aefe4e5 100644 --- a/src/mainboard/nec/powermate2000/devicetree.cb +++ b/src/mainboard/nec/powermate2000/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/intel/i82810 # Northbridge - device lapic_cluster 0 on # APIC cluster + device cpu_cluster 0 on # APIC cluster chip cpu/intel/socket_PGA370 # CPU device lapic 0 on end # APIC end diff --git a/src/mainboard/newisys/khepri/devicetree.cb b/src/mainboard/newisys/khepri/devicetree.cb index cc6e9b7460..bd00d2884c 100644 --- a/src/mainboard/newisys/khepri/devicetree.cb +++ b/src/mainboard/newisys/khepri/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdk8/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_940 device lapic 0 on end end diff --git a/src/mainboard/nokia/ip530/devicetree.cb b/src/mainboard/nokia/ip530/devicetree.cb index 6d109cc060..1f1a272ff2 100644 --- a/src/mainboard/nokia/ip530/devicetree.cb +++ b/src/mainboard/nokia/ip530/devicetree.cb @@ -19,7 +19,7 @@ ## chip northbridge/intel/i440bx # Northbridge - device lapic_cluster 0 on # (L)APIC cluster + device cpu_cluster 0 on # (L)APIC cluster chip cpu/intel/socket_PGA370 # CPU socket device lapic 0 on end # Local APIC of the CPU end diff --git a/src/mainboard/nvidia/l1_2pvv/devicetree.cb b/src/mainboard/nvidia/l1_2pvv/devicetree.cb index fff1f6a98a..363d1a8cc1 100644 --- a/src/mainboard/nvidia/l1_2pvv/devicetree.cb +++ b/src/mainboard/nvidia/l1_2pvv/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdk8/root_complex # Root complex - device lapic_cluster 0 on # (L)APIC cluster + device cpu_cluster 0 on # (L)APIC cluster chip cpu/amd/socket_F # CPU socket device lapic 0 on end # Local APIC of the CPU end diff --git a/src/mainboard/pcengines/alix1c/devicetree.cb b/src/mainboard/pcengines/alix1c/devicetree.cb index 8e0ece038d..85e967ad86 100644 --- a/src/mainboard/pcengines/alix1c/devicetree.cb +++ b/src/mainboard/pcengines/alix1c/devicetree.cb @@ -76,7 +76,7 @@ chip northbridge/amd/lx end # APIC cluster is late CPU init. - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/geode_lx device lapic 0 on end end diff --git a/src/mainboard/pcengines/alix2d/devicetree.cb b/src/mainboard/pcengines/alix2d/devicetree.cb index 97327969d9..d8aa3bc491 100644 --- a/src/mainboard/pcengines/alix2d/devicetree.cb +++ b/src/mainboard/pcengines/alix2d/devicetree.cb @@ -36,7 +36,7 @@ chip northbridge/amd/lx end # APIC cluster is late CPU init. - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/geode_lx device lapic 0 on end end diff --git a/src/mainboard/rca/rm4100/devicetree.cb b/src/mainboard/rca/rm4100/devicetree.cb index 7fb73e1a68..d39126ce79 100644 --- a/src/mainboard/rca/rm4100/devicetree.cb +++ b/src/mainboard/rca/rm4100/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/intel/i82830 # Northbridge - device lapic_cluster 0 on # APIC cluster + device cpu_cluster 0 on # APIC cluster chip cpu/intel/socket_mFCBGA479 # Mobile Celeron Micro-FCBGA Socket 479 device lapic 0 on end # APIC end diff --git a/src/mainboard/roda/rk886ex/devicetree.cb b/src/mainboard/roda/rk886ex/devicetree.cb index 502b0320f9..7b9d7a193e 100644 --- a/src/mainboard/roda/rk886ex/devicetree.cb +++ b/src/mainboard/roda/rk886ex/devicetree.cb @@ -21,7 +21,7 @@ chip northbridge/intel/i945 - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/intel/socket_mFCPGA478 device lapic 0 on end end diff --git a/src/mainboard/roda/rk9/devicetree.cb b/src/mainboard/roda/rk9/devicetree.cb index 192681e5fb..5989278ebc 100644 --- a/src/mainboard/roda/rk9/devicetree.cb +++ b/src/mainboard/roda/rk9/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/intel/gm45 - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/intel/socket_BGA956 device lapic 0 on end end diff --git a/src/mainboard/samsung/lumpy/devicetree.cb b/src/mainboard/samsung/lumpy/devicetree.cb index c2f091d439..cdd7a5c402 100644 --- a/src/mainboard/samsung/lumpy/devicetree.cb +++ b/src/mainboard/samsung/lumpy/devicetree.cb @@ -11,7 +11,7 @@ chip northbridge/intel/sandybridge register "gpu_panel_power_backlight_on_delay" = "2100" # T5: 210ms register "gpu_panel_power_backlight_off_delay" = "2100" # TD: 210ms - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/intel/socket_rPGA989 device lapic 0 on end end diff --git a/src/mainboard/samsung/stumpy/devicetree.cb b/src/mainboard/samsung/stumpy/devicetree.cb index 925b71da52..ee01e8a43e 100644 --- a/src/mainboard/samsung/stumpy/devicetree.cb +++ b/src/mainboard/samsung/stumpy/devicetree.cb @@ -9,7 +9,7 @@ chip northbridge/intel/sandybridge # Enable DVI Hotplug with 6ms pulse register "gpu_dp_b_hotplug" = "0x06" - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/intel/socket_rPGA989 device lapic 0 on end end diff --git a/src/mainboard/siemens/sitemp_g1p1/devicetree.cb b/src/mainboard/siemens/sitemp_g1p1/devicetree.cb index d01d5a8a82..1d83f10579 100644 --- a/src/mainboard/siemens/sitemp_g1p1/devicetree.cb +++ b/src/mainboard/siemens/sitemp_g1p1/devicetree.cb @@ -9,7 +9,7 @@ #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 lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_S1G1 device lapic 0 on end end diff --git a/src/mainboard/soyo/sy-6ba-plus-iii/devicetree.cb b/src/mainboard/soyo/sy-6ba-plus-iii/devicetree.cb index c39a2ce554..db9c4b70db 100644 --- a/src/mainboard/soyo/sy-6ba-plus-iii/devicetree.cb +++ b/src/mainboard/soyo/sy-6ba-plus-iii/devicetree.cb @@ -19,7 +19,7 @@ ## chip northbridge/intel/i440bx # Northbridge - device lapic_cluster 0 on # APIC cluster + device cpu_cluster 0 on # APIC cluster chip cpu/intel/slot_1 # CPU device lapic 0 on end # APIC end diff --git a/src/mainboard/sunw/ultra40/devicetree.cb b/src/mainboard/sunw/ultra40/devicetree.cb index fe5bf33f23..9f9bb67556 100644 --- a/src/mainboard/sunw/ultra40/devicetree.cb +++ b/src/mainboard/sunw/ultra40/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdk8/root_complex # Root complex - device lapic_cluster 0 on # (L)APIC cluster + device cpu_cluster 0 on # (L)APIC cluster chip cpu/amd/socket_940 # CPU socket device lapic 0 on end # Local APIC of the CPU end diff --git a/src/mainboard/supermicro/h8dme/devicetree.cb b/src/mainboard/supermicro/h8dme/devicetree.cb index 0c8cf61722..9efbaf7292 100644 --- a/src/mainboard/supermicro/h8dme/devicetree.cb +++ b/src/mainboard/supermicro/h8dme/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdk8/root_complex # Root complex - device lapic_cluster 0 on # (L)APIC cluster + device cpu_cluster 0 on # (L)APIC cluster chip cpu/amd/socket_F # CPU socket device lapic 0 on end # Local APIC of the CPU end diff --git a/src/mainboard/supermicro/h8dmr/devicetree.cb b/src/mainboard/supermicro/h8dmr/devicetree.cb index 3d1e994d2f..51ad94f275 100644 --- a/src/mainboard/supermicro/h8dmr/devicetree.cb +++ b/src/mainboard/supermicro/h8dmr/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdk8/root_complex # Root complex - device lapic_cluster 0 on # (L)APIC cluster + device cpu_cluster 0 on # (L)APIC cluster chip cpu/amd/socket_F # CPU socket device lapic 0 on end # Local APIC of the CPU end diff --git a/src/mainboard/supermicro/h8dmr_fam10/devicetree.cb b/src/mainboard/supermicro/h8dmr_fam10/devicetree.cb index e7fe9e41ba..c8a8bc5a2f 100644 --- a/src/mainboard/supermicro/h8dmr_fam10/devicetree.cb +++ b/src/mainboard/supermicro/h8dmr_fam10/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdfam10/root_complex # Root complex - device lapic_cluster 0 on # (L)APIC cluster + device cpu_cluster 0 on # (L)APIC cluster chip cpu/amd/socket_F_1207 # CPU socket device lapic 0 on end # Local APIC of the CPU end diff --git a/src/mainboard/supermicro/h8qgi/devicetree.cb b/src/mainboard/supermicro/h8qgi/devicetree.cb index 8365346bc7..0af54ecb9d 100644 --- a/src/mainboard/supermicro/h8qgi/devicetree.cb +++ b/src/mainboard/supermicro/h8qgi/devicetree.cb @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # chip northbridge/amd/agesa/family15/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/agesa/family15 device lapic 0x20 on end #f15 #device lapic 0x10 on end #f10 diff --git a/src/mainboard/supermicro/h8qme_fam10/devicetree.cb b/src/mainboard/supermicro/h8qme_fam10/devicetree.cb index d797beaba3..93a38d679c 100644 --- a/src/mainboard/supermicro/h8qme_fam10/devicetree.cb +++ b/src/mainboard/supermicro/h8qme_fam10/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdfam10/root_complex # Root complex - device lapic_cluster 0 on # (L)APIC cluster + device cpu_cluster 0 on # (L)APIC cluster chip cpu/amd/socket_F_1207 # CPU socket device lapic 0 on end # Local APIC of the CPU end diff --git a/src/mainboard/supermicro/h8scm/devicetree.cb b/src/mainboard/supermicro/h8scm/devicetree.cb index 6367392a82..7506c9045a 100644 --- a/src/mainboard/supermicro/h8scm/devicetree.cb +++ b/src/mainboard/supermicro/h8scm/devicetree.cb @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # chip northbridge/amd/agesa/family15/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/agesa/family15 device lapic 0x10 on end end diff --git a/src/mainboard/supermicro/h8scm_fam10/devicetree.cb b/src/mainboard/supermicro/h8scm_fam10/devicetree.cb index eb7ae1b0f7..ba7eb2acc4 100644 --- a/src/mainboard/supermicro/h8scm_fam10/devicetree.cb +++ b/src/mainboard/supermicro/h8scm_fam10/devicetree.cb @@ -4,7 +4,7 @@ # sample config for supermicro/h8scm_fam10 chip northbridge/amd/amdfam10/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_C32 #L1 and DDR3 device lapic 0 on end end diff --git a/src/mainboard/supermicro/x6dai_g/devicetree.cb b/src/mainboard/supermicro/x6dai_g/devicetree.cb index f39ca6cc91..60508a341a 100644 --- a/src/mainboard/supermicro/x6dai_g/devicetree.cb +++ b/src/mainboard/supermicro/x6dai_g/devicetree.cb @@ -53,7 +53,7 @@ chip northbridge/intel/e7525 # mch device pci 04.0 on end device pci 08.0 on end end - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/intel/socket_mPGA604 # cpu0 device lapic 0 on end end diff --git a/src/mainboard/supermicro/x6dhe_g/devicetree.cb b/src/mainboard/supermicro/x6dhe_g/devicetree.cb index dfe2e8836d..01c2837a8a 100644 --- a/src/mainboard/supermicro/x6dhe_g/devicetree.cb +++ b/src/mainboard/supermicro/x6dhe_g/devicetree.cb @@ -76,7 +76,7 @@ chip northbridge/intel/e7520 # MCH device pci 06.0 on end end - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/intel/socket_mPGA604 # CPU 0 device lapic 0 on end end diff --git a/src/mainboard/supermicro/x6dhe_g2/devicetree.cb b/src/mainboard/supermicro/x6dhe_g2/devicetree.cb index c074fe8c1f..c143ced16e 100644 --- a/src/mainboard/supermicro/x6dhe_g2/devicetree.cb +++ b/src/mainboard/supermicro/x6dhe_g2/devicetree.cb @@ -76,7 +76,7 @@ chip northbridge/intel/e7520 # MCH device pci 06.0 on end end - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/intel/socket_mPGA604 # CPU 0 device lapic 0 on end end diff --git a/src/mainboard/supermicro/x6dhr_ig/devicetree.cb b/src/mainboard/supermicro/x6dhr_ig/devicetree.cb index 1b54204ac8..3a037fbb79 100644 --- a/src/mainboard/supermicro/x6dhr_ig/devicetree.cb +++ b/src/mainboard/supermicro/x6dhr_ig/devicetree.cb @@ -72,7 +72,7 @@ chip northbridge/intel/e7520 # mch end device pci 06.0 on end end - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/intel/socket_mPGA604 # cpu 0 device lapic 0 on end end diff --git a/src/mainboard/supermicro/x6dhr_ig2/devicetree.cb b/src/mainboard/supermicro/x6dhr_ig2/devicetree.cb index 1ec6639268..ca8650bd70 100644 --- a/src/mainboard/supermicro/x6dhr_ig2/devicetree.cb +++ b/src/mainboard/supermicro/x6dhr_ig2/devicetree.cb @@ -63,7 +63,7 @@ chip northbridge/intel/e7520 # mch device pci 04.0 on end device pci 06.0 on end end - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/intel/socket_mPGA604 # cpu 0 device lapic 0 on end end diff --git a/src/mainboard/supermicro/x7db8/devicetree.cb b/src/mainboard/supermicro/x7db8/devicetree.cb index 0a3fabb2fb..e09619ff5e 100644 --- a/src/mainboard/supermicro/x7db8/devicetree.cb +++ b/src/mainboard/supermicro/x7db8/devicetree.cb @@ -22,7 +22,7 @@ chip northbridge/intel/i5000 - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/intel/socket_LGA771 device lapic 0 on end end diff --git a/src/mainboard/technexion/tim5690/devicetree.cb b/src/mainboard/technexion/tim5690/devicetree.cb index 2cc73e1714..23b9741b9f 100644 --- a/src/mainboard/technexion/tim5690/devicetree.cb +++ b/src/mainboard/technexion/tim5690/devicetree.cb @@ -9,7 +9,7 @@ #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 lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_S1G1 device lapic 0 on end end diff --git a/src/mainboard/technexion/tim8690/devicetree.cb b/src/mainboard/technexion/tim8690/devicetree.cb index ee69a49562..ff14075563 100644 --- a/src/mainboard/technexion/tim8690/devicetree.cb +++ b/src/mainboard/technexion/tim8690/devicetree.cb @@ -9,7 +9,7 @@ #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 lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_S1G1 device lapic 0 on end end diff --git a/src/mainboard/thomson/ip1000/devicetree.cb b/src/mainboard/thomson/ip1000/devicetree.cb index c1733303fa..167ada0912 100644 --- a/src/mainboard/thomson/ip1000/devicetree.cb +++ b/src/mainboard/thomson/ip1000/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/intel/i82830 # Northbridge - device lapic_cluster 0 on # APIC cluster + device cpu_cluster 0 on # APIC cluster chip cpu/intel/socket_mFCBGA479 # Low Voltage PIII Micro-FCBGA Socket 479 device lapic 0 on end # APIC end diff --git a/src/mainboard/traverse/geos/devicetree.cb b/src/mainboard/traverse/geos/devicetree.cb index ef14c3e09b..4a2674e885 100644 --- a/src/mainboard/traverse/geos/devicetree.cb +++ b/src/mainboard/traverse/geos/devicetree.cb @@ -32,7 +32,7 @@ chip northbridge/amd/lx end end # APIC cluster is late CPU init. - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/geode_lx device lapic 0 on end end diff --git a/src/mainboard/tyan/s1846/devicetree.cb b/src/mainboard/tyan/s1846/devicetree.cb index 16b3e7c214..f774d4f494 100644 --- a/src/mainboard/tyan/s1846/devicetree.cb +++ b/src/mainboard/tyan/s1846/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/intel/i440bx # Northbridge - device lapic_cluster 0 on # APIC cluster + device cpu_cluster 0 on # APIC cluster chip cpu/intel/slot_1 # CPU device lapic 0 on end # APIC end diff --git a/src/mainboard/tyan/s2735/devicetree.cb b/src/mainboard/tyan/s2735/devicetree.cb index 726a5d2c76..d3b6b1eefe 100644 --- a/src/mainboard/tyan/s2735/devicetree.cb +++ b/src/mainboard/tyan/s2735/devicetree.cb @@ -74,7 +74,7 @@ chip northbridge/intel/e7501 device pci 1f.6 off end end # SB end # PCI domain - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/intel/socket_mPGA604 device lapic 0 on end end diff --git a/src/mainboard/tyan/s2850/devicetree.cb b/src/mainboard/tyan/s2850/devicetree.cb index bff001305d..85c63848df 100644 --- a/src/mainboard/tyan/s2850/devicetree.cb +++ b/src/mainboard/tyan/s2850/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdk8/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_940 device lapic 0 on end end diff --git a/src/mainboard/tyan/s2875/devicetree.cb b/src/mainboard/tyan/s2875/devicetree.cb index f7f7a9e6e3..39eb8b2364 100644 --- a/src/mainboard/tyan/s2875/devicetree.cb +++ b/src/mainboard/tyan/s2875/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdk8/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_940 device lapic 0 on end end diff --git a/src/mainboard/tyan/s2880/devicetree.cb b/src/mainboard/tyan/s2880/devicetree.cb index 2aa0796877..f9f48566ea 100644 --- a/src/mainboard/tyan/s2880/devicetree.cb +++ b/src/mainboard/tyan/s2880/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdk8/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_940 device lapic 0 on end end diff --git a/src/mainboard/tyan/s2881/devicetree.cb b/src/mainboard/tyan/s2881/devicetree.cb index 463c553982..aab75a3939 100644 --- a/src/mainboard/tyan/s2881/devicetree.cb +++ b/src/mainboard/tyan/s2881/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdk8/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_940 device lapic 0 on end end diff --git a/src/mainboard/tyan/s2882/devicetree.cb b/src/mainboard/tyan/s2882/devicetree.cb index 0726d08c49..40746956b3 100644 --- a/src/mainboard/tyan/s2882/devicetree.cb +++ b/src/mainboard/tyan/s2882/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdk8/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_940 device lapic 0 on end end diff --git a/src/mainboard/tyan/s2885/devicetree.cb b/src/mainboard/tyan/s2885/devicetree.cb index b677fbc2e9..acc508599f 100644 --- a/src/mainboard/tyan/s2885/devicetree.cb +++ b/src/mainboard/tyan/s2885/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdk8/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_940 device lapic 0 on end end diff --git a/src/mainboard/tyan/s2891/devicetree.cb b/src/mainboard/tyan/s2891/devicetree.cb index 7517e4d774..3d8c65e73a 100644 --- a/src/mainboard/tyan/s2891/devicetree.cb +++ b/src/mainboard/tyan/s2891/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdk8/root_complex # Root complex - device lapic_cluster 0 on # (L)APIC cluster + device cpu_cluster 0 on # (L)APIC cluster chip cpu/amd/socket_940 # CPU socket device lapic 0 on end # Local APIC of the CPU end diff --git a/src/mainboard/tyan/s2892/devicetree.cb b/src/mainboard/tyan/s2892/devicetree.cb index a5cef447ef..af29be13dd 100644 --- a/src/mainboard/tyan/s2892/devicetree.cb +++ b/src/mainboard/tyan/s2892/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdk8/root_complex # Root complex - device lapic_cluster 0 on # (L)APIC cluster + device cpu_cluster 0 on # (L)APIC cluster chip cpu/amd/socket_940 # CPU socket device lapic 0 on end # Local APIC of the CPU end diff --git a/src/mainboard/tyan/s2895/devicetree.cb b/src/mainboard/tyan/s2895/devicetree.cb index f60d5c6658..f830505958 100644 --- a/src/mainboard/tyan/s2895/devicetree.cb +++ b/src/mainboard/tyan/s2895/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdk8/root_complex # Root complex - device lapic_cluster 0 on # (L)APIC cluster + device cpu_cluster 0 on # (L)APIC cluster chip cpu/amd/socket_940 # CPU socket device lapic 0 on end # Local APIC of the CPU end diff --git a/src/mainboard/tyan/s2912/devicetree.cb b/src/mainboard/tyan/s2912/devicetree.cb index 276e12f01e..57815deb93 100644 --- a/src/mainboard/tyan/s2912/devicetree.cb +++ b/src/mainboard/tyan/s2912/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdk8/root_complex # Root complex - device lapic_cluster 0 on # (L)APIC cluster + device cpu_cluster 0 on # (L)APIC cluster chip cpu/amd/socket_F # CPU socket device lapic 0 on end # Local APIC of the CPU end diff --git a/src/mainboard/tyan/s2912_fam10/devicetree.cb b/src/mainboard/tyan/s2912_fam10/devicetree.cb index 851da920f1..0a5475fd60 100644 --- a/src/mainboard/tyan/s2912_fam10/devicetree.cb +++ b/src/mainboard/tyan/s2912_fam10/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdfam10/root_complex # Root complex - device lapic_cluster 0 on # (L)APIC cluster + device cpu_cluster 0 on # (L)APIC cluster chip cpu/amd/socket_F_1207 # CPU socket device lapic 0 on end # Local APIC of the CPU end diff --git a/src/mainboard/tyan/s4880/devicetree.cb b/src/mainboard/tyan/s4880/devicetree.cb index 37470d8299..da59eb5b9c 100644 --- a/src/mainboard/tyan/s4880/devicetree.cb +++ b/src/mainboard/tyan/s4880/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdk8/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_940 device lapic 0 on end end diff --git a/src/mainboard/tyan/s4882/devicetree.cb b/src/mainboard/tyan/s4882/devicetree.cb index eaf2e57b08..151fbc43ed 100644 --- a/src/mainboard/tyan/s4882/devicetree.cb +++ b/src/mainboard/tyan/s4882/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/amd/amdk8/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_940 device lapic 0 on end end diff --git a/src/mainboard/tyan/s8226/devicetree.cb b/src/mainboard/tyan/s8226/devicetree.cb index ce367a83de..4b8acfce7f 100644 --- a/src/mainboard/tyan/s8226/devicetree.cb +++ b/src/mainboard/tyan/s8226/devicetree.cb @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # chip northbridge/amd/agesa/family15/root_complex - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/agesa/family15 device lapic 0x10 on end end diff --git a/src/mainboard/via/epia-cn/devicetree.cb b/src/mainboard/via/epia-cn/devicetree.cb index 041bc408f9..028cb884af 100644 --- a/src/mainboard/via/epia-cn/devicetree.cb +++ b/src/mainboard/via/epia-cn/devicetree.cb @@ -53,7 +53,7 @@ chip northbridge/via/cn700 # Northbridge device pci 12.0 on end # Ethernet end end - device lapic_cluster 0 on # APIC cluster + device cpu_cluster 0 on # APIC cluster chip cpu/via/c7 # VIA C7 device lapic 0 on end # APIC end diff --git a/src/mainboard/via/epia-m/devicetree.cb b/src/mainboard/via/epia-m/devicetree.cb index eae67c36fa..98f6b4f9bd 100644 --- a/src/mainboard/via/epia-m/devicetree.cb +++ b/src/mainboard/via/epia-m/devicetree.cb @@ -1,6 +1,6 @@ chip northbridge/via/vt8623 - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/via/c3 device lapic 0 on end end diff --git a/src/mainboard/via/epia-m700/acpi_tables.c b/src/mainboard/via/epia-m700/acpi_tables.c index e780c4a020..2c2cf8a471 100644 --- a/src/mainboard/via/epia-m700/acpi_tables.c +++ b/src/mainboard/via/epia-m700/acpi_tables.c @@ -66,7 +66,7 @@ unsigned long acpi_create_madt_lapic_nmis(unsigned long current, u16 flags, for (cpu = all_devices; cpu; cpu = cpu->next) { if ((cpu->path.type != DEVICE_PATH_APIC) || - (cpu->bus->dev->path.type != DEVICE_PATH_APIC_CLUSTER)) { + (cpu->bus->dev->path.type != DEVICE_PATH_CPU_CLUSTER)) { continue; } if (!cpu->enabled) diff --git a/src/mainboard/via/epia-m700/devicetree.cb b/src/mainboard/via/epia-m700/devicetree.cb index 55c7cdf285..2f971c22b1 100644 --- a/src/mainboard/via/epia-m700/devicetree.cb +++ b/src/mainboard/via/epia-m700/devicetree.cb @@ -16,7 +16,7 @@ chip northbridge/via/vx800 # Northbridge # device pci 11.0 on # Southbridge LPC # end end - device lapic_cluster 0 on # APIC cluster + device cpu_cluster 0 on # APIC cluster chip cpu/via/c7 # VIA C7 device lapic 0 on end # APIC end diff --git a/src/mainboard/via/epia-n/acpi_tables.c b/src/mainboard/via/epia-n/acpi_tables.c index 84aba7b430..35aa0e7156 100644 --- a/src/mainboard/via/epia-n/acpi_tables.c +++ b/src/mainboard/via/epia-n/acpi_tables.c @@ -74,7 +74,7 @@ unsigned long acpi_create_madt_lapic_nmis(unsigned long current, u16 flags, for (cpu = all_devices; cpu; cpu = cpu->next) { if ((cpu->path.type != DEVICE_PATH_APIC) || - (cpu->bus->dev->path.type != DEVICE_PATH_APIC_CLUSTER)) { + (cpu->bus->dev->path.type != DEVICE_PATH_CPU_CLUSTER)) { continue; } if (!cpu->enabled) diff --git a/src/mainboard/via/epia-n/devicetree.cb b/src/mainboard/via/epia-n/devicetree.cb index d0117ef5e9..9e9f632b78 100644 --- a/src/mainboard/via/epia-n/devicetree.cb +++ b/src/mainboard/via/epia-n/devicetree.cb @@ -21,7 +21,7 @@ chip northbridge/via/cn400 # Northbridge - device lapic_cluster 0 on # APIC cluster + device cpu_cluster 0 on # APIC cluster chip cpu/via/c3 # VIA C3 device lapic 0 on end # APIC end diff --git a/src/mainboard/via/epia/devicetree.cb b/src/mainboard/via/epia/devicetree.cb index b0acb3a598..d5e16ac008 100644 --- a/src/mainboard/via/epia/devicetree.cb +++ b/src/mainboard/via/epia/devicetree.cb @@ -53,7 +53,7 @@ chip northbridge/via/vt8601 end end - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/via/c3 device lapic 0 on end end diff --git a/src/mainboard/via/pc2500e/devicetree.cb b/src/mainboard/via/pc2500e/devicetree.cb index 34a673b6d3..17bc35efc9 100644 --- a/src/mainboard/via/pc2500e/devicetree.cb +++ b/src/mainboard/via/pc2500e/devicetree.cb @@ -81,7 +81,7 @@ chip northbridge/via/cn700 # Northbridge device pci 12.0 on end # Ethernet end end - device lapic_cluster 0 on # APIC cluster + device cpu_cluster 0 on # APIC cluster chip cpu/via/c7 # VIA C7 device lapic 0 on end # APIC end diff --git a/src/mainboard/via/vt8454c/devicetree.cb b/src/mainboard/via/vt8454c/devicetree.cb index 5268b17dd9..87d2ed1502 100644 --- a/src/mainboard/via/vt8454c/devicetree.cb +++ b/src/mainboard/via/vt8454c/devicetree.cb @@ -1,5 +1,5 @@ chip northbridge/via/cx700 - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/via/c7 device lapic 0 on end end diff --git a/src/mainboard/winent/pl6064/devicetree.cb b/src/mainboard/winent/pl6064/devicetree.cb index 8682109092..f900f78b5a 100644 --- a/src/mainboard/winent/pl6064/devicetree.cb +++ b/src/mainboard/winent/pl6064/devicetree.cb @@ -72,7 +72,7 @@ chip northbridge/amd/lx end end # APIC cluster is late CPU init. - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/geode_lx device lapic 0 on end end diff --git a/src/mainboard/wyse/s50/devicetree.cb b/src/mainboard/wyse/s50/devicetree.cb index 9055ef666d..9008fe69b8 100644 --- a/src/mainboard/wyse/s50/devicetree.cb +++ b/src/mainboard/wyse/s50/devicetree.cb @@ -43,7 +43,7 @@ chip northbridge/amd/gx2 end end # APIC cluster is late CPU init. - device lapic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/geode_gx2 device lapic 0 on end end diff --git a/src/northbridge/amd/agesa/family10/northbridge.c b/src/northbridge/amd/agesa/family10/northbridge.c index 59a12f174f..cd21d9c341 100644 --- a/src/northbridge/amd/agesa/family10/northbridge.c +++ b/src/northbridge/amd/agesa/family10/northbridge.c @@ -1449,7 +1449,7 @@ static void root_complex_enable_dev(struct device *dev) if (dev->path.type == DEVICE_PATH_DOMAIN) { dev->ops = &pci_domain_ops; } - else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) { + else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) { dev->ops = &cpu_bus_ops; } } diff --git a/src/northbridge/amd/agesa/family12/northbridge.c b/src/northbridge/amd/agesa/family12/northbridge.c index e860594b66..a4ed87f891 100644 --- a/src/northbridge/amd/agesa/family12/northbridge.c +++ b/src/northbridge/amd/agesa/family12/northbridge.c @@ -924,7 +924,7 @@ static void root_complex_enable_dev(struct device *dev) if (dev->path.type == DEVICE_PATH_DOMAIN) { dev->ops = &pci_domain_ops; } - else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) { + else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) { dev->ops = &cpu_bus_ops; } printk(BIOS_DEBUG, "Fam12h - northbridge.c - %s - End.\n",__func__); diff --git a/src/northbridge/amd/agesa/family14/northbridge.c b/src/northbridge/amd/agesa/family14/northbridge.c index d955bcf666..c1685ec00c 100644 --- a/src/northbridge/amd/agesa/family14/northbridge.c +++ b/src/northbridge/amd/agesa/family14/northbridge.c @@ -347,7 +347,7 @@ static void nb_read_resources(device_t dev) /* * This MMCONF resource must be reserved in the PCI domain. * It is not honored by the coreboot resource allocator if it is in - * the APIC_CLUSTER. + * the CPU_CLUSTER. */ #if CONFIG_MMCONF_SUPPORT struct resource *resource = new_resource(dev, 0xc0010058); @@ -910,7 +910,7 @@ static void root_complex_enable_dev(struct device *dev) /* Set the operations if it is a special bus type */ if (dev->path.type == DEVICE_PATH_DOMAIN) { dev->ops = &pci_domain_ops; - } else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) { + } else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) { dev->ops = &cpu_bus_ops; } } diff --git a/src/northbridge/amd/agesa/family15/northbridge.c b/src/northbridge/amd/agesa/family15/northbridge.c index 769d473c85..5cd76a33cc 100644 --- a/src/northbridge/amd/agesa/family15/northbridge.c +++ b/src/northbridge/amd/agesa/family15/northbridge.c @@ -345,7 +345,7 @@ static void nb_read_resources(device_t dev) /* * This MMCONF resource must be reserved in the PCI domain. * It is not honored by the coreboot resource allocator if it is in - * the APIC_CLUSTER. + * the CPU_CLUSTER. */ #if CONFIG_MMCONF_SUPPORT struct resource *resource = new_resource(dev, 0xc0010058); @@ -1145,7 +1145,7 @@ static void root_complex_enable_dev(struct device *dev) /* Set the operations if it is a special bus type */ if (dev->path.type == DEVICE_PATH_DOMAIN) { dev->ops = &pci_domain_ops; - } else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) { + } else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) { dev->ops = &cpu_bus_ops; } } diff --git a/src/northbridge/amd/agesa/family15tn/northbridge.c b/src/northbridge/amd/agesa/family15tn/northbridge.c index 41c2d8e506..144dde726f 100644 --- a/src/northbridge/amd/agesa/family15tn/northbridge.c +++ b/src/northbridge/amd/agesa/family15tn/northbridge.c @@ -341,7 +341,7 @@ static void nb_read_resources(device_t dev) /* * This MMCONF resource must be reserved in the PCI domain. * It is not honored by the coreboot resource allocator if it is in - * the APIC_CLUSTER. + * the CPU_CLUSTER. */ #if CONFIG_MMCONF_SUPPORT struct resource *resource = new_resource(dev, 0xc0010058); @@ -1125,7 +1125,7 @@ static void root_complex_enable_dev(struct device *dev) /* Set the operations if it is a special bus type */ if (dev->path.type == DEVICE_PATH_DOMAIN) { dev->ops = &pci_domain_ops; - } else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) { + } else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) { dev->ops = &cpu_bus_ops; } } diff --git a/src/northbridge/amd/amdfam10/acpi.c b/src/northbridge/amd/amdfam10/acpi.c index 14efa9792e..d4fef64b14 100644 --- a/src/northbridge/amd/amdfam10/acpi.c +++ b/src/northbridge/amd/amdfam10/acpi.c @@ -35,7 +35,7 @@ unsigned long acpi_create_madt_lapic_nmis(unsigned long current, u16 flags, u8 l for(cpu = all_devices; cpu; cpu = cpu->next) { if ((cpu->path.type != DEVICE_PATH_APIC) || - (cpu->bus->dev->path.type != DEVICE_PATH_APIC_CLUSTER)) { + (cpu->bus->dev->path.type != DEVICE_PATH_CPU_CLUSTER)) { continue; } if (!cpu->enabled) { @@ -54,7 +54,7 @@ unsigned long acpi_create_srat_lapics(unsigned long current) for(cpu = all_devices; cpu; cpu = cpu->next) { if ((cpu->path.type != DEVICE_PATH_APIC) || - (cpu->bus->dev->path.type != DEVICE_PATH_APIC_CLUSTER)) { + (cpu->bus->dev->path.type != DEVICE_PATH_CPU_CLUSTER)) { continue; } if (!cpu->enabled) { @@ -354,7 +354,7 @@ unsigned long acpi_add_ssdt_pstates(acpi_rsdp_t *rsdp, unsigned long current) for(cpu = all_devices; cpu; cpu = cpu->next) { if ((cpu->path.type != DEVICE_PATH_APIC) || - (cpu->bus->dev->path.type != DEVICE_PATH_APIC_CLUSTER)) { + (cpu->bus->dev->path.type != DEVICE_PATH_CPU_CLUSTER)) { continue; } if (!cpu->enabled) { diff --git a/src/northbridge/amd/amdfam10/northbridge.c b/src/northbridge/amd/amdfam10/northbridge.c index 3b1e1f50ab..aabbae2e88 100644 --- a/src/northbridge/amd/amdfam10/northbridge.c +++ b/src/northbridge/amd/amdfam10/northbridge.c @@ -1472,7 +1472,7 @@ static void root_complex_enable_dev(struct device *dev) if (dev->path.type == DEVICE_PATH_DOMAIN) { dev->ops = &pci_domain_ops; } - else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) { + else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) { dev->ops = &cpu_bus_ops; } } diff --git a/src/northbridge/amd/amdk8/acpi.c b/src/northbridge/amd/amdk8/acpi.c index ba04da3f36..af93eadf59 100644 --- a/src/northbridge/amd/amdk8/acpi.c +++ b/src/northbridge/amd/amdk8/acpi.c @@ -42,7 +42,7 @@ unsigned long acpi_create_madt_lapic_nmis(unsigned long current, u16 flags, u8 l for(cpu = all_devices; cpu; cpu = cpu->next) { if ((cpu->path.type != DEVICE_PATH_APIC) || - (cpu->bus->dev->path.type != DEVICE_PATH_APIC_CLUSTER)) { + (cpu->bus->dev->path.type != DEVICE_PATH_CPU_CLUSTER)) { continue; } if (!cpu->enabled) { @@ -61,7 +61,7 @@ unsigned long acpi_create_srat_lapics(unsigned long current) for(cpu = all_devices; cpu; cpu = cpu->next) { if ((cpu->path.type != DEVICE_PATH_APIC) || - (cpu->bus->dev->path.type != DEVICE_PATH_APIC_CLUSTER)) { + (cpu->bus->dev->path.type != DEVICE_PATH_CPU_CLUSTER)) { continue; } if (!cpu->enabled) { diff --git a/src/northbridge/amd/amdk8/northbridge.c b/src/northbridge/amd/amdk8/northbridge.c index c5859f0031..5ed7762047 100644 --- a/src/northbridge/amd/amdk8/northbridge.c +++ b/src/northbridge/amd/amdk8/northbridge.c @@ -1358,7 +1358,7 @@ static void root_complex_enable_dev(struct device *dev) if (dev->path.type == DEVICE_PATH_DOMAIN) { dev->ops = &pci_domain_ops; } - else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) { + else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) { dev->ops = &cpu_bus_ops; } } diff --git a/src/northbridge/amd/gx1/northbridge.c b/src/northbridge/amd/gx1/northbridge.c index 8df0427f75..e4832636bf 100644 --- a/src/northbridge/amd/gx1/northbridge.c +++ b/src/northbridge/amd/gx1/northbridge.c @@ -159,8 +159,8 @@ static void enable_dev(struct device *dev) dev->ops = &pci_domain_ops; pci_set_method(dev); } - else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) { - printk(BIOS_SPEW, "DEVICE_PATH_APIC_CLUSTER\n"); + else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) { + printk(BIOS_SPEW, "DEVICE_PATH_CPU_CLUSTER\n"); dev->ops = &cpu_bus_ops; } else { printk(BIOS_SPEW, "device path type %d\n",dev->path.type); diff --git a/src/northbridge/amd/gx2/northbridge.c b/src/northbridge/amd/gx2/northbridge.c index 8b8ef719e4..ee285f1d1a 100644 --- a/src/northbridge/amd/gx2/northbridge.c +++ b/src/northbridge/amd/gx2/northbridge.c @@ -351,7 +351,7 @@ static void enable_dev(struct device *dev) /* Set the operations if it is a special bus type */ if (dev->path.type == DEVICE_PATH_DOMAIN) dev->ops = &pci_domain_ops; - else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) + else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) dev->ops = &cpu_bus_ops; } diff --git a/src/northbridge/amd/lx/northbridge.c b/src/northbridge/amd/lx/northbridge.c index 26b4884480..3a2eb462ed 100644 --- a/src/northbridge/amd/lx/northbridge.c +++ b/src/northbridge/amd/lx/northbridge.c @@ -455,7 +455,7 @@ static void enable_dev(struct device *dev) /* Set the operations if it is a special bus type */ if (dev->path.type == DEVICE_PATH_DOMAIN) dev->ops = &pci_domain_ops; - else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) + else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) dev->ops = &cpu_bus_ops; } diff --git a/src/northbridge/intel/e7501/northbridge.c b/src/northbridge/intel/e7501/northbridge.c index 60929aa036..ab382fa03f 100644 --- a/src/northbridge/intel/e7501/northbridge.c +++ b/src/northbridge/intel/e7501/northbridge.c @@ -128,7 +128,7 @@ static void enable_dev(struct device *dev) if (dev->path.type == DEVICE_PATH_DOMAIN) { dev->ops = &pci_domain_ops; } - else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) { + else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) { dev->ops = &cpu_bus_ops; } } diff --git a/src/northbridge/intel/e7505/northbridge.c b/src/northbridge/intel/e7505/northbridge.c index 00b8f5783b..1b6f40d84a 100644 --- a/src/northbridge/intel/e7505/northbridge.c +++ b/src/northbridge/intel/e7505/northbridge.c @@ -140,7 +140,7 @@ static void enable_dev(struct device *dev) if (dev->path.type == DEVICE_PATH_DOMAIN) { dev->ops = &pci_domain_ops; } - else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) { + else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) { dev->ops = &cpu_bus_ops; } } diff --git a/src/northbridge/intel/e7520/northbridge.c b/src/northbridge/intel/e7520/northbridge.c index 536ceba598..03aad3e29f 100644 --- a/src/northbridge/intel/e7520/northbridge.c +++ b/src/northbridge/intel/e7520/northbridge.c @@ -203,7 +203,7 @@ static void enable_dev(device_t dev) if (dev->path.type == DEVICE_PATH_DOMAIN) { dev->ops = &pci_domain_ops; } - else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) { + else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) { dev->ops = &cpu_bus_ops; } } diff --git a/src/northbridge/intel/e7525/northbridge.c b/src/northbridge/intel/e7525/northbridge.c index f854913a5f..12ee971e37 100644 --- a/src/northbridge/intel/e7525/northbridge.c +++ b/src/northbridge/intel/e7525/northbridge.c @@ -203,7 +203,7 @@ static void enable_dev(device_t dev) if (dev->path.type == DEVICE_PATH_DOMAIN) { dev->ops = &pci_domain_ops; } - else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) { + else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) { dev->ops = &cpu_bus_ops; } } diff --git a/src/northbridge/intel/gm45/northbridge.c b/src/northbridge/intel/gm45/northbridge.c index e1e2b92e06..9c1e96de6b 100644 --- a/src/northbridge/intel/gm45/northbridge.c +++ b/src/northbridge/intel/gm45/northbridge.c @@ -235,7 +235,7 @@ static void enable_dev(device_t dev) /* Set the operations if it is a special bus type */ if (dev->path.type == DEVICE_PATH_DOMAIN) { dev->ops = &pci_domain_ops; - } else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) { + } else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) { dev->ops = &cpu_bus_ops; } } diff --git a/src/northbridge/intel/i3100/northbridge.c b/src/northbridge/intel/i3100/northbridge.c index ee8d5364ba..87c5e75593 100644 --- a/src/northbridge/intel/i3100/northbridge.c +++ b/src/northbridge/intel/i3100/northbridge.c @@ -224,7 +224,7 @@ static void enable_dev(device_t dev) if (dev->path.type == DEVICE_PATH_DOMAIN) { dev->ops = &pci_domain_ops; } - else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) { + else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) { dev->ops = &cpu_bus_ops; } } diff --git a/src/northbridge/intel/i440bx/northbridge.c b/src/northbridge/intel/i440bx/northbridge.c index 5f8bd7b387..488275db14 100644 --- a/src/northbridge/intel/i440bx/northbridge.c +++ b/src/northbridge/intel/i440bx/northbridge.c @@ -111,7 +111,7 @@ static void enable_dev(struct device *dev) dev->ops = &pci_domain_ops; pci_set_method(dev); } - else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) { + else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) { dev->ops = &cpu_bus_ops; } } diff --git a/src/northbridge/intel/i440lx/northbridge.c b/src/northbridge/intel/i440lx/northbridge.c index c2c50ce217..bbb621e1a9 100644 --- a/src/northbridge/intel/i440lx/northbridge.c +++ b/src/northbridge/intel/i440lx/northbridge.c @@ -140,7 +140,7 @@ static void enable_dev(struct device *dev) dev->ops = &pci_domain_ops; pci_set_method(dev); } - else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) { + else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) { dev->ops = &cpu_bus_ops; } } diff --git a/src/northbridge/intel/i5000/northbridge.c b/src/northbridge/intel/i5000/northbridge.c index 01d6945312..c9b99a980c 100644 --- a/src/northbridge/intel/i5000/northbridge.c +++ b/src/northbridge/intel/i5000/northbridge.c @@ -185,7 +185,7 @@ static void enable_dev(device_t dev) /* Set the operations if it is a special bus type */ if (dev->path.type == DEVICE_PATH_DOMAIN) { dev->ops = &pci_domain_ops; - } else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) { + } else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) { dev->ops = &cpu_bus_ops; } } diff --git a/src/northbridge/intel/i82810/northbridge.c b/src/northbridge/intel/i82810/northbridge.c index 40d8df8678..07dc47b05f 100644 --- a/src/northbridge/intel/i82810/northbridge.c +++ b/src/northbridge/intel/i82810/northbridge.c @@ -163,7 +163,7 @@ static void enable_dev(struct device *dev) if (dev->path.type == DEVICE_PATH_DOMAIN) { dev->ops = &pci_domain_ops; pci_set_method(dev); - } else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) { + } else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) { dev->ops = &cpu_bus_ops; } } diff --git a/src/northbridge/intel/i82830/northbridge.c b/src/northbridge/intel/i82830/northbridge.c index 194bacbb14..8920fe70cd 100644 --- a/src/northbridge/intel/i82830/northbridge.c +++ b/src/northbridge/intel/i82830/northbridge.c @@ -132,7 +132,7 @@ static void enable_dev(struct device *dev) if (dev->path.type == DEVICE_PATH_DOMAIN) { dev->ops = &pci_domain_ops; pci_set_method(dev); - } else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) { + } else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) { dev->ops = &cpu_bus_ops; } } diff --git a/src/northbridge/intel/i855/northbridge.c b/src/northbridge/intel/i855/northbridge.c index 68fefcae04..2ff58fd738 100644 --- a/src/northbridge/intel/i855/northbridge.c +++ b/src/northbridge/intel/i855/northbridge.c @@ -148,7 +148,7 @@ static void enable_dev(struct device *dev) dev->ops = &pci_domain_ops; pci_set_method(dev); } - else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) { + else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) { dev->ops = &cpu_bus_ops; } } diff --git a/src/northbridge/intel/i945/northbridge.c b/src/northbridge/intel/i945/northbridge.c index ab5048e9d7..63a03adc5d 100644 --- a/src/northbridge/intel/i945/northbridge.c +++ b/src/northbridge/intel/i945/northbridge.c @@ -307,7 +307,7 @@ static void enable_dev(device_t dev) /* Set the operations if it is a special bus type */ if (dev->path.type == DEVICE_PATH_DOMAIN) { dev->ops = &pci_domain_ops; - } else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) { + } else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) { dev->ops = &cpu_bus_ops; } } diff --git a/src/northbridge/intel/sandybridge/northbridge.c b/src/northbridge/intel/sandybridge/northbridge.c index 0f5492dd60..4b6808a0fb 100644 --- a/src/northbridge/intel/sandybridge/northbridge.c +++ b/src/northbridge/intel/sandybridge/northbridge.c @@ -503,7 +503,7 @@ static void enable_dev(device_t dev) /* Set the operations if it is a special bus type */ if (dev->path.type == DEVICE_PATH_DOMAIN) { dev->ops = &pci_domain_ops; - } else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) { + } else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) { dev->ops = &cpu_bus_ops; } } diff --git a/src/northbridge/intel/sch/northbridge.c b/src/northbridge/intel/sch/northbridge.c index 33a74b5a1a..ffeb0ed942 100644 --- a/src/northbridge/intel/sch/northbridge.c +++ b/src/northbridge/intel/sch/northbridge.c @@ -325,7 +325,7 @@ static void enable_dev(device_t dev) /* Set the operations if it is a special bus type. */ if (dev->path.type == DEVICE_PATH_DOMAIN) { dev->ops = &pci_domain_ops; - } else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) { + } else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) { dev->ops = &cpu_bus_ops; } } diff --git a/src/northbridge/via/cn400/northbridge.c b/src/northbridge/via/cn400/northbridge.c index d126596ca5..088175e529 100644 --- a/src/northbridge/via/cn400/northbridge.c +++ b/src/northbridge/via/cn400/northbridge.c @@ -268,7 +268,7 @@ static void enable_dev(struct device *dev) if (dev->path.type == DEVICE_PATH_DOMAIN) { dev->ops = &pci_domain_ops; pci_set_method(dev); - } else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) { + } else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) { dev->ops = &cpu_bus_ops; } } diff --git a/src/northbridge/via/cn700/northbridge.c b/src/northbridge/via/cn700/northbridge.c index ec038e0695..0bd06aa80e 100644 --- a/src/northbridge/via/cn700/northbridge.c +++ b/src/northbridge/via/cn700/northbridge.c @@ -188,7 +188,7 @@ static void enable_dev(struct device *dev) if (dev->path.type == DEVICE_PATH_DOMAIN) { dev->ops = &pci_domain_ops; pci_set_method(dev); - } else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) { + } else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) { dev->ops = &cpu_bus_ops; } } diff --git a/src/northbridge/via/cx700/northbridge.c b/src/northbridge/via/cx700/northbridge.c index b1e9140697..1f045c9bc5 100644 --- a/src/northbridge/via/cx700/northbridge.c +++ b/src/northbridge/via/cx700/northbridge.c @@ -118,7 +118,7 @@ static void enable_dev(struct device *dev) if (dev->path.type == DEVICE_PATH_DOMAIN) { dev->ops = &pci_domain_ops; pci_set_method(dev); - } else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) { + } else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) { dev->ops = &cpu_bus_ops; } } diff --git a/src/northbridge/via/vt8601/northbridge.c b/src/northbridge/via/vt8601/northbridge.c index 1c699ee336..5cc7bc9c84 100644 --- a/src/northbridge/via/vt8601/northbridge.c +++ b/src/northbridge/via/vt8601/northbridge.c @@ -133,7 +133,7 @@ static void enable_dev(struct device *dev) dev->ops = &pci_domain_ops; pci_set_method(dev); } - else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) { + else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) { dev->ops = &cpu_bus_ops; } } diff --git a/src/northbridge/via/vt8623/northbridge.c b/src/northbridge/via/vt8623/northbridge.c index 782583d949..827d3f7dfd 100644 --- a/src/northbridge/via/vt8623/northbridge.c +++ b/src/northbridge/via/vt8623/northbridge.c @@ -195,7 +195,7 @@ static void enable_dev(struct device *dev) dev->ops = &pci_domain_ops; pci_set_method(dev); } - else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) { + else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) { dev->ops = &cpu_bus_ops; } } diff --git a/src/northbridge/via/vx800/northbridge.c b/src/northbridge/via/vx800/northbridge.c index 1a438b02ec..ffd5b714ff 100644 --- a/src/northbridge/via/vx800/northbridge.c +++ b/src/northbridge/via/vx800/northbridge.c @@ -166,7 +166,7 @@ static void enable_dev(struct device *dev) if (dev->path.type == DEVICE_PATH_DOMAIN) { dev->ops = &pci_domain_ops; pci_set_method(dev); - } else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) { + } else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) { dev->ops = &cpu_bus_ops; } } diff --git a/src/southbridge/intel/i82371eb/acpi_tables.c b/src/southbridge/intel/i82371eb/acpi_tables.c index cdcf19a058..5b1adf0bcf 100644 --- a/src/southbridge/intel/i82371eb/acpi_tables.c +++ b/src/southbridge/intel/i82371eb/acpi_tables.c @@ -36,7 +36,7 @@ static int determine_total_number_of_cores(void) int count = 0; for(cpu = all_devices; cpu; cpu = cpu->next) { if ((cpu->path.type != DEVICE_PATH_APIC) || - (cpu->bus->dev->path.type != DEVICE_PATH_APIC_CLUSTER)) { + (cpu->bus->dev->path.type != DEVICE_PATH_CPU_CLUSTER)) { continue; } if (!cpu->enabled) { -- cgit v1.2.3