Stefan Reinauer (stefan.reinauer@coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2377
-gerrit
commit a0e23a494c0440e2cd73a9cf7a7024329ed2ed16 Author: Stefan Reinauer reinauer@chromium.org Date: Tue Feb 12 15:20:54 2013 -0800
sconfig: rename lapic_cluster -> cpu_cluster
The name lapic_cluster is a bit misleading, since the construct is not local APIC specific by concept. As implementations and hardware change, be more generic about our naming. This will allow us to support non-x86 systems without adding new keywords.
Change-Id: Icd7f5fcf6f54d242eabb5e14ee151eec8d6cceb1 Signed-off-by: Stefan Reinauer reinauer@google.com --- documentation/Kconfig.tex | 10 +- src/arch/armv7/boot/acpi.c | 2 +- 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 +- util/sconfig/lex.yy.c_shipped | 174 ++++++++++----------- util/sconfig/main.c | 4 +- util/sconfig/sconfig.l | 2 +- util/sconfig/sconfig.tab.c_shipped | 4 +- util/sconfig/sconfig.tab.h_shipped | 2 +- util/sconfig/sconfig.y | 2 +- 219 files changed, 334 insertions(+), 334 deletions(-)
diff --git a/documentation/Kconfig.tex b/documentation/Kconfig.tex index 1739c05..6e59a7c 100644 --- a/documentation/Kconfig.tex +++ b/documentation/Kconfig.tex @@ -139,9 +139,9 @@ properly, as it defines topology and chips that can be defined no other way. Let's go through the tree. \begin{verbatim} chip northbridge/amd/amdk8/root_complex - device apic_cluster 0 on + device cpu_cluster 0 on chip cpu/amd/socket_F - device apic 0 on end + device lapic 0 on end end end \end{verbatim} @@ -153,11 +153,11 @@ somewhere, since it runs memory.
What is the APIC? Northbridges always have an Advanced Programmable Interrupt Controller, and that {\it APIC cluster} is a topological connection to the -CPU socket. So the tree is rooted at the northbridge, which has a link to an apic cluster, and then the CPU. The CPU contains +CPU socket. So the tree is rooted at the northbridge, which has a link to a CPU cluster, and then the CPU. The CPU contains its own APIC, and will define any parameters needed. In this case, we have a northbridge of type -{\it northbridge/amd/amdk8/root_complex}, with its own apic_cluster device which we turn on, +{\it northbridge/amd/amdk8/root_complex}, with its own cpu_cluster device which we turn on, which connects to a {\it cpu/amd/socket_F}, -which has an apic, which is on. +which has a local apic, which is on.
Note that we do not enumerate all CPUs, even on this SMP mainboard. The reason is they may not all be there. The CPU we define here is the so-called Boot Strap Processor, or BSP; the other CPUs will come along later, as the are discovered. We do not require (unlike many diff --git a/src/arch/armv7/boot/acpi.c b/src/arch/armv7/boot/acpi.c index 4d405d9..544c734 100644 --- a/src/arch/armv7/boot/acpi.c +++ b/src/arch/armv7/boot/acpi.c @@ -145,7 +145,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/acpi.c b/src/arch/x86/boot/acpi.c index 730e53e..fc862f4 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 5d01434..8c380e5 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 b0824a7..6079828 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 dfcc82e..483e813 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 60f555a..9b9bc40 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 c59b49e..00fb727 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 3e83186..0dea9ae 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 7625fa6..e0bfdac 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 9737b01..221b80c 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 a85a861..3a6648a 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 a356f79..f7db1cc 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 cc62466..25676f0 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 1a1db6d..3331a12 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 b92a666..8dd971e 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 9e2c61a..9fb255e 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 b0d5fcb..f003704 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 11f4b3c..56efd84 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 c5cbb1c..4fd77b7 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 6a0299b..93effaa 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 9942ffe..be48439 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 1eab2f5..fce7d10 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 4f16ea7..760e5ab 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 db51f65..a7a352f 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 ac0e00e..1fea190 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 40805c6..972632b 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 be6f52e..16373fe 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 e468cce..f284766 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 ae25336..9315440 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 bd4f49b..73df206 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 4f08cfb..7642262 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 5461462..f43aec8 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 fbf29c5..2035117 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 2f1f802..d270f3d 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 5f81d83..f246dcf 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 1fed8ac..bc2beb1 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 dbb27dc..c864de7 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 b77601d..5e56acc 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 5ace9ea..f2d078a 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 958ab93..b4d1b63 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 74c96ba..6bb9bc8 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 2d92017..7134dce 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 d3b5c1b..213e3ea 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 3e52394..61d94ba 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 bbf4b3d..e760c17 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 e6bd174..4549ead 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 2817b63..9783989 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 1590b9f..4b3142e 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 cf04dc1..8a20cab 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 fb50362..fe82a0d 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 b7310dd..b8e9e85 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 f88a8f8..5bee5ae 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 39f4246..9a785da 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 0feb7e4..84f0c29 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 f88a8f8..5bee5ae 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 a2ac9f4..42ddf01 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 ce51b04..a2f5513 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 a49f267..1e61b3d 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 c324872..f0a086b 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 c92f8a6..0d35e9c 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 5ad7cbf..b1486a6 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 4ddedfa..def9e2f 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 9eeb95f..3a9603b 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 77dfbd0..839b767 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 180a2c9..7d3f0e2 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 10870a6..6256ca1 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 a258515..5b5c1ae 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 0f3f201..85f4785 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 0bf9307..c2aecad 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 197f1cb..5902932 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 49bfe2a..c7d9932 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 c7c0ae1..bd98313 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 2fb0f1b..8d81fbe 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 6ab0f6f..ca8118a 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 0b18613..cd65fbf 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 7ad1505..c955ac3 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 fee6dbd..7012cf9 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 1da52ef..2dbcb9b 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 0f1474b..7de0c83 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 0d92bdb..7e5076d 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 9654b3f..bdaee50 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 785f357..1888987 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 0195822..d5c7033 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 5360fcc..a6dba30 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 2bb840e..2bf4b7f 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 5b6d73a..f2166af 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 f5afa92..f8cc906 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 6a4b353..d389d8a 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 5a272c1..b37750c 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 1d0ed42..0bb42d6 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 b5c3ece..501bc7e 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 61ead86..c1ff1d5 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 23e98d3..05fb05e 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 75d918e..215ed97 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 7c46a8f..84cfc4b 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 3f9bbce..544390d 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 0220c30..fda8ca2 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 5604d7f..ea7430b 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 ace3277..3b99b9c 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 116e7b5..783e4ae 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 ee738b2..65a96a0 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 dc4945b..22bdae9 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 a7b43fd..257d894 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 7bde52f..3973f3b 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 d5d5274..91daf3a 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 7046158..a35c91c 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 98e0744..59aaa65 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 65119fc..088ebca 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 f3bd588..6599844 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 a4edbe8..9a56521 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 4e995d9..8ac7e8e 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 6829a3a..159a444 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 3792e21..55f2745 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 e038513..901470f 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 c91ea0a..481ea0b 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 9546acd..a0c39b4 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 fe320ec..b35bb58 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 b41a162..75822ea 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 8b46deb..f61d6a3 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 4060ae5..0a9d9f1 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 daa7551..cd4aefe 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 cc6e9b7..bd00d28 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 6d109cc..1f1a272 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 fff1f6a..363d1a8 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 8e0ece0..85e967a 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 9732796..d8aa3bc 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 7fb73e1..d39126c 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 502b032..7b9d7a1 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 192681e..5989278 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 c2f091d..cdd7a5c 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 925b71d..ee01e8a 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 d01d5a8..1d83f10 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 c39a2ce..db9c4b7 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 fe5bf33..9f9bb67 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 0c8cf61..9efbaf7 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 3d1e994..51ad94f 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 e7fe9e4..c8a8bc5 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 8365346..0af54ec 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 d797bea..93a38d6 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 6367392..7506c90 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 eb7ae1b..ba7eb2a 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 f39ca6c..60508a3 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 dfe2e88..01c2837 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 c074fe8..c143ced 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 1b54204..3a037fb 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 1ec6639..ca8650b 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 0a3fabb..e09619f 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 2cc73e1..23b9741 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 ee69a49..ff14075 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 c173330..167ada0 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 ef14c3e..4a2674e 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 16b3e7c..f774d4f 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 726a5d2..d3b6b1e 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 bff0013..85c6384 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 f7f7a9e..39eb8b2 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 2aa0796..f9f4856 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 463c553..aab75a3 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 0726d08..4074695 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 b677fbc..acc5085 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 7517e4d..3d8c65e 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 a5cef44..af29be1 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 f60d5c6..f830505 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 276e12f..57815de 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 851da92..0a5475f 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 37470d8..da59eb5 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 eaf2e57..151fbc4 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 ce367a8..4b8acfc 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 041bc40..028cb88 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 eae67c3..98f6b4f 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 e780c4a..2c2cf8a 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 55c7cdf..2f971c2 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 84aba7b..35aa0e7 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 d0117ef..9e9f632 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 b0acb3a..d5e16ac 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 34a673b..17bc35e 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 5268b17..87d2ed1 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 8682109..f900f78 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 9055ef6..9008fe6 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 59a12f1..cd21d9c 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 e860594..a4ed87f 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 d955bcf..c1685ec 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 769d473..5cd76a3 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 41c2d8e..144dde7 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 14efa97..d4fef64 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 3b1e1f5..aabbae2 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 ba04da3..af93ead 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 c5859f0..5ed7762 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 8df0427..e483263 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 8b8ef71..ee285f1 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 26b4884..3a2eb46 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 60929aa..ab382fa 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 00b8f57..1b6f40d 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 536ceba..03aad3e 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 f854913..12ee971 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 e1e2b92..9c1e96d 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 ee8d536..87c5e75 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 5f8bd7b..488275d 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 c2c50ce..bbb621e 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 01d6945..c9b99a9 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 40d8df8..07dc47b 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 194bacb..8920fe7 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 68fefca..2ff58fd 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 ab5048e..63a03ad 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 0f5492d..4b6808a 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 33a74b5..ffeb0ed 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 d126596..088175e 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 ec038e0..0bd06aa 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 b1e9140..1f045c9 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 1c699ee..5cc7bc9 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 782583d..827d3f7 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 1a438b0..ffd5b71 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 cdcf19a..5b1adf0 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) { diff --git a/util/sconfig/lex.yy.c_shipped b/util/sconfig/lex.yy.c_shipped index 70d6f2e..1deb75d 100644 --- a/util/sconfig/lex.yy.c_shipped +++ b/util/sconfig/lex.yy.c_shipped @@ -377,21 +377,21 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[114] = +static yyconst flex_int16_t yy_accept[116] = { 0, 0, 0, 31, 29, 1, 3, 29, 29, 29, 25, 25, 23, 26, 29, 26, 26, 26, 29, 29, 29, 29, 29, 29, 29, 1, 3, 29, 0, 29, 0, - 2, 25, 26, 29, 29, 29, 26, 29, 29, 29, - 29, 29, 18, 29, 29, 29, 7, 29, 29, 29, - 29, 28, 28, 24, 29, 29, 29, 29, 17, 22, - 12, 29, 29, 16, 29, 8, 9, 11, 29, 29, - 27, 4, 29, 29, 29, 29, 29, 29, 29, 29, - 29, 29, 29, 13, 29, 29, 5, 15, 29, 10, - 29, 29, 29, 20, 29, 29, 29, 29, 29, 29, - - 6, 29, 29, 29, 29, 19, 29, 29, 29, 21, - 29, 14, 0 + 2, 25, 26, 29, 29, 29, 29, 26, 29, 29, + 29, 29, 29, 18, 29, 29, 29, 7, 29, 29, + 29, 29, 28, 28, 24, 29, 29, 29, 29, 29, + 17, 22, 12, 29, 29, 16, 29, 8, 9, 11, + 29, 29, 27, 4, 29, 29, 29, 29, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 13, 29, 29, + 29, 5, 15, 29, 10, 29, 29, 29, 20, 29, + + 29, 29, 29, 29, 6, 29, 29, 29, 29, 29, + 19, 29, 14, 21, 0 } ;
static yyconst flex_int32_t yy_ec[256] = @@ -434,94 +434,94 @@ static yyconst flex_int32_t yy_meta[39] = 1, 1, 1, 1, 1, 1, 1, 1 } ;
-static yyconst flex_int16_t yy_base[119] = +static yyconst flex_int16_t yy_base[121] = { 0, - 0, 0, 179, 0, 176, 180, 174, 37, 41, 38, - 139, 0, 44, 161, 54, 72, 57, 39, 157, 47, - 54, 152, 137, 0, 169, 180, 81, 165, 74, 166, - 180, 0, 80, 98, 153, 142, 87, 139, 134, 144, - 144, 138, 144, 129, 129, 136, 0, 132, 126, 132, - 136, 0, 180, 0, 142, 122, 126, 133, 0, 0, - 0, 128, 118, 0, 122, 0, 0, 0, 121, 112, - 0, 0, 125, 118, 110, 116, 121, 106, 100, 116, - 108, 110, 115, 117, 98, 89, 0, 0, 87, 98, - 94, 91, 77, 0, 83, 77, 70, 79, 67, 63, - - 0, 70, 61, 58, 65, 0, 40, 52, 49, 0, - 22, 0, 180, 40, 123, 125, 127, 129 + 0, 0, 181, 0, 178, 182, 176, 37, 41, 38, + 141, 0, 44, 163, 54, 78, 60, 45, 159, 42, + 47, 154, 139, 0, 171, 182, 77, 167, 69, 168, + 182, 0, 82, 104, 155, 144, 133, 93, 140, 135, + 145, 145, 139, 145, 130, 130, 137, 0, 133, 127, + 133, 137, 0, 182, 0, 143, 123, 136, 126, 133, + 0, 0, 0, 128, 118, 0, 122, 0, 0, 0, + 121, 112, 0, 0, 125, 124, 117, 109, 115, 120, + 105, 90, 101, 99, 91, 93, 98, 0, 80, 76, + 73, 0, 0, 72, 89, 83, 69, 65, 0, 72, + + 64, 74, 60, 61, 0, 65, 62, 50, 51, 33, + 0, 28, 0, 0, 182, 40, 129, 131, 133, 135 } ;
-static yyconst flex_int16_t yy_def[119] = +static yyconst flex_int16_t yy_def[121] = { 0, - 113, 1, 113, 114, 113, 113, 114, 115, 116, 114, - 10, 114, 10, 114, 10, 10, 10, 114, 114, 114, - 114, 114, 114, 114, 113, 113, 115, 117, 116, 118, - 113, 10, 10, 10, 114, 114, 10, 114, 114, 114, - 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, - 114, 114, 113, 34, 114, 114, 114, 114, 114, 114, - 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, - 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, - 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, - 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, - - 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, - 114, 114, 0, 113, 113, 113, 113, 113 + 115, 1, 115, 116, 115, 115, 116, 117, 118, 116, + 10, 116, 10, 116, 10, 10, 10, 116, 116, 116, + 116, 116, 116, 116, 115, 115, 117, 119, 118, 120, + 115, 10, 10, 10, 116, 116, 116, 10, 116, 116, + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 115, 34, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116, 116, 0, 115, 115, 115, 115, 115 } ;
-static yyconst flex_int16_t yy_nxt[219] = +static yyconst flex_int16_t yy_nxt[221] = { 0, 4, 5, 6, 7, 8, 9, 10, 11, 10, 12, 13, 13, 14, 4, 4, 4, 13, 13, 15, 16, 17, 13, 4, 4, 18, 19, 4, 4, 20, 21, 4, 22, 23, 4, 4, 4, 4, 4, 28, 28, - 24, 24, 30, 31, 32, 32, 32, 41, 33, 33, - 33, 33, 33, 112, 33, 33, 33, 33, 33, 33, - 33, 33, 33, 33, 33, 33, 42, 43, 46, 111, - 44, 110, 48, 109, 47, 30, 31, 36, 33, 33, - 33, 49, 28, 28, 40, 52, 33, 33, 33, 108, - 107, 106, 37, 33, 33, 33, 105, 104, 103, 102, - - 38, 101, 100, 39, 54, 54, 54, 99, 54, 54, - 98, 97, 96, 95, 54, 54, 54, 54, 54, 54, - 94, 93, 57, 27, 27, 29, 29, 28, 28, 30, - 30, 92, 91, 90, 89, 88, 87, 86, 85, 84, - 83, 82, 81, 80, 79, 78, 77, 76, 75, 74, - 73, 72, 71, 70, 69, 68, 67, 66, 65, 64, - 63, 62, 61, 60, 59, 58, 56, 55, 31, 53, - 25, 51, 50, 45, 35, 34, 26, 25, 113, 3, - 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, - 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, - - 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, - 113, 113, 113, 113, 113, 113, 113, 113 + 24, 24, 30, 31, 32, 32, 32, 114, 33, 33, + 33, 33, 33, 42, 33, 33, 33, 33, 33, 33, + 33, 33, 33, 47, 113, 49, 33, 33, 33, 48, + 30, 31, 43, 44, 50, 112, 45, 36, 28, 28, + 111, 53, 110, 37, 33, 33, 33, 41, 33, 33, + 33, 109, 108, 107, 106, 105, 104, 103, 38, 33, + + 33, 33, 102, 101, 100, 99, 39, 98, 97, 40, + 55, 55, 55, 96, 55, 55, 95, 94, 93, 92, + 55, 55, 55, 55, 55, 55, 91, 90, 59, 27, + 27, 29, 29, 28, 28, 30, 30, 89, 88, 87, + 86, 85, 84, 83, 82, 81, 80, 79, 78, 77, + 76, 75, 74, 73, 72, 71, 70, 69, 68, 67, + 66, 65, 64, 63, 62, 61, 60, 58, 57, 56, + 31, 54, 25, 52, 51, 46, 35, 34, 26, 25, + 115, 3, 115, 115, 115, 115, 115, 115, 115, 115, + 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, + + 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, + 115, 115, 115, 115, 115, 115, 115, 115, 115, 115 } ;
-static yyconst flex_int16_t yy_chk[219] = +static yyconst flex_int16_t yy_chk[221] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 8, 8, - 114, 8, 9, 9, 10, 10, 10, 18, 10, 10, - 13, 13, 13, 111, 10, 10, 10, 10, 10, 10, - 15, 15, 15, 17, 17, 17, 18, 18, 20, 109, - 18, 108, 21, 107, 20, 29, 29, 15, 16, 16, - 16, 21, 27, 27, 17, 27, 33, 33, 33, 105, - 104, 103, 16, 37, 37, 37, 102, 100, 99, 98, - - 16, 97, 96, 16, 34, 34, 34, 95, 34, 34, - 93, 92, 91, 90, 34, 34, 34, 34, 34, 34, - 89, 86, 37, 115, 115, 116, 116, 117, 117, 118, - 118, 85, 84, 83, 82, 81, 80, 79, 78, 77, - 76, 75, 74, 73, 70, 69, 65, 63, 62, 58, - 57, 56, 55, 51, 50, 49, 48, 46, 45, 44, - 43, 42, 41, 40, 39, 38, 36, 35, 30, 28, - 25, 23, 22, 19, 14, 11, 7, 5, 3, 113, - 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, - 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, - - 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, - 113, 113, 113, 113, 113, 113, 113, 113 + 116, 8, 9, 9, 10, 10, 10, 112, 10, 10, + 13, 13, 13, 18, 10, 10, 10, 10, 10, 10, + 15, 15, 15, 20, 110, 21, 17, 17, 17, 20, + 29, 29, 18, 18, 21, 109, 18, 15, 27, 27, + 108, 27, 107, 15, 16, 16, 16, 17, 33, 33, + 33, 106, 104, 103, 102, 101, 100, 98, 16, 38, + + 38, 38, 97, 96, 95, 94, 16, 91, 90, 16, + 34, 34, 34, 89, 34, 34, 87, 86, 85, 84, + 34, 34, 34, 34, 34, 34, 83, 82, 38, 117, + 117, 118, 118, 119, 119, 120, 120, 81, 80, 79, + 78, 77, 76, 75, 72, 71, 67, 65, 64, 60, + 59, 58, 57, 56, 52, 51, 50, 49, 47, 46, + 45, 44, 43, 42, 41, 40, 39, 37, 36, 35, + 30, 28, 25, 23, 22, 19, 14, 11, 7, 5, + 3, 115, 115, 115, 115, 115, 115, 115, 115, 115, + 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, + + 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, + 115, 115, 115, 115, 115, 115, 115, 115, 115, 115 } ;
static yy_state_type yy_last_accepting_state; @@ -798,13 +798,13 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 114 ) + if ( yy_current_state >= 116 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_base[yy_current_state] != 180 ); + while ( yy_base[yy_current_state] != 182 );
yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -884,7 +884,7 @@ YY_RULE_SETUP YY_BREAK case 14: YY_RULE_SETUP -{yylval.number=APIC_CLUSTER; return(BUS);} +{yylval.number=CPU_CLUSTER; return(BUS);} YY_BREAK case 15: YY_RULE_SETUP @@ -1242,7 +1242,7 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 114 ) + if ( yy_current_state >= 116 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -1270,11 +1270,11 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 114 ) + if ( yy_current_state >= 116 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 113); + yy_is_jam = (yy_current_state == 115);
return yy_is_jam ? 0 : yy_current_state; } diff --git a/util/sconfig/main.c b/util/sconfig/main.c index d87238f..c3f2cdf 100644 --- a/util/sconfig/main.c +++ b/util/sconfig/main.c @@ -262,8 +262,8 @@ struct device *new_device(struct device *parent, struct device *busdev, const in new_d->path = ".type=DEVICE_PATH_APIC,{.apic={ .apic_id = 0x%x }}"; break;
- case APIC_CLUSTER: - new_d->path = ".type=DEVICE_PATH_APIC_CLUSTER,{.apic_cluster={ .cluster = 0x%x }}"; + case CPU_CLUSTER: + new_d->path = ".type=DEVICE_PATH_CPU_CLUSTER,{.cpu_cluster={ .cluster = 0x%x }}"; break;
case DOMAIN: diff --git a/util/sconfig/sconfig.l b/util/sconfig/sconfig.l index 4856171..3e9535e 100755 --- a/util/sconfig/sconfig.l +++ b/util/sconfig/sconfig.l @@ -38,7 +38,7 @@ ioapic {yylval.number=IOAPIC; return(BUS);} pnp {yylval.number=PNP; return(BUS);} i2c {yylval.number=I2C; return(BUS);} lapic {yylval.number=APIC; return(BUS);} -lapic_cluster {yylval.number=APIC_CLUSTER; return(BUS);} +cpu_cluster {yylval.number=CPU_CLUSTER; return(BUS);} domain {yylval.number=DOMAIN; return(BUS);} irq {yylval.number=IRQ; return(RESOURCE);} drq {yylval.number=DRQ; return(RESOURCE);} diff --git a/util/sconfig/sconfig.tab.c_shipped b/util/sconfig/sconfig.tab.c_shipped index 7fa6988..3a56ac8 100644 --- a/util/sconfig/sconfig.tab.c_shipped +++ b/util/sconfig/sconfig.tab.c_shipped @@ -132,7 +132,7 @@ static struct device *cur_parent, *cur_bus; PNP = 269, I2C = 270, APIC = 271, - APIC_CLUSTER = 272, + CPU_CLUSTER = 272, DOMAIN = 273, IRQ = 274, DRQ = 275, @@ -478,7 +478,7 @@ static const char *const yytname[] = { "$end", "error", "$undefined", "CHIP", "DEVICE", "REGISTER", "BOOL", "BUS", "RESOURCE", "END", "EQUALS", "HEX", "STRING", "PCI", "PNP", "I2C", - "APIC", "APIC_CLUSTER", "DOMAIN", "IRQ", "DRQ", "IO", "NUMBER", + "APIC", "CPU_CLUSTER", "DOMAIN", "IRQ", "DRQ", "IO", "NUMBER", "SUBSYSTEMID", "INHERIT", "IOAPIC_IRQ", "IOAPIC", "PCIINT", "$accept", "devtree", "$@1", "chipchildren", "devicechildren", "chip", "@2", "device", "@3", "resource", "registers", "subsystemid", "ioapic_irq", 0 diff --git a/util/sconfig/sconfig.tab.h_shipped b/util/sconfig/sconfig.tab.h_shipped index e1257f9..be65179 100644 --- a/util/sconfig/sconfig.tab.h_shipped +++ b/util/sconfig/sconfig.tab.h_shipped @@ -51,7 +51,7 @@ PNP = 269, I2C = 270, APIC = 271, - APIC_CLUSTER = 272, + CPU_CLUSTER = 272, DOMAIN = 273, IRQ = 274, DRQ = 275, diff --git a/util/sconfig/sconfig.y b/util/sconfig/sconfig.y index 9a133a7..8ea702e 100755 --- a/util/sconfig/sconfig.y +++ b/util/sconfig/sconfig.y @@ -30,7 +30,7 @@ static struct device *cur_parent, *cur_bus; int number; }
-%token CHIP DEVICE REGISTER BOOL BUS RESOURCE END EQUALS HEX STRING PCI PNP I2C APIC APIC_CLUSTER DOMAIN IRQ DRQ IO NUMBER SUBSYSTEMID INHERIT IOAPIC_IRQ IOAPIC PCIINT +%token CHIP DEVICE REGISTER BOOL BUS RESOURCE END EQUALS HEX STRING PCI PNP I2C APIC CPU_CLUSTER DOMAIN IRQ DRQ IO NUMBER SUBSYSTEMID INHERIT IOAPIC_IRQ IOAPIC PCIINT %% devtree: { cur_parent = cur_bus = head; } chip { postprocess_devtree(); } ;