aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--documentation/Kconfig.tex4
-rw-r--r--src/arch/x86/boot/mpspec.c2
-rw-r--r--src/cpu/amd/sc520/sc520.c2
-rw-r--r--src/device/device.c8
-rw-r--r--src/device/device_util.c10
-rw-r--r--src/include/device/path.h6
-rw-r--r--src/mainboard/a-trend/atc-6220/devicetree.cb2
-rw-r--r--src/mainboard/a-trend/atc-6240/devicetree.cb2
-rw-r--r--src/mainboard/aaeon/pfm-540i_revb/devicetree.cb2
-rw-r--r--src/mainboard/abit/be6-ii_v2_0/devicetree.cb2
-rw-r--r--src/mainboard/advansus/a785e-i/devicetree.cb4
-rw-r--r--src/mainboard/advantech/pcm-5820/devicetree.cb2
-rw-r--r--src/mainboard/amd/bimini_fam10/devicetree.cb8
-rw-r--r--src/mainboard/amd/db800/devicetree.cb2
-rw-r--r--src/mainboard/amd/dbm690t/devicetree.cb4
-rw-r--r--src/mainboard/amd/dinar/devicetree.cb4
-rw-r--r--src/mainboard/amd/inagua/devicetree.cb4
-rw-r--r--src/mainboard/amd/mahogany/devicetree.cb4
-rw-r--r--src/mainboard/amd/mahogany_fam10/devicetree.cb8
-rw-r--r--src/mainboard/amd/norwich/devicetree.cb2
-rw-r--r--src/mainboard/amd/parmer/devicetree.cb4
-rw-r--r--src/mainboard/amd/persimmon/devicetree.cb4
-rw-r--r--src/mainboard/amd/pistachio/devicetree.cb4
-rw-r--r--src/mainboard/amd/rumba/devicetree.cb2
-rw-r--r--src/mainboard/amd/serengeti_cheetah/devicetree.cb4
-rw-r--r--src/mainboard/amd/serengeti_cheetah_fam10/devicetree.cb8
-rw-r--r--src/mainboard/amd/south_station/devicetree.cb4
-rw-r--r--src/mainboard/amd/thatcher/devicetree.cb4
-rw-r--r--src/mainboard/amd/tilapia_fam10/devicetree.cb8
-rwxr-xr-xsrc/mainboard/amd/torpedo/devicetree.cb4
-rw-r--r--src/mainboard/amd/union_station/devicetree.cb4
-rw-r--r--src/mainboard/aopen/dxplplusu/devicetree.cb4
-rw-r--r--src/mainboard/arima/hdama/devicetree.cb2
-rw-r--r--src/mainboard/artecgroup/dbe61/devicetree.cb2
-rw-r--r--src/mainboard/asi/mb_5blgp/devicetree.cb2
-rw-r--r--src/mainboard/asi/mb_5blmp/devicetree.cb2
-rw-r--r--src/mainboard/asrock/939a785gmh/devicetree.cb4
-rw-r--r--src/mainboard/asrock/e350m1/devicetree.cb4
-rw-r--r--src/mainboard/asus/a8n_e/devicetree.cb2
-rw-r--r--src/mainboard/asus/a8v-e_deluxe/devicetree.cb2
-rw-r--r--src/mainboard/asus/a8v-e_se/devicetree.cb2
-rw-r--r--src/mainboard/asus/dsbf/devicetree.cb2
-rw-r--r--src/mainboard/asus/k8v-x/devicetree.cb2
-rw-r--r--src/mainboard/asus/m2n-e/devicetree.cb2
-rw-r--r--src/mainboard/asus/m2v-mx_se/devicetree.cb2
-rw-r--r--src/mainboard/asus/m2v/devicetree.cb2
-rw-r--r--src/mainboard/asus/m4a78-em/devicetree.cb4
-rw-r--r--src/mainboard/asus/m4a785-m/devicetree.cb4
-rw-r--r--src/mainboard/asus/m4a785t-m/devicetree.cb4
-rw-r--r--src/mainboard/asus/m5a88-v/devicetree.cb4
-rw-r--r--src/mainboard/asus/mew-am/devicetree.cb2
-rw-r--r--src/mainboard/asus/mew-vm/devicetree.cb2
-rw-r--r--src/mainboard/asus/p2b-d/devicetree.cb2
-rw-r--r--src/mainboard/asus/p2b-ds/devicetree.cb2
-rw-r--r--src/mainboard/asus/p2b-f/devicetree.cb2
-rw-r--r--src/mainboard/asus/p2b-ls/devicetree.cb2
-rw-r--r--src/mainboard/asus/p2b/devicetree.cb2
-rw-r--r--src/mainboard/asus/p3b-f/devicetree.cb2
-rw-r--r--src/mainboard/avalue/eax-785e/devicetree.cb4
-rw-r--r--src/mainboard/axus/tc320/devicetree.cb2
-rw-r--r--src/mainboard/azza/pt-6ibd/devicetree.cb2
-rw-r--r--src/mainboard/bachmann/ot200/devicetree.cb2
-rw-r--r--src/mainboard/bcom/winnet100/devicetree.cb2
-rw-r--r--src/mainboard/bcom/winnetp680/devicetree.cb2
-rw-r--r--src/mainboard/bifferos/bifferboard/devicetree.cb2
-rw-r--r--src/mainboard/biostar/m6tba/devicetree.cb2
-rw-r--r--src/mainboard/broadcom/blast/devicetree.cb4
-rw-r--r--src/mainboard/compaq/deskpro_en_sff_p600/devicetree.cb2
-rw-r--r--src/mainboard/digitallogic/adl855pc/devicetree.cb2
-rw-r--r--src/mainboard/digitallogic/msm586seg/devicetree.cb2
-rw-r--r--src/mainboard/digitallogic/msm800sev/devicetree.cb2
-rw-r--r--src/mainboard/eaglelion/5bcm/devicetree.cb2
-rw-r--r--src/mainboard/ecs/p6iwp-fe/devicetree.cb2
-rw-r--r--src/mainboard/emulation/qemu-x86/devicetree.cb2
-rw-r--r--src/mainboard/emulation/qemu-x86/northbridge.c2
-rw-r--r--src/mainboard/getac/p470/devicetree.cb2
-rw-r--r--src/mainboard/gigabyte/ga-6bxc/devicetree.cb2
-rw-r--r--src/mainboard/gigabyte/ga-6bxe/devicetree.cb2
-rw-r--r--src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb2
-rw-r--r--src/mainboard/gigabyte/m57sli/devicetree.cb2
-rw-r--r--src/mainboard/gigabyte/ma785gm/devicetree.cb4
-rw-r--r--src/mainboard/gigabyte/ma785gmt/devicetree.cb4
-rw-r--r--src/mainboard/gigabyte/ma78gm/devicetree.cb4
-rw-r--r--src/mainboard/google/butterfly/devicetree.cb2
-rw-r--r--src/mainboard/google/parrot/devicetree.cb2
-rw-r--r--src/mainboard/hp/dl145_g1/devicetree.cb2
-rw-r--r--src/mainboard/hp/dl145_g3/devicetree.cb4
-rw-r--r--src/mainboard/hp/dl165_g6_fam10/devicetree.cb4
-rw-r--r--src/mainboard/hp/e_vectra_p2706t/devicetree.cb2
-rw-r--r--src/mainboard/ibase/mb899/devicetree.cb2
-rw-r--r--src/mainboard/ibm/e325/devicetree.cb2
-rw-r--r--src/mainboard/ibm/e326/devicetree.cb2
-rw-r--r--src/mainboard/iei/juki-511p/devicetree.cb2
-rw-r--r--src/mainboard/iei/kino-780am2-fam10/devicetree.cb4
-rw-r--r--src/mainboard/iei/nova4899r/devicetree.cb2
-rw-r--r--src/mainboard/iei/pcisa-lx-800-r10/devicetree.cb2
-rw-r--r--src/mainboard/iei/pm-lx-800-r11/devicetree.cb2
-rw-r--r--src/mainboard/iei/pm-lx2-800-r10/devicetree.cb2
-rw-r--r--src/mainboard/intel/d810e2cb/devicetree.cb2
-rw-r--r--src/mainboard/intel/d945gclf/devicetree.cb2
-rw-r--r--src/mainboard/intel/eagleheights/devicetree.cb2
-rw-r--r--src/mainboard/intel/emeraldlake2/devicetree.cb2
-rw-r--r--src/mainboard/intel/jarrell/devicetree.cb2
-rw-r--r--src/mainboard/intel/mtarvon/devicetree.cb2
-rw-r--r--src/mainboard/intel/truxton/devicetree.cb2
-rw-r--r--src/mainboard/intel/xe7501devkit/devicetree.cb4
-rw-r--r--src/mainboard/iwave/iWRainbowG6/devicetree.cb2
-rw-r--r--src/mainboard/iwill/dk8_htx/devicetree.cb4
-rw-r--r--src/mainboard/iwill/dk8s2/devicetree.cb2
-rw-r--r--src/mainboard/iwill/dk8x/devicetree.cb2
-rw-r--r--src/mainboard/jetway/j7f24/devicetree.cb2
-rw-r--r--src/mainboard/jetway/pa78vm5/devicetree.cb4
-rw-r--r--src/mainboard/kontron/986lcd-m/devicetree.cb2
-rw-r--r--src/mainboard/kontron/kt690/devicetree.cb4
-rw-r--r--src/mainboard/lanner/em8510/devicetree.cb2
-rw-r--r--src/mainboard/lenovo/t60/devicetree.cb2
-rw-r--r--src/mainboard/lenovo/x60/devicetree.cb2
-rw-r--r--src/mainboard/lippert/frontrunner/devicetree.cb2
-rw-r--r--src/mainboard/lippert/hurricane-lx/devicetree.cb2
-rw-r--r--src/mainboard/lippert/literunner-lx/devicetree.cb2
-rw-r--r--src/mainboard/lippert/roadrunner-lx/devicetree.cb2
-rw-r--r--src/mainboard/lippert/spacerunner-lx/devicetree.cb2
-rw-r--r--src/mainboard/mitac/6513wu/devicetree.cb2
-rw-r--r--src/mainboard/msi/ms6119/devicetree.cb2
-rw-r--r--src/mainboard/msi/ms6147/devicetree.cb2
-rw-r--r--src/mainboard/msi/ms6156/devicetree.cb2
-rw-r--r--src/mainboard/msi/ms6178/devicetree.cb2
-rw-r--r--src/mainboard/msi/ms7135/devicetree.cb2
-rw-r--r--src/mainboard/msi/ms7260/devicetree.cb2
-rw-r--r--src/mainboard/msi/ms9185/devicetree.cb4
-rw-r--r--src/mainboard/msi/ms9282/devicetree.cb2
-rw-r--r--src/mainboard/msi/ms9652_fam10/devicetree.cb2
-rw-r--r--src/mainboard/nec/powermate2000/devicetree.cb2
-rw-r--r--src/mainboard/newisys/khepri/devicetree.cb2
-rw-r--r--src/mainboard/nokia/ip530/devicetree.cb2
-rw-r--r--src/mainboard/nvidia/l1_2pvv/devicetree.cb2
-rw-r--r--src/mainboard/pcengines/alix1c/devicetree.cb2
-rw-r--r--src/mainboard/pcengines/alix2d/devicetree.cb2
-rw-r--r--src/mainboard/rca/rm4100/devicetree.cb2
-rw-r--r--src/mainboard/roda/rk886ex/devicetree.cb2
-rw-r--r--src/mainboard/roda/rk9/devicetree.cb2
-rw-r--r--src/mainboard/samsung/lumpy/devicetree.cb2
-rw-r--r--src/mainboard/samsung/stumpy/devicetree.cb2
-rw-r--r--src/mainboard/siemens/sitemp_g1p1/devicetree.cb4
-rw-r--r--src/mainboard/soyo/sy-6ba-plus-iii/devicetree.cb2
-rw-r--r--src/mainboard/sunw/ultra40/devicetree.cb2
-rw-r--r--src/mainboard/supermicro/h8dme/devicetree.cb2
-rw-r--r--src/mainboard/supermicro/h8dmr/devicetree.cb2
-rw-r--r--src/mainboard/supermicro/h8dmr_fam10/devicetree.cb2
-rw-r--r--src/mainboard/supermicro/h8qgi/devicetree.cb4
-rw-r--r--src/mainboard/supermicro/h8qme_fam10/devicetree.cb2
-rw-r--r--src/mainboard/supermicro/h8scm/devicetree.cb4
-rw-r--r--src/mainboard/supermicro/h8scm_fam10/devicetree.cb8
-rw-r--r--src/mainboard/supermicro/x6dai_g/devicetree.cb2
-rw-r--r--src/mainboard/supermicro/x6dhe_g/devicetree.cb2
-rw-r--r--src/mainboard/supermicro/x6dhe_g2/devicetree.cb2
-rw-r--r--src/mainboard/supermicro/x6dhr_ig/devicetree.cb2
-rw-r--r--src/mainboard/supermicro/x6dhr_ig2/devicetree.cb2
-rw-r--r--src/mainboard/supermicro/x7db8/devicetree.cb2
-rw-r--r--src/mainboard/technexion/tim5690/devicetree.cb4
-rw-r--r--src/mainboard/technexion/tim8690/devicetree.cb4
-rw-r--r--src/mainboard/technologic/ts5300/devicetree.cb2
-rw-r--r--src/mainboard/televideo/tc7020/devicetree.cb2
-rw-r--r--src/mainboard/thomson/ip1000/devicetree.cb2
-rw-r--r--src/mainboard/traverse/geos/devicetree.cb2
-rw-r--r--src/mainboard/tyan/s1846/devicetree.cb2
-rw-r--r--src/mainboard/tyan/s2735/devicetree.cb4
-rw-r--r--src/mainboard/tyan/s2850/devicetree.cb2
-rw-r--r--src/mainboard/tyan/s2875/devicetree.cb2
-rw-r--r--src/mainboard/tyan/s2880/devicetree.cb2
-rw-r--r--src/mainboard/tyan/s2881/devicetree.cb2
-rw-r--r--src/mainboard/tyan/s2882/devicetree.cb4
-rw-r--r--src/mainboard/tyan/s2885/devicetree.cb4
-rw-r--r--src/mainboard/tyan/s2891/devicetree.cb2
-rw-r--r--src/mainboard/tyan/s2892/devicetree.cb2
-rw-r--r--src/mainboard/tyan/s2895/devicetree.cb2
-rw-r--r--src/mainboard/tyan/s2912/devicetree.cb2
-rw-r--r--src/mainboard/tyan/s2912_fam10/devicetree.cb2
-rw-r--r--src/mainboard/tyan/s4880/devicetree.cb4
-rw-r--r--src/mainboard/tyan/s4882/devicetree.cb2
-rw-r--r--src/mainboard/tyan/s8226/devicetree.cb4
-rw-r--r--src/mainboard/via/epia-cn/devicetree.cb2
-rw-r--r--src/mainboard/via/epia-m/devicetree.cb2
-rw-r--r--src/mainboard/via/epia-m700/devicetree.cb2
-rw-r--r--src/mainboard/via/epia-n/devicetree.cb2
-rw-r--r--src/mainboard/via/epia/devicetree.cb2
-rw-r--r--src/mainboard/via/pc2500e/devicetree.cb2
-rw-r--r--src/mainboard/via/vt8454c/devicetree.cb2
-rw-r--r--src/mainboard/winent/pl6064/devicetree.cb2
-rw-r--r--src/mainboard/wyse/s50/devicetree.cb2
-rw-r--r--src/northbridge/amd/agesa/family10/northbridge.c6
-rw-r--r--src/northbridge/amd/agesa/family12/northbridge.c2
-rw-r--r--src/northbridge/amd/agesa/family14/northbridge.c4
-rw-r--r--src/northbridge/amd/agesa/family15/northbridge.c8
-rw-r--r--src/northbridge/amd/agesa/family15tn/northbridge.c8
-rw-r--r--src/northbridge/amd/amdfam10/northbridge.c6
-rw-r--r--src/northbridge/amd/amdk8/northbridge.c2
-rw-r--r--src/northbridge/amd/gx1/northbridge.c4
-rw-r--r--src/northbridge/amd/gx2/northbridge.c2
-rw-r--r--src/northbridge/amd/lx/northbridge.c2
-rw-r--r--src/northbridge/intel/e7501/northbridge.c2
-rw-r--r--src/northbridge/intel/e7505/northbridge.c2
-rw-r--r--src/northbridge/intel/e7520/northbridge.c2
-rw-r--r--src/northbridge/intel/e7525/northbridge.c2
-rw-r--r--src/northbridge/intel/gm45/northbridge.c2
-rw-r--r--src/northbridge/intel/i3100/northbridge.c2
-rw-r--r--src/northbridge/intel/i440bx/northbridge.c2
-rw-r--r--src/northbridge/intel/i440lx/northbridge.c2
-rw-r--r--src/northbridge/intel/i5000/northbridge.c2
-rw-r--r--src/northbridge/intel/i82810/northbridge.c2
-rw-r--r--src/northbridge/intel/i82830/northbridge.c2
-rw-r--r--src/northbridge/intel/i855/northbridge.c2
-rw-r--r--src/northbridge/intel/i945/northbridge.c2
-rw-r--r--src/northbridge/intel/sandybridge/northbridge.c2
-rw-r--r--src/northbridge/intel/sch/northbridge.c2
-rw-r--r--src/northbridge/rdc/r8610/northbridge.c2
-rw-r--r--src/northbridge/via/cn400/northbridge.c2
-rw-r--r--src/northbridge/via/cn700/northbridge.c2
-rw-r--r--src/northbridge/via/cx700/northbridge.c2
-rw-r--r--src/northbridge/via/vt8601/northbridge.c2
-rw-r--r--src/northbridge/via/vt8623/northbridge.c2
-rw-r--r--src/northbridge/via/vx800/northbridge.c2
-rw-r--r--src/southbridge/nvidia/ck804/pci.c2
-rw-r--r--src/southbridge/nvidia/mcp55/pci.c2
-rw-r--r--util/sconfig/lex.yy.c_shipped172
-rw-r--r--util/sconfig/main.c10
-rwxr-xr-xutil/sconfig/sconfig.l2
-rw-r--r--util/sconfig/sconfig.tab.c_shipped4
-rw-r--r--util/sconfig/sconfig.tab.h_shipped2
-rwxr-xr-xutil/sconfig/sconfig.y2
230 files changed, 400 insertions, 400 deletions
diff --git a/documentation/Kconfig.tex b/documentation/Kconfig.tex
index e8e3f414e..1739c05a9 100644
--- a/documentation/Kconfig.tex
+++ b/documentation/Kconfig.tex
@@ -163,7 +163,7 @@ Note that we do not enumerate all CPUs, even on this SMP mainboard. The reason i
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
BIOSes) that the BSP be CPU 0; any CPU will do.
\begin{verbatim}
- device pci_domain 0 on
+ device domain 0 on
chip northbridge/amd/amdk8
device pci 18.0 on # northbridge
# devices on link 0, link 0 == LDT 0
@@ -338,7 +338,7 @@ That's it for the BSP I/O and HT busses. Now we begin the AP busses. Not much he
\end{verbatim}
\begin{verbatim}
- end #pci_domain
+ end # domain
# chip drivers/generic/debug
# device pnp 0.0 off end # chip name
# device pnp 0.1 on end # pci_regs_all
diff --git a/src/arch/x86/boot/mpspec.c b/src/arch/x86/boot/mpspec.c
index cf346a5d6..5d014343d 100644
--- a/src/arch/x86/boot/mpspec.c
+++ b/src/arch/x86/boot/mpspec.c
@@ -502,7 +502,7 @@ unsigned long __attribute__((weak)) write_smp_table(unsigned long addr)
break;
}
- if (parent->path.type == DEVICE_PATH_PCI_DOMAIN) {
+ if (parent->path.type == DEVICE_PATH_DOMAIN) {
printk(BIOS_WARNING, "no IRQ found for %s\n", dev_path(dev));
break;
}
diff --git a/src/cpu/amd/sc520/sc520.c b/src/cpu/amd/sc520/sc520.c
index 6954f4425..b0824a74a 100644
--- a/src/cpu/amd/sc520/sc520.c
+++ b/src/cpu/amd/sc520/sc520.c
@@ -186,7 +186,7 @@ static void enable_dev(struct device *dev)
{
printk(BIOS_SPEW, "%s\n", __func__);
/* Set the operations if it is a special bus type */
- if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) {
+ if (dev->path.type == DEVICE_PATH_DOMAIN) {
dev->ops = &pci_domain_ops;
pci_set_method(dev);
}
diff --git a/src/device/device.c b/src/device/device.c
index 07bbc7a72..e0c8bf052 100644
--- a/src/device/device.c
+++ b/src/device/device.c
@@ -994,7 +994,7 @@ void dev_configure(void)
/* Compute resources for all domains. */
for (child = root->link_list->children; child; child = child->sibling) {
- if (!(child->path.type == DEVICE_PATH_PCI_DOMAIN))
+ if (!(child->path.type == DEVICE_PATH_DOMAIN))
continue;
for (res = child->resource_list; res; res = res->next) {
if (res->flags & IORESOURCE_FIXED)
@@ -1019,7 +1019,7 @@ void dev_configure(void)
/* For all domains. */
for (child = root->link_list->children; child; child=child->sibling)
- if (child->path.type == DEVICE_PATH_PCI_DOMAIN)
+ if (child->path.type == DEVICE_PATH_DOMAIN)
avoid_fixed_resources(child);
/*
@@ -1027,7 +1027,7 @@ void dev_configure(void)
* the highest address managable.
*/
for (child = root->link_list->children; child; child = child->sibling) {
- if (child->path.type != DEVICE_PATH_PCI_DOMAIN)
+ if (child->path.type != DEVICE_PATH_DOMAIN)
continue;
for (res = child->resource_list; res; res = res->next) {
if (!(res->flags & IORESOURCE_MEM) ||
@@ -1040,7 +1040,7 @@ void dev_configure(void)
/* Store the computed resource allocations into device registers ... */
printk(BIOS_INFO, "Setting resources...\n");
for (child = root->link_list->children; child; child = child->sibling) {
- if (!(child->path.type == DEVICE_PATH_PCI_DOMAIN))
+ if (!(child->path.type == DEVICE_PATH_DOMAIN))
continue;
for (res = child->resource_list; res; res = res->next) {
if (res->flags & IORESOURCE_FIXED)
diff --git a/src/device/device_util.c b/src/device/device_util.c
index 224c58ee6..60f555af3 100644
--- a/src/device/device_util.c
+++ b/src/device/device_util.c
@@ -205,9 +205,9 @@ const char *dev_path(device_t dev)
sprintf(buffer, "IOAPIC: %02x",
dev->path.ioapic.ioapic_id);
break;
- case DEVICE_PATH_PCI_DOMAIN:
- sprintf(buffer, "PCI_DOMAIN: %04x",
- dev->path.pci_domain.domain);
+ case DEVICE_PATH_DOMAIN:
+ sprintf(buffer, "DOMAIN: %04x",
+ dev->path.domain.domain);
break;
case DEVICE_PATH_APIC_CLUSTER:
sprintf(buffer, "APIC_CLUSTER: %01x",
@@ -271,8 +271,8 @@ int path_eq(struct device_path *path1, struct device_path *path2)
case DEVICE_PATH_APIC:
equal = (path1->apic.apic_id == path2->apic.apic_id);
break;
- case DEVICE_PATH_PCI_DOMAIN:
- equal = (path1->pci_domain.domain == path2->pci_domain.domain);
+ case DEVICE_PATH_DOMAIN:
+ equal = (path1->domain.domain == path2->domain.domain);
break;
case DEVICE_PATH_APIC_CLUSTER:
equal = (path1->apic_cluster.cluster
diff --git a/src/include/device/path.h b/src/include/device/path.h
index 16ad8f908..c59b49ed2 100644
--- a/src/include/device/path.h
+++ b/src/include/device/path.h
@@ -8,14 +8,14 @@ enum device_path_type {
DEVICE_PATH_PNP,
DEVICE_PATH_I2C,
DEVICE_PATH_APIC,
- DEVICE_PATH_PCI_DOMAIN,
+ DEVICE_PATH_DOMAIN,
DEVICE_PATH_APIC_CLUSTER,
DEVICE_PATH_CPU,
DEVICE_PATH_CPU_BUS,
DEVICE_PATH_IOAPIC,
};
-struct pci_domain_path
+struct domain_path
{
unsigned domain;
};
@@ -74,7 +74,7 @@ struct device_path {
struct i2c_path i2c;
struct apic_path apic;
struct ioapic_path ioapic;
- struct pci_domain_path pci_domain;
+ struct domain_path domain;
struct apic_cluster_path apic_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 4ab61c4eb..3e83186e7 100644
--- a/src/mainboard/a-trend/atc-6220/devicetree.cb
+++ b/src/mainboard/a-trend/atc-6220/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/intel/i440bx # Northbridge
device lapic 0 on end # APIC
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
device pci 0.0 on end # Host bridge
device pci 1.0 on end # PCI/AGP bridge
chip southbridge/intel/i82371eb # Southbridge
diff --git a/src/mainboard/a-trend/atc-6240/devicetree.cb b/src/mainboard/a-trend/atc-6240/devicetree.cb
index 7a2b9a92a..7625fa6e4 100644
--- a/src/mainboard/a-trend/atc-6240/devicetree.cb
+++ b/src/mainboard/a-trend/atc-6240/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/intel/i440bx # Northbridge
device lapic 0 on end # APIC
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
device pci 0.0 on end # Host bridge
device pci 1.0 on end # PCI/AGP bridge
chip southbridge/intel/i82371eb # Southbridge
diff --git a/src/mainboard/aaeon/pfm-540i_revb/devicetree.cb b/src/mainboard/aaeon/pfm-540i_revb/devicetree.cb
index 3987584d8..9737b010e 100644
--- a/src/mainboard/aaeon/pfm-540i_revb/devicetree.cb
+++ b/src/mainboard/aaeon/pfm-540i_revb/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/amd/lx
- device pci_domain 0 on
+ device domain 0 on
device pci 1.0 on end # Northbridge
device pci 1.1 on end # Graphics
device pci 1.2 on end # AES
diff --git a/src/mainboard/abit/be6-ii_v2_0/devicetree.cb b/src/mainboard/abit/be6-ii_v2_0/devicetree.cb
index 9c7cf56fc..a85a86162 100644
--- a/src/mainboard/abit/be6-ii_v2_0/devicetree.cb
+++ b/src/mainboard/abit/be6-ii_v2_0/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/intel/i440bx # Northbridge
device lapic 0 on end # APIC
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
device pci 0.0 on end # Host bridge
device pci 1.0 on end # PCI/AGP bridge
chip southbridge/intel/i82371eb # Southbridge
diff --git a/src/mainboard/advansus/a785e-i/devicetree.cb b/src/mainboard/advansus/a785e-i/devicetree.cb
index 79df8c90b..a356f7956 100644
--- a/src/mainboard/advansus/a785e-i/devicetree.cb
+++ b/src/mainboard/advansus/a785e-i/devicetree.cb
@@ -5,7 +5,7 @@ chip northbridge/amd/amdfam10/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x1612 0x3060 inherit #TODO: Set the correctly subsystem id.
chip northbridge/amd/amdfam10
device pci 18.0 on # northbridge
@@ -120,5 +120,5 @@ chip northbridge/amd/amdfam10/root_complex
device pci 18.3 on end
device pci 18.4 on end
end
- end #pci_domain
+ end #domain
end
diff --git a/src/mainboard/advantech/pcm-5820/devicetree.cb b/src/mainboard/advantech/pcm-5820/devicetree.cb
index b77fd06b4..8027ee20a 100644
--- a/src/mainboard/advantech/pcm-5820/devicetree.cb
+++ b/src/mainboard/advantech/pcm-5820/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/amd/gx1 # Northbridge
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
device pci 0.0 on end # Host bridge
chip southbridge/amd/cs5530 # Southbridge
device pci 12.0 on # ISA bridge
diff --git a/src/mainboard/amd/bimini_fam10/devicetree.cb b/src/mainboard/amd/bimini_fam10/devicetree.cb
index a5bec74e6..cc624664e 100644
--- a/src/mainboard/amd/bimini_fam10/devicetree.cb
+++ b/src/mainboard/amd/bimini_fam10/devicetree.cb
@@ -5,7 +5,7 @@ chip northbridge/amd/amdfam10/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x1022 0x3060 inherit
chip northbridge/amd/amdfam10
device pci 18.0 on # northbridge
@@ -76,9 +76,9 @@ chip northbridge/amd/amdfam10/root_complex
device pci 18.3 on end
device pci 18.4 on end
end
- end #pci_domain
+ end #domain
#for node 32 to node 63
-# device pci_domain 0 on
+# device domain 0 on
# chip northbridge/amd/amdfam10
# device pci 00.0 on end# northbridge
# device pci 00.0 on end
@@ -90,7 +90,7 @@ chip northbridge/amd/amdfam10/root_complex
# device pci 00.4 on end
# device pci 00.5 on end
# end
-# end #pci_domain
+# end #domain
# chip drivers/generic/debug
# device pnp 0.0 off end # chip name
diff --git a/src/mainboard/amd/db800/devicetree.cb b/src/mainboard/amd/db800/devicetree.cb
index e0f20dc9b..1a1db6d5f 100644
--- a/src/mainboard/amd/db800/devicetree.cb
+++ b/src/mainboard/amd/db800/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/amd/lx
- device pci_domain 0 on
+ device domain 0 on
device pci 1.0 on end # Northbridge
device pci 1.1 on end # Graphics
chip southbridge/amd/cs5536
diff --git a/src/mainboard/amd/dbm690t/devicetree.cb b/src/mainboard/amd/dbm690t/devicetree.cb
index e1b01b2c0..b92a66656 100644
--- a/src/mainboard/amd/dbm690t/devicetree.cb
+++ b/src/mainboard/amd/dbm690t/devicetree.cb
@@ -14,7 +14,7 @@ chip northbridge/amd/amdk8/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x1022 0x3050 inherit
chip northbridge/amd/amdk8
device pci 18.0 on # southbridge
@@ -117,6 +117,6 @@ chip northbridge/amd/amdk8/root_complex
device pci 18.2 on end
device pci 18.3 on end
end #northbridge/amd/amdk8
- end #pci_domain
+ end #domain
end #northbridge/amd/amdk8/root_complex
diff --git a/src/mainboard/amd/dinar/devicetree.cb b/src/mainboard/amd/dinar/devicetree.cb
index 3211a2f8a..9e2c61a6a 100644
--- a/src/mainboard/amd/dinar/devicetree.cb
+++ b/src/mainboard/amd/dinar/devicetree.cb
@@ -23,7 +23,7 @@ chip northbridge/amd/agesa/family15/root_complex
device lapic 0x20 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x1022 0x1705 inherit
chip northbridge/amd/agesa/family15 # CPU side of HT root complex
device pci 18.0 on # Put IO-HUB at link_num 0, Instead of HT Link topology to satisfy both f10 and f15 CPUs
@@ -98,6 +98,6 @@ chip northbridge/amd/agesa/family15/root_complex
device pci 18.4 on end
device pci 18.5 on end
end #chip northbridge/amd/agesa/family15 # CPU side of HT root complex
- end #pci_domain
+ end #domain
end #northbridge/amd/agesa/family15/root_complex
diff --git a/src/mainboard/amd/inagua/devicetree.cb b/src/mainboard/amd/inagua/devicetree.cb
index 100a5cccb..b0d5fcb88 100644
--- a/src/mainboard/amd/inagua/devicetree.cb
+++ b/src/mainboard/amd/inagua/devicetree.cb
@@ -22,7 +22,7 @@ chip northbridge/amd/agesa/family14/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x1022 0x1510 inherit
chip northbridge/amd/agesa/family14 # CPU side of HT root complex
# device pci 18.0 on # northbridge
@@ -88,6 +88,6 @@ chip northbridge/amd/agesa/family14/root_complex
device pci 18.6 on end
device pci 18.7 on end
end #chip northbridge/amd/agesa/family14 # CPU side of HT root complex
- end #pci_domain
+ end #domain
end #northbridge/amd/agesa/family14/root_complex
diff --git a/src/mainboard/amd/mahogany/devicetree.cb b/src/mainboard/amd/mahogany/devicetree.cb
index d60d5a1f4..11f4b3c58 100644
--- a/src/mainboard/amd/mahogany/devicetree.cb
+++ b/src/mainboard/amd/mahogany/devicetree.cb
@@ -14,7 +14,7 @@ chip northbridge/amd/amdk8/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x1022 0x3060 inherit
chip northbridge/amd/amdk8
device pci 18.0 on # southbridge
@@ -117,5 +117,5 @@ chip northbridge/amd/amdk8/root_complex
device pci 18.2 on end
device pci 18.3 on end
end #northbridge/amd/amdk8
- end #pci_domain
+ end #domain
end #northbridge/amd/amdk8/root_complex
diff --git a/src/mainboard/amd/mahogany_fam10/devicetree.cb b/src/mainboard/amd/mahogany_fam10/devicetree.cb
index c51e53e7c..c5cbb1cdd 100644
--- a/src/mainboard/amd/mahogany_fam10/devicetree.cb
+++ b/src/mainboard/amd/mahogany_fam10/devicetree.cb
@@ -5,7 +5,7 @@ chip northbridge/amd/amdfam10/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x1022 0x3060 inherit
chip northbridge/amd/amdfam10
device pci 18.0 on # northbridge
@@ -110,9 +110,9 @@ chip northbridge/amd/amdfam10/root_complex
device pci 18.4 on end
# device pci 00.5 on end
end
- end #pci_domain
+ end #domain
#for node 32 to node 63
-# device pci_domain 0 on
+# device domain 0 on
# chip northbridge/amd/amdfam10
# device pci 00.0 on end# northbridge
# device pci 00.0 on end
@@ -124,7 +124,7 @@ chip northbridge/amd/amdfam10/root_complex
# device pci 00.4 on end
# device pci 00.5 on end
# end
-# end #pci_domain
+# end #domain
# chip drivers/generic/debug
# device pnp 0.0 off end # chip name
diff --git a/src/mainboard/amd/norwich/devicetree.cb b/src/mainboard/amd/norwich/devicetree.cb
index b2ede77ed..6a0299bff 100644
--- a/src/mainboard/amd/norwich/devicetree.cb
+++ b/src/mainboard/amd/norwich/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/amd/lx
- device pci_domain 0 on
+ device domain 0 on
device pci 1.0 on end # Northbridge
device pci 1.1 on end # Graphics
chip southbridge/amd/cs5536
diff --git a/src/mainboard/amd/parmer/devicetree.cb b/src/mainboard/amd/parmer/devicetree.cb
index 9dbdc9882..9942ffe8d 100644
--- a/src/mainboard/amd/parmer/devicetree.cb
+++ b/src/mainboard/amd/parmer/devicetree.cb
@@ -24,7 +24,7 @@ chip northbridge/amd/agesa/family15tn/root_complex
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x1022 0x1410 inherit
chip northbridge/amd/agesa/family15tn # CPU side of HT root complex
@@ -86,5 +86,5 @@ chip northbridge/amd/agesa/family15tn/root_complex
}"
end #chip northbridge/amd/agesa/family15tn # CPU side of HT root complex
- end #pci_domain
+ end #domain
end #chip northbridge/amd/agesa/family15tn/root_complex
diff --git a/src/mainboard/amd/persimmon/devicetree.cb b/src/mainboard/amd/persimmon/devicetree.cb
index 12cb62f88..1eab2f53d 100644
--- a/src/mainboard/amd/persimmon/devicetree.cb
+++ b/src/mainboard/amd/persimmon/devicetree.cb
@@ -22,7 +22,7 @@ chip northbridge/amd/agesa/family14/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x1022 0x1510 inherit
chip northbridge/amd/agesa/family14 # CPU side of HT root complex
# device pci 18.0 on # northbridge
@@ -152,5 +152,5 @@ chip northbridge/amd/agesa/family14/root_complex
device pci 18.6 on end
device pci 18.7 on end
end #chip northbridge/amd/agesa/family14 # CPU side of HT root complex
- end #pci_domain
+ end #domain
end #northbridge/amd/agesa/family14/root_complex
diff --git a/src/mainboard/amd/pistachio/devicetree.cb b/src/mainboard/amd/pistachio/devicetree.cb
index 6608fddeb..4f16ea7e4 100644
--- a/src/mainboard/amd/pistachio/devicetree.cb
+++ b/src/mainboard/amd/pistachio/devicetree.cb
@@ -14,7 +14,7 @@ chip northbridge/amd/amdk8/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x1022 0x3050 inherit
chip northbridge/amd/amdk8
device pci 18.0 on # southbridge, K8 HT Configuration
@@ -76,6 +76,6 @@ chip northbridge/amd/amdk8/root_complex
device pci 18.2 on end # K8 DRAM Controller and HT Trace Mode
device pci 18.3 on end # K8 Miscellaneous Control
end #northbridge/amd/amdk8
- end #pci_domain
+ end #domain
end #northbridge/amd/amdk8/root_complex
diff --git a/src/mainboard/amd/rumba/devicetree.cb b/src/mainboard/amd/rumba/devicetree.cb
index e55f5c77b..db51f654d 100644
--- a/src/mainboard/amd/rumba/devicetree.cb
+++ b/src/mainboard/amd/rumba/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/gx2
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
device pci 1.0 on end
device pci 1.1 on end
chip southbridge/amd/cs5536
diff --git a/src/mainboard/amd/serengeti_cheetah/devicetree.cb b/src/mainboard/amd/serengeti_cheetah/devicetree.cb
index b819292d5..ac0e00e77 100644
--- a/src/mainboard/amd/serengeti_cheetah/devicetree.cb
+++ b/src/mainboard/amd/serengeti_cheetah/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdk8/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x1022 0x2b80 inherit
chip northbridge/amd/amdk8
device pci 18.0 on # northbridge
@@ -143,7 +143,7 @@ chip northbridge/amd/amdk8/root_complex
end
- end #pci_domain
+ end #domain
# chip drivers/generic/debug
# device pnp 0.0 off end # chip name
# device pnp 0.1 on end # pci_regs_all
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/devicetree.cb b/src/mainboard/amd/serengeti_cheetah_fam10/devicetree.cb
index bfbb2b309..40805c6d0 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/devicetree.cb
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdfam10/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x1022 0x2b80 inherit
chip northbridge/amd/amdfam10
device pci 18.0 on # northbridge
@@ -118,9 +118,9 @@ chip northbridge/amd/amdfam10/root_complex
device pci 18.4 on end
# device pci 00.5 on end
end
- end #pci_domain
+ end #domain
#for node 32 to node 63
-# device pci_domain 0 on
+# device domain 0 on
# chip northbridge/amd/amdfam10
# device pci 00.0 on end# northbridge
# device pci 00.0 on end
@@ -132,7 +132,7 @@ chip northbridge/amd/amdfam10/root_complex
# device pci 00.4 on end
# device pci 00.5 on end
# end
-# end #pci_domain
+# end #domain
# chip drivers/generic/debug
# device pnp 0.0 off end # chip name
diff --git a/src/mainboard/amd/south_station/devicetree.cb b/src/mainboard/amd/south_station/devicetree.cb
index f0b471a92..be6f52e62 100644
--- a/src/mainboard/amd/south_station/devicetree.cb
+++ b/src/mainboard/amd/south_station/devicetree.cb
@@ -22,7 +22,7 @@ chip northbridge/amd/agesa/family14/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x1022 0x1510 inherit
chip northbridge/amd/agesa/family14 # CPU side of HT root complex
# device pci 18.0 on # northbridge
@@ -100,6 +100,6 @@ chip northbridge/amd/agesa/family14/root_complex
device pci 18.4 on end
device pci 18.5 on end
end #chip northbridge/amd/agesa/family14 # CPU side of HT root complex
- end #pci_domain
+ end #domain
end #northbridge/amd/agesa/family14/root_complex
diff --git a/src/mainboard/amd/thatcher/devicetree.cb b/src/mainboard/amd/thatcher/devicetree.cb
index ccb8b5821..e468ccedb 100644
--- a/src/mainboard/amd/thatcher/devicetree.cb
+++ b/src/mainboard/amd/thatcher/devicetree.cb
@@ -24,7 +24,7 @@ chip northbridge/amd/agesa/family15tn/root_complex
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x1022 0x1410 inherit
chip northbridge/amd/agesa/family15tn # CPU side of HT root complex
@@ -101,5 +101,5 @@ chip northbridge/amd/agesa/family15tn/root_complex
}"
end #chip northbridge/amd/agesa/family15tn # CPU side of HT root complex
- end #pci_domain
+ end #domain
end #chip northbridge/amd/agesa/family15tn/root_complex
diff --git a/src/mainboard/amd/tilapia_fam10/devicetree.cb b/src/mainboard/amd/tilapia_fam10/devicetree.cb
index aeb582a67..ae25336b7 100644
--- a/src/mainboard/amd/tilapia_fam10/devicetree.cb
+++ b/src/mainboard/amd/tilapia_fam10/devicetree.cb
@@ -5,7 +5,7 @@ chip northbridge/amd/amdfam10/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x1022 0x3060 inherit
chip northbridge/amd/amdfam10
device pci 18.0 on # northbridge
@@ -111,9 +111,9 @@ chip northbridge/amd/amdfam10/root_complex
device pci 18.4 on end
# device pci 00.5 on end
end
- end #pci_domain
+ end #domain
#for node 32 to node 63
-# device pci_domain 0 on
+# device domain 0 on
# chip northbridge/amd/amdfam10
# device pci 00.0 on end# northbridge
# device pci 00.0 on end
@@ -125,7 +125,7 @@ chip northbridge/amd/amdfam10/root_complex
# device pci 00.4 on end
# device pci 00.5 on end
# end
-# end #pci_domain
+# end #domain
# chip drivers/generic/debug
# device pnp 0.0 off end # chip name
diff --git a/src/mainboard/amd/torpedo/devicetree.cb b/src/mainboard/amd/torpedo/devicetree.cb
index 2b6d896b4..bd4f49b0f 100755
--- a/src/mainboard/amd/torpedo/devicetree.cb
+++ b/src/mainboard/amd/torpedo/devicetree.cb
@@ -22,7 +22,7 @@ chip northbridge/amd/agesa/family12/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x1022 0x1705 inherit
chip northbridge/amd/agesa/family12 # CPU side of HT root complex
chip northbridge/amd/agesa/family12 # PCI side of HT root complex
@@ -85,6 +85,6 @@ chip northbridge/amd/agesa/family12/root_complex
device pci 18.6 on end
device pci 18.7 on end
end #chip northbridge/amd/agesa/family12 # CPU side of HT root complex
- end #pci_domain
+ end #domain
end #northbridge/amd/agesa/family12/root_complex
diff --git a/src/mainboard/amd/union_station/devicetree.cb b/src/mainboard/amd/union_station/devicetree.cb
index 857bc0283..4f08cfb05 100644
--- a/src/mainboard/amd/union_station/devicetree.cb
+++ b/src/mainboard/amd/union_station/devicetree.cb
@@ -22,7 +22,7 @@ chip northbridge/amd/agesa/family14/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x1022 0x1510 inherit
chip northbridge/amd/agesa/family14 # CPU side of HT root complex
# device pci 18.0 on # northbridge
@@ -76,6 +76,6 @@ chip northbridge/amd/agesa/family14/root_complex
device pci 18.4 on end
device pci 18.5 on end
end #chip northbridge/amd/agesa/family14 # CPU side of HT root complex
- end #pci_domain
+ end #domain
end #northbridge/amd/agesa/family14/root_complex
diff --git a/src/mainboard/aopen/dxplplusu/devicetree.cb b/src/mainboard/aopen/dxplplusu/devicetree.cb
index 94a38d7f4..54614622b 100644
--- a/src/mainboard/aopen/dxplplusu/devicetree.cb
+++ b/src/mainboard/aopen/dxplplusu/devicetree.cb
@@ -28,7 +28,7 @@ chip northbridge/intel/e7505
end
end
- device pci_domain 0 on
+ device domain 0 on
device pci 0.0 on end # Chipset host controller
device pci 0.1 on end # Host RASUM controller
device pci 2.0 on # Hub interface B
@@ -86,5 +86,5 @@ chip northbridge/intel/e7505
device pci 1f.5 on end # AC97 Audio
device pci 1f.6 off end # AC97 Modem
end # SB
- end # PCI_DOMAIN
+ end # PCI domain
end
diff --git a/src/mainboard/arima/hdama/devicetree.cb b/src/mainboard/arima/hdama/devicetree.cb
index d7252e226..fbf29c566 100644
--- a/src/mainboard/arima/hdama/devicetree.cb
+++ b/src/mainboard/arima/hdama/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdk8/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x161f 0x3016 inherit
chip northbridge/amd/amdk8
device pci 18.0 on # northbridge
diff --git a/src/mainboard/artecgroup/dbe61/devicetree.cb b/src/mainboard/artecgroup/dbe61/devicetree.cb
index c8110d16c..2f1f80233 100644
--- a/src/mainboard/artecgroup/dbe61/devicetree.cb
+++ b/src/mainboard/artecgroup/dbe61/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/amd/lx
- device pci_domain 0 on
+ device domain 0 on
device pci 1.0 on end # Northbridge
device pci 1.1 on end # Graphics
chip southbridge/amd/cs5536
diff --git a/src/mainboard/asi/mb_5blgp/devicetree.cb b/src/mainboard/asi/mb_5blgp/devicetree.cb
index 3ad1acb61..d84bf0e04 100644
--- a/src/mainboard/asi/mb_5blgp/devicetree.cb
+++ b/src/mainboard/asi/mb_5blgp/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/amd/gx1 # Northbridge
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
device pci 0.0 on end # Host bridge
chip southbridge/amd/cs5530 # Southbridge
device pci 0f.0 on end # Ethernet
diff --git a/src/mainboard/asi/mb_5blmp/devicetree.cb b/src/mainboard/asi/mb_5blmp/devicetree.cb
index e3e0d9571..e8e6ac3ca 100644
--- a/src/mainboard/asi/mb_5blmp/devicetree.cb
+++ b/src/mainboard/asi/mb_5blmp/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/amd/gx1 # Northbridge
- device pci_domain 0 on
+ device domain 0 on
device pci 0.0 on end # Host bridge
chip southbridge/amd/cs5530 # Southbridge
device pci 0f.0 off end # Ethernet (Realtek RTL8139B)
diff --git a/src/mainboard/asrock/939a785gmh/devicetree.cb b/src/mainboard/asrock/939a785gmh/devicetree.cb
index 1dc92a331..5f81d8300 100644
--- a/src/mainboard/asrock/939a785gmh/devicetree.cb
+++ b/src/mainboard/asrock/939a785gmh/devicetree.cb
@@ -15,7 +15,7 @@ chip northbridge/amd/amdk8/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x1022 0x3060 inherit
chip northbridge/amd/amdk8
device pci 18.0 on # southbridge
@@ -127,6 +127,6 @@ chip northbridge/amd/amdk8/root_complex
device pci 18.2 on end
device pci 18.3 on end
end #northbridge/amd/amdk8
- end #pci_domain
+ end #domain
end #northbridge/amd/amdk8/root_complex
diff --git a/src/mainboard/asrock/e350m1/devicetree.cb b/src/mainboard/asrock/e350m1/devicetree.cb
index a4bdc65fd..1fed8ac7f 100644
--- a/src/mainboard/asrock/e350m1/devicetree.cb
+++ b/src/mainboard/asrock/e350m1/devicetree.cb
@@ -22,7 +22,7 @@ chip northbridge/amd/agesa/family14/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x1022 0x1510 inherit
chip northbridge/amd/agesa/family14 # CPU side of HT root complex
# device pci 18.0 on # northbridge
@@ -128,6 +128,6 @@ chip northbridge/amd/agesa/family14/root_complex
device pci 18.6 on end
device pci 18.7 on end
end #chip northbridge/amd/agesa/family14 # CPU side of HT root complex
- end #pci_domain
+ end #domain
end #northbridge/amd/agesa/family14/root_complex
diff --git a/src/mainboard/asus/a8n_e/devicetree.cb b/src/mainboard/asus/a8n_e/devicetree.cb
index 86bf3aa2e..dbb27dc51 100644
--- a/src/mainboard/asus/a8n_e/devicetree.cb
+++ b/src/mainboard/asus/a8n_e/devicetree.cb
@@ -5,7 +5,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
subsystemid 0x1043 0x815a inherit
chip northbridge/amd/amdk8 # Northbridge / RAM controller
device pci 18.0 on # Link 0 == LDT 0
diff --git a/src/mainboard/asus/a8v-e_deluxe/devicetree.cb b/src/mainboard/asus/a8v-e_deluxe/devicetree.cb
index 31df8fa3c..b77601dd5 100644
--- a/src/mainboard/asus/a8v-e_deluxe/devicetree.cb
+++ b/src/mainboard/asus/a8v-e_deluxe/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex
device lapic 0 on end # APIC
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
subsystemid 1043 0 inherit
chip northbridge/amd/amdk8 # mc0
device pci 18.0 on # Northbridge
diff --git a/src/mainboard/asus/a8v-e_se/devicetree.cb b/src/mainboard/asus/a8v-e_se/devicetree.cb
index 3da93fedf..5ace9ea41 100644
--- a/src/mainboard/asus/a8v-e_se/devicetree.cb
+++ b/src/mainboard/asus/a8v-e_se/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex
device lapic 0 on end # APIC
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
subsystemid 0x1043 0 inherit
chip northbridge/amd/amdk8 # mc0
device pci 18.0 on # Northbridge
diff --git a/src/mainboard/asus/dsbf/devicetree.cb b/src/mainboard/asus/dsbf/devicetree.cb
index b18fdaf30..958ab9352 100644
--- a/src/mainboard/asus/dsbf/devicetree.cb
+++ b/src/mainboard/asus/dsbf/devicetree.cb
@@ -28,7 +28,7 @@ chip northbridge/intel/i5000
end
end
- device pci_domain 0 on
+ device domain 0 on
device pci 00.0 on # Host bridge
subsystemid 0x1043 0x81db
end
diff --git a/src/mainboard/asus/k8v-x/devicetree.cb b/src/mainboard/asus/k8v-x/devicetree.cb
index 61c5a2dfc..74c96bad1 100644
--- a/src/mainboard/asus/k8v-x/devicetree.cb
+++ b/src/mainboard/asus/k8v-x/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex
device lapic 0 on end # APIC
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
subsystemid 0x1043 0 inherit
chip northbridge/amd/amdk8 # mc0
device pci 18.0 on # Northbridge
diff --git a/src/mainboard/asus/m2n-e/devicetree.cb b/src/mainboard/asus/m2n-e/devicetree.cb
index bf4de2585..2d920177a 100644
--- a/src/mainboard/asus/m2n-e/devicetree.cb
+++ b/src/mainboard/asus/m2n-e/devicetree.cb
@@ -24,7 +24,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex
device lapic 0 on end # Local APIC of the CPU
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
subsystemid 0x1043 0x8239 inherit
chip northbridge/amd/amdk8 # Northbridge / RAM controller
device pci 18.0 on # Link 0 == LDT 0
diff --git a/src/mainboard/asus/m2v-mx_se/devicetree.cb b/src/mainboard/asus/m2v-mx_se/devicetree.cb
index 7e4c6d107..d3b5c1b50 100644
--- a/src/mainboard/asus/m2v-mx_se/devicetree.cb
+++ b/src/mainboard/asus/m2v-mx_se/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex
device lapic 0 on end # APIC
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
subsystemid 0x1043 0 inherit
chip northbridge/amd/amdk8 # mc0
device pci 18.0 on # Northbridge
diff --git a/src/mainboard/asus/m2v/devicetree.cb b/src/mainboard/asus/m2v/devicetree.cb
index 376dbf1d9..3e52394cb 100644
--- a/src/mainboard/asus/m2v/devicetree.cb
+++ b/src/mainboard/asus/m2v/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex
device lapic 0 on end # APIC
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
subsystemid 0x1043 0 inherit
chip northbridge/amd/amdk8 # mc0
device pci 18.0 on # Northbridge
diff --git a/src/mainboard/asus/m4a78-em/devicetree.cb b/src/mainboard/asus/m4a78-em/devicetree.cb
index c463d7174..bbf4b3d76 100644
--- a/src/mainboard/asus/m4a78-em/devicetree.cb
+++ b/src/mainboard/asus/m4a78-em/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdfam10/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x1043 0x83f1 inherit
chip northbridge/amd/amdfam10
device pci 18.0 on # northbridge
@@ -102,5 +102,5 @@ chip northbridge/amd/amdfam10/root_complex
device pci 18.3 on end
device pci 18.4 on end
end # chip northbridge
- end #pci_domain
+ end #domain
end # northbridge/amd/amdfam10/root_complex
diff --git a/src/mainboard/asus/m4a785-m/devicetree.cb b/src/mainboard/asus/m4a785-m/devicetree.cb
index e8764b1eb..e6bd174f6 100644
--- a/src/mainboard/asus/m4a785-m/devicetree.cb
+++ b/src/mainboard/asus/m4a785-m/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdfam10/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x1043 0x83a2 inherit
chip northbridge/amd/amdfam10
device pci 18.0 on # northbridge
@@ -102,5 +102,5 @@ chip northbridge/amd/amdfam10/root_complex
device pci 18.3 on end
device pci 18.4 on end
end # chip northbridge
- end #pci_domain
+ end #domain
end # northbridge/amd/amdfam10/root_complex
diff --git a/src/mainboard/asus/m4a785t-m/devicetree.cb b/src/mainboard/asus/m4a785t-m/devicetree.cb
index 0299fc258..2817b63a8 100644
--- a/src/mainboard/asus/m4a785t-m/devicetree.cb
+++ b/src/mainboard/asus/m4a785t-m/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdfam10/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x1043 0x83a2 inherit
chip northbridge/amd/amdfam10
device pci 18.0 on # northbridge
@@ -104,5 +104,5 @@ chip northbridge/amd/amdfam10/root_complex
device pci 18.3 on end
device pci 18.4 on end
end # chip northbridge
- end #pci_domain
+ end #domain
end # northbridge/amd/amdfam10/root_complex
diff --git a/src/mainboard/asus/m5a88-v/devicetree.cb b/src/mainboard/asus/m5a88-v/devicetree.cb
index 5270c28b9..1590b9fe4 100644
--- a/src/mainboard/asus/m5a88-v/devicetree.cb
+++ b/src/mainboard/asus/m5a88-v/devicetree.cb
@@ -5,7 +5,7 @@ chip northbridge/amd/amdfam10/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x1043 0x843e inherit #TODO: Set the correctly subsystem id.
chip northbridge/amd/amdfam10
device pci 18.0 on # northbridge
@@ -120,5 +120,5 @@ chip northbridge/amd/amdfam10/root_complex
device pci 18.3 on end
device pci 18.4 on end
end
- end #pci_domain
+ end #domain
end
diff --git a/src/mainboard/asus/mew-am/devicetree.cb b/src/mainboard/asus/mew-am/devicetree.cb
index a4b80e1bb..cf04dc161 100644
--- a/src/mainboard/asus/mew-am/devicetree.cb
+++ b/src/mainboard/asus/mew-am/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/intel/i82810 # Northbridge
device lapic 0 on end # APIC
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
device pci 0.0 on end # Graphics Memory Controller Hub (GMCH)
device pci 1.0 on end # Chipset Graphics Controller (CGC)
chip southbridge/intel/i82801ax # Southbridge
diff --git a/src/mainboard/asus/mew-vm/devicetree.cb b/src/mainboard/asus/mew-vm/devicetree.cb
index 29d706c62..e0cc9e39e 100644
--- a/src/mainboard/asus/mew-vm/devicetree.cb
+++ b/src/mainboard/asus/mew-vm/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/intel/i82810
- device pci_domain 0 on
+ device domain 0 on
device pci 0.0 on end # Host bridge
device pci 1.0 on # Onboard Video
# device pci 1.0 on end
diff --git a/src/mainboard/asus/p2b-d/devicetree.cb b/src/mainboard/asus/p2b-d/devicetree.cb
index 64219b76f..fb50362ec 100644
--- a/src/mainboard/asus/p2b-d/devicetree.cb
+++ b/src/mainboard/asus/p2b-d/devicetree.cb
@@ -7,7 +7,7 @@ chip northbridge/intel/i440bx # Northbridge
device lapic 1 on end # Local APIC of CPU 1
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
device pci 0.0 on end # Host bridge
device pci 1.0 on end # PCI/AGP bridge
chip southbridge/intel/i82371eb # Southbridge
diff --git a/src/mainboard/asus/p2b-ds/devicetree.cb b/src/mainboard/asus/p2b-ds/devicetree.cb
index 8a00f57f7..b7310dd1f 100644
--- a/src/mainboard/asus/p2b-ds/devicetree.cb
+++ b/src/mainboard/asus/p2b-ds/devicetree.cb
@@ -7,7 +7,7 @@ chip northbridge/intel/i440bx # Northbridge
device lapic 1 on end # Local APIC of CPU 1
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
device pci 0.0 on end # Host bridge
device pci 1.0 on end # PCI/AGP bridge
chip southbridge/intel/i82371eb # Southbridge
diff --git a/src/mainboard/asus/p2b-f/devicetree.cb b/src/mainboard/asus/p2b-f/devicetree.cb
index 6fae008c6..f88a8f896 100644
--- a/src/mainboard/asus/p2b-f/devicetree.cb
+++ b/src/mainboard/asus/p2b-f/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/intel/i440bx # Northbridge
device lapic 0 on end # APIC
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
device pci 0.0 on end # Host bridge
device pci 1.0 on end # PCI/AGP bridge
chip southbridge/intel/i82371eb # Southbridge
diff --git a/src/mainboard/asus/p2b-ls/devicetree.cb b/src/mainboard/asus/p2b-ls/devicetree.cb
index cc8281b2c..39f4246b0 100644
--- a/src/mainboard/asus/p2b-ls/devicetree.cb
+++ b/src/mainboard/asus/p2b-ls/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/intel/i440bx # Northbridge
device lapic 0 on end # APIC
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
device pci 0.0 on end # Host bridge
device pci 1.0 on end # PCI/AGP bridge
chip southbridge/intel/i82371eb # Southbridge
diff --git a/src/mainboard/asus/p2b/devicetree.cb b/src/mainboard/asus/p2b/devicetree.cb
index f4bfbad87..0feb7e45c 100644
--- a/src/mainboard/asus/p2b/devicetree.cb
+++ b/src/mainboard/asus/p2b/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/intel/i440bx # Northbridge
device lapic 0 on end # APIC
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
device pci 0.0 on end # Host bridge
device pci 1.0 on end # PCI/AGP bridge
chip southbridge/intel/i82371eb # Southbridge
diff --git a/src/mainboard/asus/p3b-f/devicetree.cb b/src/mainboard/asus/p3b-f/devicetree.cb
index 6fae008c6..f88a8f896 100644
--- a/src/mainboard/asus/p3b-f/devicetree.cb
+++ b/src/mainboard/asus/p3b-f/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/intel/i440bx # Northbridge
device lapic 0 on end # APIC
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
device pci 0.0 on end # Host bridge
device pci 1.0 on end # PCI/AGP bridge
chip southbridge/intel/i82371eb # Southbridge
diff --git a/src/mainboard/avalue/eax-785e/devicetree.cb b/src/mainboard/avalue/eax-785e/devicetree.cb
index bf58f9099..a2ac9f4c8 100644
--- a/src/mainboard/avalue/eax-785e/devicetree.cb
+++ b/src/mainboard/avalue/eax-785e/devicetree.cb
@@ -5,7 +5,7 @@ chip northbridge/amd/amdfam10/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x1612 0x3060 inherit #TODO: Set the correctly subsystem id.
chip northbridge/amd/amdfam10
device pci 18.0 on # northbridge
@@ -107,5 +107,5 @@ chip northbridge/amd/amdfam10/root_complex
device pci 18.3 on end
device pci 18.4 on end
end
- end #pci_domain
+ end #domain
end
diff --git a/src/mainboard/axus/tc320/devicetree.cb b/src/mainboard/axus/tc320/devicetree.cb
index 3c17690d2..970f71fb1 100644
--- a/src/mainboard/axus/tc320/devicetree.cb
+++ b/src/mainboard/axus/tc320/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/amd/gx1 # Northbridge
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
device pci 0.0 on end # Host bridge
chip southbridge/amd/cs5530 # Southbridge
device pci 12.0 on # ISA bridge
diff --git a/src/mainboard/azza/pt-6ibd/devicetree.cb b/src/mainboard/azza/pt-6ibd/devicetree.cb
index 2448601c6..ce51b040b 100644
--- a/src/mainboard/azza/pt-6ibd/devicetree.cb
+++ b/src/mainboard/azza/pt-6ibd/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/intel/i440bx # Northbridge
device lapic 0 on end # APIC
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
device pci 0.0 on end # Host bridge
device pci 1.0 on end # PCI/AGP bridge
chip southbridge/intel/i82371eb # Southbridge
diff --git a/src/mainboard/bachmann/ot200/devicetree.cb b/src/mainboard/bachmann/ot200/devicetree.cb
index 4a065cbd3..a49f267e5 100644
--- a/src/mainboard/bachmann/ot200/devicetree.cb
+++ b/src/mainboard/bachmann/ot200/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/amd/lx
- device pci_domain 0 on
+ device domain 0 on
device pci 1.0 on end # Northbridge
device pci 1.1 on end # Graphics
device pci 1.2 on end # AES
diff --git a/src/mainboard/bcom/winnet100/devicetree.cb b/src/mainboard/bcom/winnet100/devicetree.cb
index 20c117e70..61a71e621 100644
--- a/src/mainboard/bcom/winnet100/devicetree.cb
+++ b/src/mainboard/bcom/winnet100/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/amd/gx1 # Northbridge
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
device pci 0.0 on end # Host bridge
chip southbridge/amd/cs5530 # Southbridge
device pci 0f.0 on end # Ethernet (onboard)
diff --git a/src/mainboard/bcom/winnetp680/devicetree.cb b/src/mainboard/bcom/winnetp680/devicetree.cb
index 3e31223e5..c324872dd 100644
--- a/src/mainboard/bcom/winnetp680/devicetree.cb
+++ b/src/mainboard/bcom/winnetp680/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/via/cn700 # Northbridge
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
device pci 0.0 on end # AGP Bridge
device pci 0.1 on end # Error Reporting
device pci 0.2 on end # Host Bus Control
diff --git a/src/mainboard/bifferos/bifferboard/devicetree.cb b/src/mainboard/bifferos/bifferboard/devicetree.cb
index 757ddd52c..09dde3351 100644
--- a/src/mainboard/bifferos/bifferboard/devicetree.cb
+++ b/src/mainboard/bifferos/bifferboard/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/rdc/r8610
- device pci_domain 0 on
+ device domain 0 on
device pci 0.0 on end
chip southbridge/rdc/r8610 # Southbridge
device pci 7.0 on end # SB
diff --git a/src/mainboard/biostar/m6tba/devicetree.cb b/src/mainboard/biostar/m6tba/devicetree.cb
index faeb73af2..c92f8a605 100644
--- a/src/mainboard/biostar/m6tba/devicetree.cb
+++ b/src/mainboard/biostar/m6tba/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/intel/i440bx # Northbridge
device lapic 0 on end # APIC
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
device pci 0.0 on end # Host bridge
device pci 1.0 on end # PCI/AGP bridge
chip southbridge/intel/i82371eb # Southbridge
diff --git a/src/mainboard/broadcom/blast/devicetree.cb b/src/mainboard/broadcom/blast/devicetree.cb
index 6779a7a15..5ad7cbf6c 100644
--- a/src/mainboard/broadcom/blast/devicetree.cb
+++ b/src/mainboard/broadcom/blast/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdk8/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x161f 0x3050 inherit
chip northbridge/amd/amdk8
device pci 18.0 on # northbridge
@@ -118,7 +118,7 @@ chip northbridge/amd/amdk8/root_complex
end
- end #pci_domain
+ end #domain
# chip drivers/generic/debug
# device pnp 0.0 off end # chip name
# device pnp 0.1 on end # pci_regs_all
diff --git a/src/mainboard/compaq/deskpro_en_sff_p600/devicetree.cb b/src/mainboard/compaq/deskpro_en_sff_p600/devicetree.cb
index a7451264a..4ddedfa4a 100644
--- a/src/mainboard/compaq/deskpro_en_sff_p600/devicetree.cb
+++ b/src/mainboard/compaq/deskpro_en_sff_p600/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/intel/i440bx # Northbridge
device lapic 0 on end # APIC
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
device pci 0.0 on end # Host bridge
device pci 1.0 on end # PCI/AGP bridge
device pci a.0 on end # NIC (onboard)
diff --git a/src/mainboard/digitallogic/adl855pc/devicetree.cb b/src/mainboard/digitallogic/adl855pc/devicetree.cb
index c514aca3b..9eeb95f92 100644
--- a/src/mainboard/digitallogic/adl855pc/devicetree.cb
+++ b/src/mainboard/digitallogic/adl855pc/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/intel/i855
- device pci_domain 0 on
+ device domain 0 on
device pci 0.0 on end
device pci 1.0 on end
chip southbridge/intel/i82801dx
diff --git a/src/mainboard/digitallogic/msm586seg/devicetree.cb b/src/mainboard/digitallogic/msm586seg/devicetree.cb
index 9579b1166..e43ebff94 100644
--- a/src/mainboard/digitallogic/msm586seg/devicetree.cb
+++ b/src/mainboard/digitallogic/msm586seg/devicetree.cb
@@ -1,5 +1,5 @@
chip cpu/amd/sc520
- device pci_domain 0 on
+ device domain 0 on
device pci 0.0 on end
device pci 12.0 on end # enet
device pci 14.0 on end # 69000
diff --git a/src/mainboard/digitallogic/msm800sev/devicetree.cb b/src/mainboard/digitallogic/msm800sev/devicetree.cb
index e00b36f99..77dfbd0aa 100644
--- a/src/mainboard/digitallogic/msm800sev/devicetree.cb
+++ b/src/mainboard/digitallogic/msm800sev/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/amd/lx
- device pci_domain 0 on
+ device domain 0 on
device pci 1.0 on end
device pci 1.1 on end
chip southbridge/amd/cs5536
diff --git a/src/mainboard/eaglelion/5bcm/devicetree.cb b/src/mainboard/eaglelion/5bcm/devicetree.cb
index 94e8fab6c..33f1f905d 100644
--- a/src/mainboard/eaglelion/5bcm/devicetree.cb
+++ b/src/mainboard/eaglelion/5bcm/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/amd/gx1
- device pci_domain 0 on
+ device domain 0 on
device pci 0.0 on end
chip southbridge/amd/cs5530
device pci 12.0 on
diff --git a/src/mainboard/ecs/p6iwp-fe/devicetree.cb b/src/mainboard/ecs/p6iwp-fe/devicetree.cb
index d2b824987..180a2c98c 100644
--- a/src/mainboard/ecs/p6iwp-fe/devicetree.cb
+++ b/src/mainboard/ecs/p6iwp-fe/devicetree.cb
@@ -24,7 +24,7 @@ chip northbridge/intel/i82810 # Northbridge
device lapic 0 on end # APIC
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
device pci 0.0 on end # Graphics Memory Controller Hub (GMCH)
device pci 1.0 on end # Chipset Graphics Controller (CGC)
chip southbridge/intel/i82801ax # Southbridge
diff --git a/src/mainboard/emulation/qemu-x86/devicetree.cb b/src/mainboard/emulation/qemu-x86/devicetree.cb
index 50f4b1191..ed64eefc3 100644
--- a/src/mainboard/emulation/qemu-x86/devicetree.cb
+++ b/src/mainboard/emulation/qemu-x86/devicetree.cb
@@ -1,5 +1,5 @@
chip mainboard/emulation/qemu-x86
- device pci_domain 0 on
+ device domain 0 on
device pci 0.0 on end
chip southbridge/intel/i82371eb # southbridge
diff --git a/src/mainboard/emulation/qemu-x86/northbridge.c b/src/mainboard/emulation/qemu-x86/northbridge.c
index 6d73585cf..7c36c0a46 100644
--- a/src/mainboard/emulation/qemu-x86/northbridge.c
+++ b/src/mainboard/emulation/qemu-x86/northbridge.c
@@ -138,7 +138,7 @@ static struct device_operations pci_domain_ops = {
static void enable_dev(struct device *dev)
{
/* Set the operations if it is a special bus type */
- if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) {
+ if (dev->path.type == DEVICE_PATH_DOMAIN) {
dev->ops = &pci_domain_ops;
pci_set_method(dev);
}
diff --git a/src/mainboard/getac/p470/devicetree.cb b/src/mainboard/getac/p470/devicetree.cb
index bdd959edd..10870a6a0 100644
--- a/src/mainboard/getac/p470/devicetree.cb
+++ b/src/mainboard/getac/p470/devicetree.cb
@@ -27,7 +27,7 @@ chip northbridge/intel/i945
end
end
- device pci_domain 0 on
+ device domain 0 on
device pci 00.0 on end # host bridge
# autodetect:
#device pci 01.0 off end # i945 PCIe root port
diff --git a/src/mainboard/gigabyte/ga-6bxc/devicetree.cb b/src/mainboard/gigabyte/ga-6bxc/devicetree.cb
index b5a4b5a56..a258515f3 100644
--- a/src/mainboard/gigabyte/ga-6bxc/devicetree.cb
+++ b/src/mainboard/gigabyte/ga-6bxc/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/intel/i440bx # Northbridge
device lapic 0 on end # APIC
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
device pci 0.0 on end # Host bridge
device pci 1.0 on end # PCI/AGP bridge
chip southbridge/intel/i82371eb # Southbridge
diff --git a/src/mainboard/gigabyte/ga-6bxe/devicetree.cb b/src/mainboard/gigabyte/ga-6bxe/devicetree.cb
index f84c7b38d..0f3f201fd 100644
--- a/src/mainboard/gigabyte/ga-6bxe/devicetree.cb
+++ b/src/mainboard/gigabyte/ga-6bxe/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/intel/i440bx # Northbridge
device lapic 0 on end # APIC
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
device pci 0.0 on end # Host bridge
device pci 1.0 on end # PCI/AGP bridge
chip southbridge/intel/i82371eb # Southbridge
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb b/src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb
index e1aac4eb3..0bf93077d 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb
+++ b/src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdk8/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x1039 0x1234 inherit
chip northbridge/amd/amdk8 #mc0
device pci 18.0 on
diff --git a/src/mainboard/gigabyte/m57sli/devicetree.cb b/src/mainboard/gigabyte/m57sli/devicetree.cb
index 2184de505..197f1cb8a 100644
--- a/src/mainboard/gigabyte/m57sli/devicetree.cb
+++ b/src/mainboard/gigabyte/m57sli/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex
device lapic 0 on end # Local APIC of the CPU
end
end
-device pci_domain 0 on # PCI domain
+device domain 0 on # PCI domain
subsystemid 0x1022 0x2b80 inherit
chip northbridge/amd/amdk8 # Northbridge / RAM controller
device pci 18.0 on # Link 0 == LDT 0
diff --git a/src/mainboard/gigabyte/ma785gm/devicetree.cb b/src/mainboard/gigabyte/ma785gm/devicetree.cb
index 47add7346..49bfe2a48 100644
--- a/src/mainboard/gigabyte/ma785gm/devicetree.cb
+++ b/src/mainboard/gigabyte/ma785gm/devicetree.cb
@@ -5,7 +5,7 @@ chip northbridge/amd/amdfam10/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x1022 0x3060 inherit
chip northbridge/amd/amdfam10
device pci 18.0 on # northbridge
@@ -110,6 +110,6 @@ chip northbridge/amd/amdfam10/root_complex
device pci 18.3 on end
device pci 18.4 on end
end
- end #pci_domain
+ end #domain
#for node 32 to node 63
end
diff --git a/src/mainboard/gigabyte/ma785gmt/devicetree.cb b/src/mainboard/gigabyte/ma785gmt/devicetree.cb
index 124572f5e..c7c0ae139 100644
--- a/src/mainboard/gigabyte/ma785gmt/devicetree.cb
+++ b/src/mainboard/gigabyte/ma785gmt/devicetree.cb
@@ -5,7 +5,7 @@ chip northbridge/amd/amdfam10/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x1022 0x3060 inherit
chip northbridge/amd/amdfam10
device pci 18.0 on # northbridge
@@ -110,6 +110,6 @@ chip northbridge/amd/amdfam10/root_complex
device pci 18.3 on end
device pci 18.4 on end
end
- end #pci_domain
+ end #domain
#for node 32 to node 63
end
diff --git a/src/mainboard/gigabyte/ma78gm/devicetree.cb b/src/mainboard/gigabyte/ma78gm/devicetree.cb
index 2fb4824c5..2fb0f1b87 100644
--- a/src/mainboard/gigabyte/ma78gm/devicetree.cb
+++ b/src/mainboard/gigabyte/ma78gm/devicetree.cb
@@ -5,7 +5,7 @@ chip northbridge/amd/amdfam10/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x1022 0x3060 inherit
chip northbridge/amd/amdfam10
device pci 18.0 on # northbridge
@@ -110,6 +110,6 @@ chip northbridge/amd/amdfam10/root_complex
device pci 18.4 on end
# device pci 00.5 on end
end
- end #pci_domain
+ end #domain
#for node 32 to node 63
end
diff --git a/src/mainboard/google/butterfly/devicetree.cb b/src/mainboard/google/butterfly/devicetree.cb
index d4e2ccdfa..6ab0f6fb9 100644
--- a/src/mainboard/google/butterfly/devicetree.cb
+++ b/src/mainboard/google/butterfly/devicetree.cb
@@ -33,7 +33,7 @@ chip northbridge/intel/sandybridge
end
end
- device pci_domain 0 on
+ device domain 0 on
device pci 00.0 on end # host bridge
device pci 01.0 off end # PCIe Bridge for discrete graphics
device pci 02.0 on end # vga controller
diff --git a/src/mainboard/google/parrot/devicetree.cb b/src/mainboard/google/parrot/devicetree.cb
index d93c02132..0b18613b3 100644
--- a/src/mainboard/google/parrot/devicetree.cb
+++ b/src/mainboard/google/parrot/devicetree.cb
@@ -36,7 +36,7 @@ chip northbridge/intel/sandybridge
end
end
- device pci_domain 0 on
+ device domain 0 on
device pci 00.0 on end # host bridge
device pci 02.0 on end # vga controller
diff --git a/src/mainboard/hp/dl145_g1/devicetree.cb b/src/mainboard/hp/dl145_g1/devicetree.cb
index 0f4a34fa4..7ad150547 100644
--- a/src/mainboard/hp/dl145_g1/devicetree.cb
+++ b/src/mainboard/hp/dl145_g1/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdk8/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x1022 0x7460 inherit
chip northbridge/amd/amdk8
device pci 18.0 on end # link 0
diff --git a/src/mainboard/hp/dl145_g3/devicetree.cb b/src/mainboard/hp/dl145_g3/devicetree.cb
index 1f4f04226..fee6dbd23 100644
--- a/src/mainboard/hp/dl145_g3/devicetree.cb
+++ b/src/mainboard/hp/dl145_g3/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdk8/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
chip northbridge/amd/amdk8 # northbridge
device pci 18.0 on # devices on link 0
chip southbridge/broadcom/bcm21000 # HT2100
@@ -81,7 +81,7 @@ chip northbridge/amd/amdk8/root_complex
device pci 18.3 on end
end # amdk8
- end #pci_domain
+ end #domain
end
diff --git a/src/mainboard/hp/dl165_g6_fam10/devicetree.cb b/src/mainboard/hp/dl165_g6_fam10/devicetree.cb
index 3c1302b5a..1da52efc2 100644
--- a/src/mainboard/hp/dl165_g6_fam10/devicetree.cb
+++ b/src/mainboard/hp/dl165_g6_fam10/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdfam10/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
chip northbridge/amd/amdfam10 # northbridge
device pci 18.0 on end
device pci 18.0 on end
@@ -84,7 +84,7 @@ chip northbridge/amd/amdfam10/root_complex
device pci 18.4 on end
end # amdfam10
- end #pci_domain
+ end #domain
end
diff --git a/src/mainboard/hp/e_vectra_p2706t/devicetree.cb b/src/mainboard/hp/e_vectra_p2706t/devicetree.cb
index 4a6584420..0f1474b7c 100644
--- a/src/mainboard/hp/e_vectra_p2706t/devicetree.cb
+++ b/src/mainboard/hp/e_vectra_p2706t/devicetree.cb
@@ -5,7 +5,7 @@ chip northbridge/intel/i82810 # Northbridge
device lapic 0 on end # APIC
end
end
- device pci_domain 0 on
+ device domain 0 on
device pci 0.0 on end # Host bridge
device pci 1.0 on end # Onboard VGA
chip southbridge/intel/i82801ax # Southbridge
diff --git a/src/mainboard/ibase/mb899/devicetree.cb b/src/mainboard/ibase/mb899/devicetree.cb
index 3fbe86314..0d92bdb93 100644
--- a/src/mainboard/ibase/mb899/devicetree.cb
+++ b/src/mainboard/ibase/mb899/devicetree.cb
@@ -6,7 +6,7 @@ chip northbridge/intel/i945
end
end
- device pci_domain 0 on
+ device domain 0 on
device pci 00.0 on end # host bridge
device pci 01.0 off end # i945 PCIe root port
device pci 02.0 on end # vga controller
diff --git a/src/mainboard/ibm/e325/devicetree.cb b/src/mainboard/ibm/e325/devicetree.cb
index 331e632ad..9654b3f9a 100644
--- a/src/mainboard/ibm/e325/devicetree.cb
+++ b/src/mainboard/ibm/e325/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdk8/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
chip northbridge/amd/amdk8
device pci 18.0 on end # LDT 0
device pci 18.0 on # LDT 1
diff --git a/src/mainboard/ibm/e326/devicetree.cb b/src/mainboard/ibm/e326/devicetree.cb
index 8826439a5..785f357cf 100644
--- a/src/mainboard/ibm/e326/devicetree.cb
+++ b/src/mainboard/ibm/e326/devicetree.cb
@@ -5,7 +5,7 @@ chip northbridge/amd/amdk8/root_complex
end
end
- device pci_domain 0 on
+ device domain 0 on
chip northbridge/amd/amdk8
device pci 18.0 on end # LDT 0
device pci 18.0 on # LDT 1
diff --git a/src/mainboard/iei/juki-511p/devicetree.cb b/src/mainboard/iei/juki-511p/devicetree.cb
index 8592c091d..4706ff59f 100644
--- a/src/mainboard/iei/juki-511p/devicetree.cb
+++ b/src/mainboard/iei/juki-511p/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/amd/gx1
- device pci_domain 0 on
+ device domain 0 on
device pci 0.0 on end
chip southbridge/amd/cs5530
diff --git a/src/mainboard/iei/kino-780am2-fam10/devicetree.cb b/src/mainboard/iei/kino-780am2-fam10/devicetree.cb
index 06d2d3220..019582294 100644
--- a/src/mainboard/iei/kino-780am2-fam10/devicetree.cb
+++ b/src/mainboard/iei/kino-780am2-fam10/devicetree.cb
@@ -5,7 +5,7 @@ chip northbridge/amd/amdfam10/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
chip northbridge/amd/amdfam10
device pci 18.0 on # northbridge
chip southbridge/amd/rs780
@@ -66,6 +66,6 @@ chip northbridge/amd/amdfam10/root_complex
device pci 18.2 on end
device pci 18.3 on end
end
- end #pci_domain
+ end #domain
end #root_complex
diff --git a/src/mainboard/iei/nova4899r/devicetree.cb b/src/mainboard/iei/nova4899r/devicetree.cb
index 8055fb1e6..f27662eb6 100644
--- a/src/mainboard/iei/nova4899r/devicetree.cb
+++ b/src/mainboard/iei/nova4899r/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/amd/gx1
- device pci_domain 0 on
+ device domain 0 on
device pci 0.0 on end
chip southbridge/amd/cs5530
device pci 0a.0 on end # ETH0
diff --git a/src/mainboard/iei/pcisa-lx-800-r10/devicetree.cb b/src/mainboard/iei/pcisa-lx-800-r10/devicetree.cb
index 2d37ecf43..5360fcc7d 100644
--- a/src/mainboard/iei/pcisa-lx-800-r10/devicetree.cb
+++ b/src/mainboard/iei/pcisa-lx-800-r10/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/amd/lx
- device pci_domain 0 on
+ device domain 0 on
device pci 1.0 on end # Northbridge
device pci 1.1 on end # Graphics
chip southbridge/amd/cs5536
diff --git a/src/mainboard/iei/pm-lx-800-r11/devicetree.cb b/src/mainboard/iei/pm-lx-800-r11/devicetree.cb
index c2776061f..2bb840e2b 100644
--- a/src/mainboard/iei/pm-lx-800-r11/devicetree.cb
+++ b/src/mainboard/iei/pm-lx-800-r11/devicetree.cb
@@ -20,7 +20,7 @@
##
chip northbridge/amd/lx
- device pci_domain 0 on
+ device domain 0 on
device pci 1.0 on end # Northbridge
device pci 1.1 on end # Video Adapter
device pci 1.2 on end # AES Security Block
diff --git a/src/mainboard/iei/pm-lx2-800-r10/devicetree.cb b/src/mainboard/iei/pm-lx2-800-r10/devicetree.cb
index ff60894fd..5b6d73a46 100644
--- a/src/mainboard/iei/pm-lx2-800-r10/devicetree.cb
+++ b/src/mainboard/iei/pm-lx2-800-r10/devicetree.cb
@@ -20,7 +20,7 @@
##
chip northbridge/amd/lx
- device pci_domain 0 on
+ device domain 0 on
device pci 1.0 on end # Northbridge
device pci 1.1 on end # Video Adapter
device pci 1.2 on end # AES Security Block
diff --git a/src/mainboard/intel/d810e2cb/devicetree.cb b/src/mainboard/intel/d810e2cb/devicetree.cb
index 412933632..f5afa9271 100644
--- a/src/mainboard/intel/d810e2cb/devicetree.cb
+++ b/src/mainboard/intel/d810e2cb/devicetree.cb
@@ -24,7 +24,7 @@ chip northbridge/intel/i82810 # Northbridge
device lapic 0 on end # APIC
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
device pci 0.0 on end # Graphics Memory Controller Hub (GMCH)
device pci 1.0 on end # Chipset Graphics Controller (CGC)
chip southbridge/intel/i82801bx # Southbridge
diff --git a/src/mainboard/intel/d945gclf/devicetree.cb b/src/mainboard/intel/d945gclf/devicetree.cb
index a58d99e61..6a4b353e9 100644
--- a/src/mainboard/intel/d945gclf/devicetree.cb
+++ b/src/mainboard/intel/d945gclf/devicetree.cb
@@ -25,7 +25,7 @@ chip northbridge/intel/i945
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x8086 0x464c inherit
device pci 00.0 on end # host bridge
device pci 01.0 off end # i945 PCIe root port
diff --git a/src/mainboard/intel/eagleheights/devicetree.cb b/src/mainboard/intel/eagleheights/devicetree.cb
index 997126416..5a272c15d 100644
--- a/src/mainboard/intel/eagleheights/devicetree.cb
+++ b/src/mainboard/intel/eagleheights/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/intel/i3100
- device pci_domain 0 on
+ device domain 0 on
device pci 00.0 on end # IMCH
device pci 00.1 on end # IMCH error status
device pci 01.0 on end # IMCH EDMA engine
diff --git a/src/mainboard/intel/emeraldlake2/devicetree.cb b/src/mainboard/intel/emeraldlake2/devicetree.cb
index 686fe2e34..1d0ed42d3 100644
--- a/src/mainboard/intel/emeraldlake2/devicetree.cb
+++ b/src/mainboard/intel/emeraldlake2/devicetree.cb
@@ -27,7 +27,7 @@ chip northbridge/intel/sandybridge
end
end
- device pci_domain 0 on
+ device domain 0 on
device pci 00.0 on end # host bridge
device pci 02.0 on end # vga controller
diff --git a/src/mainboard/intel/jarrell/devicetree.cb b/src/mainboard/intel/jarrell/devicetree.cb
index fb32a089e..b5c3ece79 100644
--- a/src/mainboard/intel/jarrell/devicetree.cb
+++ b/src/mainboard/intel/jarrell/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/intel/e7520
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x8086 0x1079 inherit
device pci 00.0 on end
device pci 00.1 on end
diff --git a/src/mainboard/intel/mtarvon/devicetree.cb b/src/mainboard/intel/mtarvon/devicetree.cb
index cd7df2d1d..61ead86ee 100644
--- a/src/mainboard/intel/mtarvon/devicetree.cb
+++ b/src/mainboard/intel/mtarvon/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/intel/i3100
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x8086 0x2680 inherit
device pci 00.0 on end # IMCH
device pci 00.1 on end # IMCH error status
diff --git a/src/mainboard/intel/truxton/devicetree.cb b/src/mainboard/intel/truxton/devicetree.cb
index 486601a42..23e98d358 100644
--- a/src/mainboard/intel/truxton/devicetree.cb
+++ b/src/mainboard/intel/truxton/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/intel/i3100
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x8086 0x2680 inherit
device pci 00.0 on end # IMCH
device pci 00.1 on end # IMCH error status
diff --git a/src/mainboard/intel/xe7501devkit/devicetree.cb b/src/mainboard/intel/xe7501devkit/devicetree.cb
index 18ee64e0d..75d918e3c 100644
--- a/src/mainboard/intel/xe7501devkit/devicetree.cb
+++ b/src/mainboard/intel/xe7501devkit/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/intel/e7501
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x8086 0x2480 inherit
device pci 0.0 on end # Chipset host controller
device pci 0.1 on end # Host RASUM controller
@@ -61,7 +61,7 @@ chip northbridge/intel/e7501
device pci 1f.5 off end # AC97 Audio
device pci 1f.6 off end # AC97 Modem
end # SB
- end # PCI_DOMAIN
+ end # PCI domain
device lapic_cluster 0 on
chip cpu/intel/socket_mPGA604
device lapic 0 on end
diff --git a/src/mainboard/iwave/iWRainbowG6/devicetree.cb b/src/mainboard/iwave/iWRainbowG6/devicetree.cb
index efae82b8e..7c46a8f20 100644
--- a/src/mainboard/iwave/iWRainbowG6/devicetree.cb
+++ b/src/mainboard/iwave/iWRainbowG6/devicetree.cb
@@ -6,7 +6,7 @@ chip northbridge/intel/sch
end
end
- device pci_domain 0 on
+ device domain 0 on
device pci 00.0 on end # host bridge
device pci 02.0 on end # Integrated Graphics and Video Device
diff --git a/src/mainboard/iwill/dk8_htx/devicetree.cb b/src/mainboard/iwill/dk8_htx/devicetree.cb
index d0cff0227..3f9bbcece 100644
--- a/src/mainboard/iwill/dk8_htx/devicetree.cb
+++ b/src/mainboard/iwill/dk8_htx/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdk8/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x1022 0x2b80 inherit
chip northbridge/amd/amdk8
device pci 18.0 on end
@@ -113,7 +113,7 @@ chip northbridge/amd/amdk8/root_complex
device pci 18.3 on end
end
- end #pci_domain
+ end #domain
# chip drivers/generic/debug
# device pnp 0.0 off end # chip name
# device pnp 0.1 on end # pci_regs_all
diff --git a/src/mainboard/iwill/dk8s2/devicetree.cb b/src/mainboard/iwill/dk8s2/devicetree.cb
index f234c3503..0220c309f 100644
--- a/src/mainboard/iwill/dk8s2/devicetree.cb
+++ b/src/mainboard/iwill/dk8s2/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdk8/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x161f 0x3016 inherit
chip northbridge/amd/amdk8
device pci 18.0 on # LDT 0
diff --git a/src/mainboard/iwill/dk8x/devicetree.cb b/src/mainboard/iwill/dk8x/devicetree.cb
index 388880547..5604d7fe2 100644
--- a/src/mainboard/iwill/dk8x/devicetree.cb
+++ b/src/mainboard/iwill/dk8x/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdk8/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
chip northbridge/amd/amdk8
device pci 18.0 on # northbridge
# devices on link 0, link 0 == LDT 0
diff --git a/src/mainboard/jetway/j7f24/devicetree.cb b/src/mainboard/jetway/j7f24/devicetree.cb
index 16dd2f6d7..ace327766 100644
--- a/src/mainboard/jetway/j7f24/devicetree.cb
+++ b/src/mainboard/jetway/j7f24/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/via/cn700 # Northbridge
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
device pci 0.0 on end # AGP Bridge
device pci 0.1 on end # Error Reporting
device pci 0.2 on end # Host Bus Control
diff --git a/src/mainboard/jetway/pa78vm5/devicetree.cb b/src/mainboard/jetway/pa78vm5/devicetree.cb
index 6913d79f9..116e7b5d9 100644
--- a/src/mainboard/jetway/pa78vm5/devicetree.cb
+++ b/src/mainboard/jetway/pa78vm5/devicetree.cb
@@ -5,7 +5,7 @@ chip northbridge/amd/amdfam10/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x1022 0x3060 inherit
chip northbridge/amd/amdfam10
device pci 18.0 on # northbridge
@@ -104,7 +104,7 @@ chip northbridge/amd/amdfam10/root_complex
device pci 18.4 on end
# device pci 00.5 on end
end
- end #pci_domain
+ end #domain
#for node 32 to node 63
end
diff --git a/src/mainboard/kontron/986lcd-m/devicetree.cb b/src/mainboard/kontron/986lcd-m/devicetree.cb
index b848d4000..ee738b296 100644
--- a/src/mainboard/kontron/986lcd-m/devicetree.cb
+++ b/src/mainboard/kontron/986lcd-m/devicetree.cb
@@ -6,7 +6,7 @@ chip northbridge/intel/i945
end
end
- device pci_domain 0 on
+ device domain 0 on
device pci 00.0 on end # host bridge
device pci 01.0 off end # i945 PCIe root port
device pci 02.0 on end # vga controller
diff --git a/src/mainboard/kontron/kt690/devicetree.cb b/src/mainboard/kontron/kt690/devicetree.cb
index 68741aeaa..dc4945bee 100644
--- a/src/mainboard/kontron/kt690/devicetree.cb
+++ b/src/mainboard/kontron/kt690/devicetree.cb
@@ -14,7 +14,7 @@ chip northbridge/amd/amdk8/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x1488 0x6900 inherit
chip northbridge/amd/amdk8
device pci 18.0 on # southbridge
@@ -121,6 +121,6 @@ chip northbridge/amd/amdk8/root_complex
device pci 18.2 on end
device pci 18.3 on end
end #northbridge/amd/amdk8
- end #pci_domain
+ end #domain
end #northbridge/amd/amdk8/root_complex
diff --git a/src/mainboard/lanner/em8510/devicetree.cb b/src/mainboard/lanner/em8510/devicetree.cb
index 5f17fba36..a7b43fda6 100644
--- a/src/mainboard/lanner/em8510/devicetree.cb
+++ b/src/mainboard/lanner/em8510/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/intel/i855
- device pci_domain 0 on
+ device domain 0 on
device pci 0.0 on end
chip southbridge/intel/i82801dx
# pci 11.0 on end
diff --git a/src/mainboard/lenovo/t60/devicetree.cb b/src/mainboard/lenovo/t60/devicetree.cb
index f8ba13723..7bde52fb1 100644
--- a/src/mainboard/lenovo/t60/devicetree.cb
+++ b/src/mainboard/lenovo/t60/devicetree.cb
@@ -28,7 +28,7 @@ chip northbridge/intel/i945
end
end
- device pci_domain 0 on
+ device domain 0 on
device pci 00.0 on # Host bridge
subsystemid 0x17aa 0x2015
end
diff --git a/src/mainboard/lenovo/x60/devicetree.cb b/src/mainboard/lenovo/x60/devicetree.cb
index 2f0a1792d..d5d527418 100644
--- a/src/mainboard/lenovo/x60/devicetree.cb
+++ b/src/mainboard/lenovo/x60/devicetree.cb
@@ -28,7 +28,7 @@ chip northbridge/intel/i945
end
end
- device pci_domain 0 on
+ device domain 0 on
device pci 00.0 on # Host bridge
subsystemid 0x17aa 0x2017
end
diff --git a/src/mainboard/lippert/frontrunner/devicetree.cb b/src/mainboard/lippert/frontrunner/devicetree.cb
index 63ac14013..704615877 100644
--- a/src/mainboard/lippert/frontrunner/devicetree.cb
+++ b/src/mainboard/lippert/frontrunner/devicetree.cb
@@ -5,7 +5,7 @@ chip northbridge/amd/gx2
end
end
- device pci_domain 0 on
+ device domain 0 on
device pci 0.0 on end
chip southbridge/amd/cs5535
register "setupflash" = "0"
diff --git a/src/mainboard/lippert/hurricane-lx/devicetree.cb b/src/mainboard/lippert/hurricane-lx/devicetree.cb
index 5aa4cd4dd..98e0744f6 100644
--- a/src/mainboard/lippert/hurricane-lx/devicetree.cb
+++ b/src/mainboard/lippert/hurricane-lx/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/amd/lx
- device pci_domain 0 on
+ device domain 0 on
device pci 1.0 on end # Northbridge
device pci 1.1 on end # Graphics
device pci 1.2 on end # AES
diff --git a/src/mainboard/lippert/literunner-lx/devicetree.cb b/src/mainboard/lippert/literunner-lx/devicetree.cb
index b14247121..65119fc50 100644
--- a/src/mainboard/lippert/literunner-lx/devicetree.cb
+++ b/src/mainboard/lippert/literunner-lx/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/amd/lx
- device pci_domain 0 on
+ device domain 0 on
device pci 1.0 on end # Northbridge
device pci 1.1 on end # Graphics
device pci 1.2 on end # AES
diff --git a/src/mainboard/lippert/roadrunner-lx/devicetree.cb b/src/mainboard/lippert/roadrunner-lx/devicetree.cb
index 73d1d8827..f3bd5885f 100644
--- a/src/mainboard/lippert/roadrunner-lx/devicetree.cb
+++ b/src/mainboard/lippert/roadrunner-lx/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/amd/lx
- device pci_domain 0 on
+ device domain 0 on
device pci 1.0 on end # Northbridge
device pci 1.1 on end # Graphics
device pci 1.2 on end # AES
diff --git a/src/mainboard/lippert/spacerunner-lx/devicetree.cb b/src/mainboard/lippert/spacerunner-lx/devicetree.cb
index 4bb15087d..a4edbe8ee 100644
--- a/src/mainboard/lippert/spacerunner-lx/devicetree.cb
+++ b/src/mainboard/lippert/spacerunner-lx/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/amd/lx
- device pci_domain 0 on
+ device domain 0 on
device pci 1.0 on end # Northbridge
device pci 1.1 on end # Graphics
device pci 1.2 on end # AES
diff --git a/src/mainboard/mitac/6513wu/devicetree.cb b/src/mainboard/mitac/6513wu/devicetree.cb
index df2d2cec4..4e995d922 100644
--- a/src/mainboard/mitac/6513wu/devicetree.cb
+++ b/src/mainboard/mitac/6513wu/devicetree.cb
@@ -24,7 +24,7 @@ chip northbridge/intel/i82810 # Northbridge
device lapic 0 on end # APIC
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
device pci 0.0 on end # Graphics Memory Controller Hub (GMCH)
device pci 1.0 on end
chip southbridge/intel/i82801ax # Southbridge
diff --git a/src/mainboard/msi/ms6119/devicetree.cb b/src/mainboard/msi/ms6119/devicetree.cb
index d5be59fe6..6829a3ab2 100644
--- a/src/mainboard/msi/ms6119/devicetree.cb
+++ b/src/mainboard/msi/ms6119/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/intel/i440bx # Northbridge
device lapic 0 on end # APIC
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
device pci 0.0 on end # Host bridge
device pci 1.0 on end # PCI/AGP bridge
chip southbridge/intel/i82371eb # Southbridge
diff --git a/src/mainboard/msi/ms6147/devicetree.cb b/src/mainboard/msi/ms6147/devicetree.cb
index 0500a7f93..3792e212c 100644
--- a/src/mainboard/msi/ms6147/devicetree.cb
+++ b/src/mainboard/msi/ms6147/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/intel/i440bx # Northbridge
device lapic 0 on end # APIC
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
device pci 0.0 on end # Host bridge
device pci 1.0 on end # PCI/AGP bridge
chip southbridge/intel/i82371eb # Southbridge
diff --git a/src/mainboard/msi/ms6156/devicetree.cb b/src/mainboard/msi/ms6156/devicetree.cb
index da3ba6f14..e038513b8 100644
--- a/src/mainboard/msi/ms6156/devicetree.cb
+++ b/src/mainboard/msi/ms6156/devicetree.cb
@@ -24,7 +24,7 @@ chip northbridge/intel/i440bx # Northbridge
device lapic 0 on end # APIC
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
device pci 0.0 on end # Host bridge
device pci 1.0 on end # PCI/AGP bridge
chip southbridge/intel/i82371eb # Southbridge
diff --git a/src/mainboard/msi/ms6178/devicetree.cb b/src/mainboard/msi/ms6178/devicetree.cb
index 569aee52d..c91ea0a30 100644
--- a/src/mainboard/msi/ms6178/devicetree.cb
+++ b/src/mainboard/msi/ms6178/devicetree.cb
@@ -24,7 +24,7 @@ chip northbridge/intel/i82810 # Northbridge
device lapic 0 on end # APIC
end
end
- device pci_domain 0 on
+ device domain 0 on
device pci 0.0 on end # Host bridge
device pci 1.0 on end # Onboard VGA
chip southbridge/intel/i82801ax # Southbridge
diff --git a/src/mainboard/msi/ms7135/devicetree.cb b/src/mainboard/msi/ms7135/devicetree.cb
index 54e5d5e59..9546acda4 100644
--- a/src/mainboard/msi/ms7135/devicetree.cb
+++ b/src/mainboard/msi/ms7135/devicetree.cb
@@ -5,7 +5,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
subsystemid 0x1462 0x7135 inherit
chip northbridge/amd/amdk8 # Northbridge / RAM controller
device pci 18.0 on # Link 0 == LDT 0
diff --git a/src/mainboard/msi/ms7260/devicetree.cb b/src/mainboard/msi/ms7260/devicetree.cb
index 47d5381b5..fe320ecd7 100644
--- a/src/mainboard/msi/ms7260/devicetree.cb
+++ b/src/mainboard/msi/ms7260/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex
device lapic 0 on end # Local APIC of the CPU
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
subsystemid 0x1462 0x7260 inherit
chip northbridge/amd/amdk8 # Northbridge / RAM controller
device pci 18.0 on # Link 0 == LDT 0
diff --git a/src/mainboard/msi/ms9185/devicetree.cb b/src/mainboard/msi/ms9185/devicetree.cb
index 9576225e9..b41a1624c 100644
--- a/src/mainboard/msi/ms9185/devicetree.cb
+++ b/src/mainboard/msi/ms9185/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdk8/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x1022 0x2b80 inherit
chip northbridge/amd/amdk8
device pci 18.0 on end
@@ -81,7 +81,7 @@ chip northbridge/amd/amdk8/root_complex
device pci 18.2 on end
device pci 18.3 on end
end # amdk8
- end #pci_domain
+ end #domain
# chip drivers/generic/debug
# device pnp 0.0 off end # chip name
# device pnp 0.1 on end # pci_regs_all
diff --git a/src/mainboard/msi/ms9282/devicetree.cb b/src/mainboard/msi/ms9282/devicetree.cb
index b52e7ed65..8b46deb74 100644
--- a/src/mainboard/msi/ms9282/devicetree.cb
+++ b/src/mainboard/msi/ms9282/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex
device lapic 0 on end # Local APIC of the CPU
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
subsystemid 0x1462 0x9282 inherit
chip northbridge/amd/amdk8 # Northbridge / RAM controller
device pci 18.0 on # Link 0 == LDT 0
diff --git a/src/mainboard/msi/ms9652_fam10/devicetree.cb b/src/mainboard/msi/ms9652_fam10/devicetree.cb
index 0e9a3ffe3..4060ae50d 100644
--- a/src/mainboard/msi/ms9652_fam10/devicetree.cb
+++ b/src/mainboard/msi/ms9652_fam10/devicetree.cb
@@ -27,7 +27,7 @@ chip northbridge/amd/amdfam10/root_complex # Root complex
device lapic 0 on end # Local APIC of the CPU
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
subsystemid 0x1462 0x9652 inherit
chip northbridge/amd/amdfam10 # Northbridge / RAM controller
device pci 18.0 on # Link 0
diff --git a/src/mainboard/nec/powermate2000/devicetree.cb b/src/mainboard/nec/powermate2000/devicetree.cb
index 37a15e1ab..daa755124 100644
--- a/src/mainboard/nec/powermate2000/devicetree.cb
+++ b/src/mainboard/nec/powermate2000/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/intel/i82810 # Northbridge
device lapic 0 on end # APIC
end
end
- device pci_domain 0 on
+ device domain 0 on
device pci 0.0 on end # Host bridge
device pci 1.0 off end # Onboard video
chip southbridge/intel/i82801ax # Southbridge
diff --git a/src/mainboard/newisys/khepri/devicetree.cb b/src/mainboard/newisys/khepri/devicetree.cb
index 9cdbc9c66..cc6e9b746 100644
--- a/src/mainboard/newisys/khepri/devicetree.cb
+++ b/src/mainboard/newisys/khepri/devicetree.cb
@@ -5,7 +5,7 @@ chip northbridge/amd/amdk8/root_complex
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x17c2 0x0010 inherit
chip northbridge/amd/amdk8
device pci 18.0 on end # LDT 0
diff --git a/src/mainboard/nokia/ip530/devicetree.cb b/src/mainboard/nokia/ip530/devicetree.cb
index f89d1cd9f..6d109cc06 100644
--- a/src/mainboard/nokia/ip530/devicetree.cb
+++ b/src/mainboard/nokia/ip530/devicetree.cb
@@ -24,7 +24,7 @@ chip northbridge/intel/i440bx # Northbridge
device lapic 0 on end # Local APIC of the CPU
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
device pci 0.0 on end # Host bridge
device pci 1.0 on end # PCI/AGP bridge
chip southbridge/intel/i82371eb # Southbridge
diff --git a/src/mainboard/nvidia/l1_2pvv/devicetree.cb b/src/mainboard/nvidia/l1_2pvv/devicetree.cb
index 9a807107c..fff1f6a98 100644
--- a/src/mainboard/nvidia/l1_2pvv/devicetree.cb
+++ b/src/mainboard/nvidia/l1_2pvv/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex
device lapic 0 on end # Local APIC of the CPU
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
subsystemid 0x1022 0x2b80 inherit
chip northbridge/amd/amdk8 # Northbridge / RAM controller
device pci 18.0 on # Link 0 == LDT 0
diff --git a/src/mainboard/pcengines/alix1c/devicetree.cb b/src/mainboard/pcengines/alix1c/devicetree.cb
index 91d935038..8e0ece038 100644
--- a/src/mainboard/pcengines/alix1c/devicetree.cb
+++ b/src/mainboard/pcengines/alix1c/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/amd/lx
- device pci_domain 0 on
+ device domain 0 on
device pci 1.0 on end
device pci 1.1 on end
chip southbridge/amd/cs5536
diff --git a/src/mainboard/pcengines/alix2d/devicetree.cb b/src/mainboard/pcengines/alix2d/devicetree.cb
index 836ba3547..97327969d 100644
--- a/src/mainboard/pcengines/alix2d/devicetree.cb
+++ b/src/mainboard/pcengines/alix2d/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/amd/lx
- device pci_domain 0 on
+ device domain 0 on
device pci 1.0 on end
device pci 1.1 on end
chip southbridge/amd/cs5536
diff --git a/src/mainboard/rca/rm4100/devicetree.cb b/src/mainboard/rca/rm4100/devicetree.cb
index 5c22eaafa..7fb73e1a6 100644
--- a/src/mainboard/rca/rm4100/devicetree.cb
+++ b/src/mainboard/rca/rm4100/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/intel/i82830 # Northbridge
device lapic 0 on end # APIC
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
device pci 0.0 on end # Host bridge
device pci 2.0 on end # VGA (Intel 82830 CGC)
chip southbridge/intel/i82801dx # Southbridge
diff --git a/src/mainboard/roda/rk886ex/devicetree.cb b/src/mainboard/roda/rk886ex/devicetree.cb
index aadba9d8f..502b0320f 100644
--- a/src/mainboard/roda/rk886ex/devicetree.cb
+++ b/src/mainboard/roda/rk886ex/devicetree.cb
@@ -27,7 +27,7 @@ chip northbridge/intel/i945
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x4352 0x6886 inherit
device pci 00.0 on end # host bridge
# auto detection:
diff --git a/src/mainboard/roda/rk9/devicetree.cb b/src/mainboard/roda/rk9/devicetree.cb
index 002f59562..192681e5f 100644
--- a/src/mainboard/roda/rk9/devicetree.cb
+++ b/src/mainboard/roda/rk9/devicetree.cb
@@ -16,7 +16,7 @@ chip northbridge/intel/gm45
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x4352 0x8986
device pci 00.0 on end # host bridge
device pci 02.0 on # VGA
diff --git a/src/mainboard/samsung/lumpy/devicetree.cb b/src/mainboard/samsung/lumpy/devicetree.cb
index 7a2ee6ce1..c2f091d43 100644
--- a/src/mainboard/samsung/lumpy/devicetree.cb
+++ b/src/mainboard/samsung/lumpy/devicetree.cb
@@ -32,7 +32,7 @@ chip northbridge/intel/sandybridge
end
end
- device pci_domain 0 on
+ device domain 0 on
ioapic_irq 4 INTA 0x10
ioapic_irq 4 INTB 0x11
ioapic_irq 4 INTC 0x12
diff --git a/src/mainboard/samsung/stumpy/devicetree.cb b/src/mainboard/samsung/stumpy/devicetree.cb
index b59dcb252..925b71da5 100644
--- a/src/mainboard/samsung/stumpy/devicetree.cb
+++ b/src/mainboard/samsung/stumpy/devicetree.cb
@@ -27,7 +27,7 @@ chip northbridge/intel/sandybridge
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x1ae0 0xc000 inherit
device pci 00.0 on end # host bridge
device pci 02.0 on end # vga controller
diff --git a/src/mainboard/siemens/sitemp_g1p1/devicetree.cb b/src/mainboard/siemens/sitemp_g1p1/devicetree.cb
index 6f068e482..d01d5a8a8 100644
--- a/src/mainboard/siemens/sitemp_g1p1/devicetree.cb
+++ b/src/mainboard/siemens/sitemp_g1p1/devicetree.cb
@@ -14,7 +14,7 @@ chip northbridge/amd/amdk8/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x110a 0x4076 inherit
chip northbridge/amd/amdk8
device pci 18.0 on # southbridge
@@ -130,6 +130,6 @@ chip northbridge/amd/amdk8/root_complex
device pci 18.2 on end
device pci 18.3 on end
end #northbridge/amd/amdk8
- end #pci_domain
+ end #domain
end #northbridge/amd/amdk8/root_complex
diff --git a/src/mainboard/soyo/sy-6ba-plus-iii/devicetree.cb b/src/mainboard/soyo/sy-6ba-plus-iii/devicetree.cb
index 03451e242..c39a2ce55 100644
--- a/src/mainboard/soyo/sy-6ba-plus-iii/devicetree.cb
+++ b/src/mainboard/soyo/sy-6ba-plus-iii/devicetree.cb
@@ -24,7 +24,7 @@ chip northbridge/intel/i440bx # Northbridge
device lapic 0 on end # APIC
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
device pci 0.0 on end # Host bridge
device pci 1.0 on end # PCI/AGP bridge
chip southbridge/intel/i82371eb # Southbridge
diff --git a/src/mainboard/sunw/ultra40/devicetree.cb b/src/mainboard/sunw/ultra40/devicetree.cb
index f355200ce..fe5bf33f2 100644
--- a/src/mainboard/sunw/ultra40/devicetree.cb
+++ b/src/mainboard/sunw/ultra40/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex
device lapic 0 on end # Local APIC of the CPU
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
subsystemid 0x108e 0x0040 inherit
chip northbridge/amd/amdk8 # Northbridge / RAM controller
device pci 18.0 on end
diff --git a/src/mainboard/supermicro/h8dme/devicetree.cb b/src/mainboard/supermicro/h8dme/devicetree.cb
index 73a43e827..0c8cf6172 100644
--- a/src/mainboard/supermicro/h8dme/devicetree.cb
+++ b/src/mainboard/supermicro/h8dme/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex
device lapic 0 on end # Local APIC of the CPU
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
subsystemid 0x15d9 0x1511 inherit
chip northbridge/amd/amdk8 # Northbridge / RAM controller
device pci 18.0 on end
diff --git a/src/mainboard/supermicro/h8dmr/devicetree.cb b/src/mainboard/supermicro/h8dmr/devicetree.cb
index 6c96ac0de..3d1e994d2 100644
--- a/src/mainboard/supermicro/h8dmr/devicetree.cb
+++ b/src/mainboard/supermicro/h8dmr/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex
device lapic 0 on end # Local APIC of the CPU
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
subsystemid 0x15d9 0x1511 inherit
chip northbridge/amd/amdk8 # Northbridge / RAM controller
device pci 18.0 on end
diff --git a/src/mainboard/supermicro/h8dmr_fam10/devicetree.cb b/src/mainboard/supermicro/h8dmr_fam10/devicetree.cb
index 6c4443f90..e7fe9e41b 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/devicetree.cb
+++ b/src/mainboard/supermicro/h8dmr_fam10/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdfam10/root_complex # Root complex
device lapic 0 on end # Local APIC of the CPU
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
subsystemid 0x15d9 0x1511 inherit
chip northbridge/amd/amdfam10 # Northbridge / RAM controller
device pci 18.0 on end
diff --git a/src/mainboard/supermicro/h8qgi/devicetree.cb b/src/mainboard/supermicro/h8qgi/devicetree.cb
index 48797d56d..8365346bc 100644
--- a/src/mainboard/supermicro/h8qgi/devicetree.cb
+++ b/src/mainboard/supermicro/h8qgi/devicetree.cb
@@ -23,7 +23,7 @@ chip northbridge/amd/agesa/family15/root_complex
#device lapic 0x10 on end #f10
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x15d9 0xab11 inherit #SuperMicro
chip northbridge/amd/agesa/family15 # CPU side of HT root complex
device pci 18.0 on # Put IO-HUB at link_num 0, Instead of HT Link topology
@@ -125,6 +125,6 @@ chip northbridge/amd/agesa/family15/root_complex
device pci 18.4 on end
device pci 18.5 on end #f15
end #chip northbridge/amd/agesa/family15 # CPU side of HT root complex
- end #pci_domain
+ end #domain
end #northbridge/amd/agesa/family15/root_complex
diff --git a/src/mainboard/supermicro/h8qme_fam10/devicetree.cb b/src/mainboard/supermicro/h8qme_fam10/devicetree.cb
index 56ba7b539..d797beaba 100644
--- a/src/mainboard/supermicro/h8qme_fam10/devicetree.cb
+++ b/src/mainboard/supermicro/h8qme_fam10/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdfam10/root_complex # Root complex
device lapic 0 on end # Local APIC of the CPU
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
subsystemid 0x15d9 0x1511 inherit
chip northbridge/amd/amdfam10 # Northbridge / RAM controller
device pci 18.0 on end
diff --git a/src/mainboard/supermicro/h8scm/devicetree.cb b/src/mainboard/supermicro/h8scm/devicetree.cb
index 5ade0af64..6367392a8 100644
--- a/src/mainboard/supermicro/h8scm/devicetree.cb
+++ b/src/mainboard/supermicro/h8scm/devicetree.cb
@@ -22,7 +22,7 @@ chip northbridge/amd/agesa/family15/root_complex
device lapic 0x10 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x15d9 0xab11 inherit #Supermicro
chip northbridge/amd/agesa/family15 # CPU side of HT root complex
device pci 18.0 on # Put IO-HUB at link_num 0, Instead of HT Link topology
@@ -122,6 +122,6 @@ chip northbridge/amd/agesa/family15/root_complex
device pci 18.4 on end
device pci 18.5 on end #f15
end #chip northbridge/amd/agesa/family15 # CPU side of HT root complex
- end #pci_domain
+ end #domain
end #northbridge/amd/agesa/family15/root_complex
diff --git a/src/mainboard/supermicro/h8scm_fam10/devicetree.cb b/src/mainboard/supermicro/h8scm_fam10/devicetree.cb
index 9aa4406fa..eb7ae1b0f 100644
--- a/src/mainboard/supermicro/h8scm_fam10/devicetree.cb
+++ b/src/mainboard/supermicro/h8scm_fam10/devicetree.cb
@@ -9,7 +9,7 @@ chip northbridge/amd/amdfam10/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x15d9 0x1511 inherit
chip northbridge/amd/amdfam10
##device pci 18.0 on end
@@ -104,9 +104,9 @@ chip northbridge/amd/amdfam10/root_complex
device pci 19.3 on end
device pci 19.4 on end
end
- end #pci_domain
+ end #domain
#for node 32 to node 63
-# device pci_domain 0 on
+# device domain 0 on
# chip northbridge/amd/amdfam10
# device pci 00.0 on end# northbridge
# device pci 00.0 on end
@@ -118,7 +118,7 @@ chip northbridge/amd/amdfam10/root_complex
# device pci 00.4 on end
# device pci 00.5 on end
# end
-# end #pci_domain
+# end #domain
# chip drivers/generic/debug
# device pnp 0.0 off end # chip name
diff --git a/src/mainboard/supermicro/x6dai_g/devicetree.cb b/src/mainboard/supermicro/x6dai_g/devicetree.cb
index e6201a811..f39ca6cc9 100644
--- a/src/mainboard/supermicro/x6dai_g/devicetree.cb
+++ b/src/mainboard/supermicro/x6dai_g/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/intel/e7525 # mch
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x15d9 0x6780 inherit
chip southbridge/intel/esb6300 # esb6300
register "pirq_a_d" = "0x0b0a0a05"
diff --git a/src/mainboard/supermicro/x6dhe_g/devicetree.cb b/src/mainboard/supermicro/x6dhe_g/devicetree.cb
index 08c0751c0..dfe2e8836 100644
--- a/src/mainboard/supermicro/x6dhe_g/devicetree.cb
+++ b/src/mainboard/supermicro/x6dhe_g/devicetree.cb
@@ -5,7 +5,7 @@ chip northbridge/intel/e7520 # MCH
device pnp 00.2 off end
device pnp 00.3 off end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x15d9 0x6080 inherit
chip southbridge/intel/esb6300 # ESB6300
register "pirq_a_d" = "0x0b070a05"
diff --git a/src/mainboard/supermicro/x6dhe_g2/devicetree.cb b/src/mainboard/supermicro/x6dhe_g2/devicetree.cb
index ecfe0a00a..c074fe8c1 100644
--- a/src/mainboard/supermicro/x6dhe_g2/devicetree.cb
+++ b/src/mainboard/supermicro/x6dhe_g2/devicetree.cb
@@ -5,7 +5,7 @@ chip northbridge/intel/e7520 # MCH
device pnp 00.2 off end
device pnp 00.3 off end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x15d9 0x6080 inherit
chip southbridge/intel/i82801ex # ICH5R
register "pirq_a_d" = "0x0b070a05"
diff --git a/src/mainboard/supermicro/x6dhr_ig/devicetree.cb b/src/mainboard/supermicro/x6dhr_ig/devicetree.cb
index 6ada3b134..1b54204ac 100644
--- a/src/mainboard/supermicro/x6dhr_ig/devicetree.cb
+++ b/src/mainboard/supermicro/x6dhr_ig/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/intel/e7520 # mch
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x15d9 0x5580 inherit
chip southbridge/intel/i82801ex # i82801er
# USB ports
diff --git a/src/mainboard/supermicro/x6dhr_ig2/devicetree.cb b/src/mainboard/supermicro/x6dhr_ig2/devicetree.cb
index 3d9b644fd..1ec663926 100644
--- a/src/mainboard/supermicro/x6dhr_ig2/devicetree.cb
+++ b/src/mainboard/supermicro/x6dhr_ig2/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/intel/e7520 # mch
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x15d9 0x5580 inherit
chip southbridge/intel/i82801ex # i82801er
# USB ports
diff --git a/src/mainboard/supermicro/x7db8/devicetree.cb b/src/mainboard/supermicro/x7db8/devicetree.cb
index 8949c5480..0a3fabb2f 100644
--- a/src/mainboard/supermicro/x7db8/devicetree.cb
+++ b/src/mainboard/supermicro/x7db8/devicetree.cb
@@ -28,7 +28,7 @@ chip northbridge/intel/i5000
end
end
- device pci_domain 0 on
+ device domain 0 on
device pci 00.0 on # Host bridge
subsystemid 0x15d9 0x2017
end
diff --git a/src/mainboard/technexion/tim5690/devicetree.cb b/src/mainboard/technexion/tim5690/devicetree.cb
index 148a4ab46..2cc73e171 100644
--- a/src/mainboard/technexion/tim5690/devicetree.cb
+++ b/src/mainboard/technexion/tim5690/devicetree.cb
@@ -14,7 +14,7 @@ chip northbridge/amd/amdk8/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x1022 0x3050 inherit
chip northbridge/amd/amdk8
device pci 18.0 on # southbridge
@@ -108,6 +108,6 @@ chip northbridge/amd/amdk8/root_complex
device pci 18.2 on end
device pci 18.3 on end
end #northbridge/amd/amdk8
- end #pci_domain
+ end #domain
end #northbridge/amd/amdk8/root_complex
diff --git a/src/mainboard/technexion/tim8690/devicetree.cb b/src/mainboard/technexion/tim8690/devicetree.cb
index e1f8936ba..ee69a4956 100644
--- a/src/mainboard/technexion/tim8690/devicetree.cb
+++ b/src/mainboard/technexion/tim8690/devicetree.cb
@@ -14,7 +14,7 @@ chip northbridge/amd/amdk8/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x1022 0x3050 inherit
chip northbridge/amd/amdk8
device pci 18.0 on # southbridge
@@ -111,6 +111,6 @@ chip northbridge/amd/amdk8/root_complex
device pci 18.2 on end
device pci 18.3 on end
end #northbridge/amd/amdk8
- end #pci_domain
+ end #domain
end #northbridge/amd/amdk8/root_complex
diff --git a/src/mainboard/technologic/ts5300/devicetree.cb b/src/mainboard/technologic/ts5300/devicetree.cb
index 9fddf734d..6c83e208a 100644
--- a/src/mainboard/technologic/ts5300/devicetree.cb
+++ b/src/mainboard/technologic/ts5300/devicetree.cb
@@ -1,5 +1,5 @@
chip cpu/amd/sc520
- device pci_domain 0 on
+ device domain 0 on
device pci 0.0 on end
end
diff --git a/src/mainboard/televideo/tc7020/devicetree.cb b/src/mainboard/televideo/tc7020/devicetree.cb
index 10188a35c..d1fa6bd27 100644
--- a/src/mainboard/televideo/tc7020/devicetree.cb
+++ b/src/mainboard/televideo/tc7020/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/amd/gx1 # Northbridge
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
device pci 0.0 on end # Host bridge
chip southbridge/amd/cs5530 # Southbridge
device pci 12.0 on # ISA bridge
diff --git a/src/mainboard/thomson/ip1000/devicetree.cb b/src/mainboard/thomson/ip1000/devicetree.cb
index f7b11f124..c1733303f 100644
--- a/src/mainboard/thomson/ip1000/devicetree.cb
+++ b/src/mainboard/thomson/ip1000/devicetree.cb
@@ -5,7 +5,7 @@ chip northbridge/intel/i82830 # Northbridge
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
device pci 0.0 on end # Host bridge
device pci 2.0 on end # VGA (Intel 82830 CGC)
chip southbridge/intel/i82801dx # Southbridge
diff --git a/src/mainboard/traverse/geos/devicetree.cb b/src/mainboard/traverse/geos/devicetree.cb
index 44b36f68c..ef14c3e09 100644
--- a/src/mainboard/traverse/geos/devicetree.cb
+++ b/src/mainboard/traverse/geos/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/amd/lx
- device pci_domain 0 on
+ device domain 0 on
device pci 1.0 on end # Northbridge
device pci 1.1 on end # Graphics
chip southbridge/amd/cs5536
diff --git a/src/mainboard/tyan/s1846/devicetree.cb b/src/mainboard/tyan/s1846/devicetree.cb
index d3df17c7b..16b3e7c21 100644
--- a/src/mainboard/tyan/s1846/devicetree.cb
+++ b/src/mainboard/tyan/s1846/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/intel/i440bx # Northbridge
device lapic 0 on end # APIC
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
device pci 0.0 on end # Host bridge
device pci 1.0 on end # PCI/AGP bridge
chip southbridge/intel/i82371eb # Southbridge
diff --git a/src/mainboard/tyan/s2735/devicetree.cb b/src/mainboard/tyan/s2735/devicetree.cb
index c0557f8d1..726a5d2c7 100644
--- a/src/mainboard/tyan/s2735/devicetree.cb
+++ b/src/mainboard/tyan/s2735/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/intel/e7501
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x10f1 0x2735 inherit
device pci 0.0 on end
device pci 0.1 on end
@@ -73,7 +73,7 @@ chip northbridge/intel/e7501
device pci 1f.5 off end
device pci 1f.6 off end
end # SB
- end # PCI_DOMAIN
+ end # PCI domain
device lapic_cluster 0 on
chip cpu/intel/socket_mPGA604
device lapic 0 on end
diff --git a/src/mainboard/tyan/s2850/devicetree.cb b/src/mainboard/tyan/s2850/devicetree.cb
index 4e981ad0d..bff001305 100644
--- a/src/mainboard/tyan/s2850/devicetree.cb
+++ b/src/mainboard/tyan/s2850/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdk8/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x10f1 0x2850 inherit
chip northbridge/amd/amdk8
device pci 18.0 on # LDT0
diff --git a/src/mainboard/tyan/s2875/devicetree.cb b/src/mainboard/tyan/s2875/devicetree.cb
index d3d6c6d14..f7f7a9e6e 100644
--- a/src/mainboard/tyan/s2875/devicetree.cb
+++ b/src/mainboard/tyan/s2875/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdk8/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x10f1 0x2875 inherit
chip northbridge/amd/amdk8
device pci 18.0 on # northbridge
diff --git a/src/mainboard/tyan/s2880/devicetree.cb b/src/mainboard/tyan/s2880/devicetree.cb
index b815fb5f1..2aa079687 100644
--- a/src/mainboard/tyan/s2880/devicetree.cb
+++ b/src/mainboard/tyan/s2880/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdk8/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x10f1 0x2880 inherit
chip northbridge/amd/amdk8
device pci 18.0 on # northbridge
diff --git a/src/mainboard/tyan/s2881/devicetree.cb b/src/mainboard/tyan/s2881/devicetree.cb
index 7e836ffe5..463c55398 100644
--- a/src/mainboard/tyan/s2881/devicetree.cb
+++ b/src/mainboard/tyan/s2881/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdk8/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x10f1 0x2881 inherit
chip northbridge/amd/amdk8
device pci 18.0 on end # link 0
diff --git a/src/mainboard/tyan/s2882/devicetree.cb b/src/mainboard/tyan/s2882/devicetree.cb
index 4f10752d8..0726d08c4 100644
--- a/src/mainboard/tyan/s2882/devicetree.cb
+++ b/src/mainboard/tyan/s2882/devicetree.cb
@@ -5,7 +5,7 @@ chip northbridge/amd/amdk8/root_complex
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x10f1 0x2882 inherit
chip northbridge/amd/amdk8
device pci 18.0 on # northbridge
@@ -121,6 +121,6 @@ chip northbridge/amd/amdk8/root_complex
device pci 18.2 on end
device pci 18.3 on end
end # NB
- end #pci_domain
+ end #domain
end
diff --git a/src/mainboard/tyan/s2885/devicetree.cb b/src/mainboard/tyan/s2885/devicetree.cb
index fbb96807d..b677fbc2e 100644
--- a/src/mainboard/tyan/s2885/devicetree.cb
+++ b/src/mainboard/tyan/s2885/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdk8/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x10f1 0x2885 inherit
chip northbridge/amd/amdk8
device pci 18.0 on # LDT0
@@ -118,7 +118,7 @@ chip northbridge/amd/amdk8/root_complex
device pci 18.3 on end
end
- end #pci_domain
+ end #domain
# chip drivers/generic/debug
# device pnp 0.0 off end
diff --git a/src/mainboard/tyan/s2891/devicetree.cb b/src/mainboard/tyan/s2891/devicetree.cb
index d79364058..7517e4d77 100644
--- a/src/mainboard/tyan/s2891/devicetree.cb
+++ b/src/mainboard/tyan/s2891/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex
device lapic 0 on end # Local APIC of the CPU
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
subsystemid 0x10f1 0x2891 inherit
chip northbridge/amd/amdk8 # Northbridge / RAM controller
device pci 18.0 on # Link 0 == LDT 0
diff --git a/src/mainboard/tyan/s2892/devicetree.cb b/src/mainboard/tyan/s2892/devicetree.cb
index 3b999ca42..a5cef447e 100644
--- a/src/mainboard/tyan/s2892/devicetree.cb
+++ b/src/mainboard/tyan/s2892/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex
device lapic 0 on end # Local APIC of the CPU
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
subsystemid 0x10f1 0x2892 inherit
chip northbridge/amd/amdk8 # Northbridge / RAM controller
device pci 18.0 on # Link 0 == LDT 0
diff --git a/src/mainboard/tyan/s2895/devicetree.cb b/src/mainboard/tyan/s2895/devicetree.cb
index 7d7abc3dd..f60d5c665 100644
--- a/src/mainboard/tyan/s2895/devicetree.cb
+++ b/src/mainboard/tyan/s2895/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex
device lapic 0 on end # Local APIC of the CPU
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
subsystemid 0x10f1 0x2895 inherit
chip northbridge/amd/amdk8 # Northbridge / RAM controller
device pci 18.0 on # Link 0 == LDT 0
diff --git a/src/mainboard/tyan/s2912/devicetree.cb b/src/mainboard/tyan/s2912/devicetree.cb
index 0ce4a4895..276e12f01 100644
--- a/src/mainboard/tyan/s2912/devicetree.cb
+++ b/src/mainboard/tyan/s2912/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex
device lapic 0 on end # Local APIC of the CPU
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
subsystemid 0x10f1 0x2912 inherit
chip northbridge/amd/amdk8 # Northbridge / RAM controller
device pci 18.0 on end
diff --git a/src/mainboard/tyan/s2912_fam10/devicetree.cb b/src/mainboard/tyan/s2912_fam10/devicetree.cb
index 43bdeb63d..851da920f 100644
--- a/src/mainboard/tyan/s2912_fam10/devicetree.cb
+++ b/src/mainboard/tyan/s2912_fam10/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdfam10/root_complex # Root complex
device lapic 0 on end # Local APIC of the CPU
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
subsystemid 0x10f1 0x2912 inherit
chip northbridge/amd/amdfam10 # Northbridge / RAM controller
device pci 18.0 on end
diff --git a/src/mainboard/tyan/s4880/devicetree.cb b/src/mainboard/tyan/s4880/devicetree.cb
index e1aa23a35..37470d829 100644
--- a/src/mainboard/tyan/s4880/devicetree.cb
+++ b/src/mainboard/tyan/s4880/devicetree.cb
@@ -5,7 +5,7 @@ chip northbridge/amd/amdk8/root_complex
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x10f1 0x4880 inherit
chip northbridge/amd/amdk8
device pci 18.0 on end # LDT0
@@ -94,6 +94,6 @@ chip northbridge/amd/amdk8/root_complex
device pci 18.3 on end
end
- end #pci_domain
+ end #domain
end
diff --git a/src/mainboard/tyan/s4882/devicetree.cb b/src/mainboard/tyan/s4882/devicetree.cb
index 767def9ac..eaf2e57b0 100644
--- a/src/mainboard/tyan/s4882/devicetree.cb
+++ b/src/mainboard/tyan/s4882/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/amd/amdk8/root_complex
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x10f1 0x4882 inherit
chip northbridge/amd/amdk8
device pci 18.0 on end # LDT0
diff --git a/src/mainboard/tyan/s8226/devicetree.cb b/src/mainboard/tyan/s8226/devicetree.cb
index a057f027e..ce367a83d 100644
--- a/src/mainboard/tyan/s8226/devicetree.cb
+++ b/src/mainboard/tyan/s8226/devicetree.cb
@@ -22,7 +22,7 @@ chip northbridge/amd/agesa/family15/root_complex
device lapic 0x10 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
subsystemid 0x15d9 0xab11 inherit #Tyan
chip northbridge/amd/agesa/family15 # CPU side of HT root complex
device pci 18.0 on # Put IO-HUB at link_num 0, Instead of HT Link topology
@@ -122,6 +122,6 @@ chip northbridge/amd/agesa/family15/root_complex
device pci 18.4 on end
device pci 18.5 on end #f15
end #chip northbridge/amd/agesa/family15 # CPU side of HT root complex
- end #pci_domain
+ end #domain
end #northbridge/amd/agesa/family15/root_complex
diff --git a/src/mainboard/via/epia-cn/devicetree.cb b/src/mainboard/via/epia-cn/devicetree.cb
index 96a2222d5..041bc408f 100644
--- a/src/mainboard/via/epia-cn/devicetree.cb
+++ b/src/mainboard/via/epia-cn/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/via/cn700 # Northbridge
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
device pci 0.0 on end # AGP Bridge
device pci 0.1 on end # Error Reporting
device pci 0.2 on end # Host Bus Control
diff --git a/src/mainboard/via/epia-m/devicetree.cb b/src/mainboard/via/epia-m/devicetree.cb
index 3db72eefd..eae67c36f 100644
--- a/src/mainboard/via/epia-m/devicetree.cb
+++ b/src/mainboard/via/epia-m/devicetree.cb
@@ -6,7 +6,7 @@ chip northbridge/via/vt8623
end
end
- device pci_domain 0 on
+ device domain 0 on
device pci 0.0 on end
device pci 1.0 on end
diff --git a/src/mainboard/via/epia-m700/devicetree.cb b/src/mainboard/via/epia-m700/devicetree.cb
index a687f0960..55c7cdf28 100644
--- a/src/mainboard/via/epia-m700/devicetree.cb
+++ b/src/mainboard/via/epia-m700/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/via/vx800 # Northbridge
- device pci_domain 0 on
+ device domain 0 on
device pci 0.0 on end # AGP Bridge
device pci 0.1 on end # Error Reporting
device pci 0.2 on end # Host Bus Control
diff --git a/src/mainboard/via/epia-n/devicetree.cb b/src/mainboard/via/epia-n/devicetree.cb
index 3505374aa..d0117ef5e 100644
--- a/src/mainboard/via/epia-n/devicetree.cb
+++ b/src/mainboard/via/epia-n/devicetree.cb
@@ -27,7 +27,7 @@ chip northbridge/via/cn400 # Northbridge
end
end
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
device pci 0.0 on end # AGP Bridge
device pci 0.1 on end # Error Reporting
device pci 0.2 on end # Host Bus Control
diff --git a/src/mainboard/via/epia/devicetree.cb b/src/mainboard/via/epia/devicetree.cb
index c906074a0..b0acb3a59 100644
--- a/src/mainboard/via/epia/devicetree.cb
+++ b/src/mainboard/via/epia/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/via/vt8601
- device pci_domain 0 on
+ device domain 0 on
device pci 0.0 on end # Northbridge
# device pci 0.1 on # AGP bridge
# device pci 0.0 on end # Integrated VGA
diff --git a/src/mainboard/via/pc2500e/devicetree.cb b/src/mainboard/via/pc2500e/devicetree.cb
index bb3ddcc96..34a673b6d 100644
--- a/src/mainboard/via/pc2500e/devicetree.cb
+++ b/src/mainboard/via/pc2500e/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/via/cn700 # Northbridge
- device pci_domain 0 on # PCI domain
+ device domain 0 on # PCI domain
subsystemid 0x1019 0xaa51 inherit
device pci 0.0 on end # AGP Bridge
device pci 0.1 on end # Error Reporting
diff --git a/src/mainboard/via/vt8454c/devicetree.cb b/src/mainboard/via/vt8454c/devicetree.cb
index ab09071a1..5268b17dd 100644
--- a/src/mainboard/via/vt8454c/devicetree.cb
+++ b/src/mainboard/via/vt8454c/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/via/cx700
device lapic 0 on end
end
end
- device pci_domain 0 on
+ device domain 0 on
device pci 0.0 on end # AGP Bridge
device pci 0.1 on end # Error Reporting
device pci 0.2 on end # Host Bus Control
diff --git a/src/mainboard/winent/pl6064/devicetree.cb b/src/mainboard/winent/pl6064/devicetree.cb
index 82fd21ee4..868210909 100644
--- a/src/mainboard/winent/pl6064/devicetree.cb
+++ b/src/mainboard/winent/pl6064/devicetree.cb
@@ -1,5 +1,5 @@
chip northbridge/amd/lx
- device pci_domain 0 on
+ device domain 0 on
device pci 1.0 on end # Northbridge
device pci 1.1 on end # Graphics
chip southbridge/amd/cs5536
diff --git a/src/mainboard/wyse/s50/devicetree.cb b/src/mainboard/wyse/s50/devicetree.cb
index cb30e4396..9055ef666 100644
--- a/src/mainboard/wyse/s50/devicetree.cb
+++ b/src/mainboard/wyse/s50/devicetree.cb
@@ -20,7 +20,7 @@
##
chip northbridge/amd/gx2
- device pci_domain 0 on
+ device domain 0 on
device pci 1.0 on end # Geode GX2 Host Bridge
device pci 1.1 on end # Geode GX2 Graphics Processor
chip southbridge/amd/cs5536
diff --git a/src/northbridge/amd/agesa/family10/northbridge.c b/src/northbridge/amd/agesa/family10/northbridge.c
index c5d570a3e..59a12f174 100644
--- a/src/northbridge/amd/agesa/family10/northbridge.c
+++ b/src/northbridge/amd/agesa/family10/northbridge.c
@@ -1244,7 +1244,7 @@ static u32 cpu_bus_scan(device_t dev, u32 max)
if (dev_mc && dev_mc->bus) {
printk(BIOS_DEBUG, "%s found", dev_path(dev_mc));
pci_domain = dev_mc->bus->dev;
- if (pci_domain && (pci_domain->path.type == DEVICE_PATH_PCI_DOMAIN)) {
+ if (pci_domain && (pci_domain->path.type == DEVICE_PATH_DOMAIN)) {
printk(BIOS_DEBUG, "\n%s move to ",dev_path(dev_mc));
dev_mc->bus->secondary = CONFIG_CBB; // move to 0xff
printk(BIOS_DEBUG, "%s",dev_path(dev_mc));
@@ -1260,7 +1260,7 @@ static u32 cpu_bus_scan(device_t dev, u32 max)
if (dev_mc && dev_mc->bus) {
printk(BIOS_DEBUG, "%s found\n", dev_path(dev_mc));
pci_domain = dev_mc->bus->dev;
- if (pci_domain && (pci_domain->path.type == DEVICE_PATH_PCI_DOMAIN)) {
+ if (pci_domain && (pci_domain->path.type == DEVICE_PATH_DOMAIN)) {
if ((pci_domain->link_list) && (pci_domain->link_list->children == dev_mc)) {
printk(BIOS_DEBUG, "%s move to ",dev_path(dev_mc));
dev_mc->bus->secondary = CONFIG_CBB; // move to 0xff
@@ -1446,7 +1446,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_PCI_DOMAIN) {
+ if (dev->path.type == DEVICE_PATH_DOMAIN) {
dev->ops = &pci_domain_ops;
}
else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) {
diff --git a/src/northbridge/amd/agesa/family12/northbridge.c b/src/northbridge/amd/agesa/family12/northbridge.c
index 9c598e85a..e860594b6 100644
--- a/src/northbridge/amd/agesa/family12/northbridge.c
+++ b/src/northbridge/amd/agesa/family12/northbridge.c
@@ -921,7 +921,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_PCI_DOMAIN) {
+ if (dev->path.type == DEVICE_PATH_DOMAIN) {
dev->ops = &pci_domain_ops;
}
else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) {
diff --git a/src/northbridge/amd/agesa/family14/northbridge.c b/src/northbridge/amd/agesa/family14/northbridge.c
index 3d0b97f60..d955bcf66 100644
--- a/src/northbridge/amd/agesa/family14/northbridge.c
+++ b/src/northbridge/amd/agesa/family14/northbridge.c
@@ -345,7 +345,7 @@ static void nb_read_resources(device_t dev)
}
/*
- * This MMCONF resource must be reserved in the PCI_DOMAIN.
+ * 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.
*/
@@ -908,7 +908,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_PCI_DOMAIN) {
+ if (dev->path.type == DEVICE_PATH_DOMAIN) {
dev->ops = &pci_domain_ops;
} else if (dev->path.type == DEVICE_PATH_APIC_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 1ac7e616f..769d473c8 100644
--- a/src/northbridge/amd/agesa/family15/northbridge.c
+++ b/src/northbridge/amd/agesa/family15/northbridge.c
@@ -343,7 +343,7 @@ static void nb_read_resources(device_t dev)
}
/*
- * This MMCONF resource must be reserved in the PCI_DOMAIN.
+ * 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.
*/
@@ -938,7 +938,7 @@ static u32 cpu_bus_scan(device_t dev, u32 max)
if (dev_mc && dev_mc->bus) {
printk(BIOS_DEBUG, "%s found", dev_path(dev_mc));
pci_domain = dev_mc->bus->dev;
- if (pci_domain && (pci_domain->path.type == DEVICE_PATH_PCI_DOMAIN)) {
+ if (pci_domain && (pci_domain->path.type == DEVICE_PATH_DOMAIN)) {
printk(BIOS_DEBUG, "\n%s move to ",dev_path(dev_mc));
dev_mc->bus->secondary = CONFIG_CBB; // move to 0xff
printk(BIOS_DEBUG, "%s",dev_path(dev_mc));
@@ -953,7 +953,7 @@ static u32 cpu_bus_scan(device_t dev, u32 max)
if (dev_mc && dev_mc->bus) {
printk(BIOS_DEBUG, "%s found\n", dev_path(dev_mc));
pci_domain = dev_mc->bus->dev;
- if (pci_domain && (pci_domain->path.type == DEVICE_PATH_PCI_DOMAIN)) {
+ if (pci_domain && (pci_domain->path.type == DEVICE_PATH_DOMAIN)) {
if ((pci_domain->link_list) && (pci_domain->link_list->children == dev_mc)) {
printk(BIOS_DEBUG, "%s move to ",dev_path(dev_mc));
dev_mc->bus->secondary = CONFIG_CBB; // move to 0xff
@@ -1143,7 +1143,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_PCI_DOMAIN) {
+ if (dev->path.type == DEVICE_PATH_DOMAIN) {
dev->ops = &pci_domain_ops;
} else if (dev->path.type == DEVICE_PATH_APIC_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 2ff5c1a9b..41c2d8e50 100644
--- a/src/northbridge/amd/agesa/family15tn/northbridge.c
+++ b/src/northbridge/amd/agesa/family15tn/northbridge.c
@@ -339,7 +339,7 @@ static void nb_read_resources(device_t dev)
}
/*
- * This MMCONF resource must be reserved in the PCI_DOMAIN.
+ * 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.
*/
@@ -922,7 +922,7 @@ static u32 cpu_bus_scan(device_t dev, u32 max)
if (dev_mc && dev_mc->bus) {
printk(BIOS_DEBUG, "%s found", dev_path(dev_mc));
pci_domain = dev_mc->bus->dev;
- if (pci_domain && (pci_domain->path.type == DEVICE_PATH_PCI_DOMAIN)) {
+ if (pci_domain && (pci_domain->path.type == DEVICE_PATH_DOMAIN)) {
printk(BIOS_DEBUG, "\n%s move to ",dev_path(dev_mc));
dev_mc->bus->secondary = CONFIG_CBB; // move to 0xff
printk(BIOS_DEBUG, "%s",dev_path(dev_mc));
@@ -937,7 +937,7 @@ static u32 cpu_bus_scan(device_t dev, u32 max)
if (dev_mc && dev_mc->bus) {
printk(BIOS_DEBUG, "%s found\n", dev_path(dev_mc));
pci_domain = dev_mc->bus->dev;
- if (pci_domain && (pci_domain->path.type == DEVICE_PATH_PCI_DOMAIN)) {
+ if (pci_domain && (pci_domain->path.type == DEVICE_PATH_DOMAIN)) {
if ((pci_domain->link_list) && (pci_domain->link_list->children == dev_mc)) {
printk(BIOS_DEBUG, "%s move to ",dev_path(dev_mc));
dev_mc->bus->secondary = CONFIG_CBB; // move to 0xff
@@ -1123,7 +1123,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_PCI_DOMAIN) {
+ if (dev->path.type == DEVICE_PATH_DOMAIN) {
dev->ops = &pci_domain_ops;
} else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) {
dev->ops = &cpu_bus_ops;
diff --git a/src/northbridge/amd/amdfam10/northbridge.c b/src/northbridge/amd/amdfam10/northbridge.c
index 77dd13894..3b1e1f50a 100644
--- a/src/northbridge/amd/amdfam10/northbridge.c
+++ b/src/northbridge/amd/amdfam10/northbridge.c
@@ -1280,7 +1280,7 @@ static u32 cpu_bus_scan(device_t dev, u32 max)
if(dev_mc && dev_mc->bus) {
printk(BIOS_DEBUG, "%s found", dev_path(dev_mc));
pci_domain = dev_mc->bus->dev;
- if(pci_domain && (pci_domain->path.type == DEVICE_PATH_PCI_DOMAIN)) {
+ if(pci_domain && (pci_domain->path.type == DEVICE_PATH_DOMAIN)) {
printk(BIOS_DEBUG, "\n%s move to ",dev_path(dev_mc));
dev_mc->bus->secondary = CONFIG_CBB; // move to 0xff
printk(BIOS_DEBUG, "%s",dev_path(dev_mc));
@@ -1296,7 +1296,7 @@ static u32 cpu_bus_scan(device_t dev, u32 max)
if (dev_mc && dev_mc->bus) {
printk(BIOS_DEBUG, "%s found\n", dev_path(dev_mc));
pci_domain = dev_mc->bus->dev;
- if(pci_domain && (pci_domain->path.type == DEVICE_PATH_PCI_DOMAIN)) {
+ if(pci_domain && (pci_domain->path.type == DEVICE_PATH_DOMAIN)) {
if((pci_domain->link_list) && (pci_domain->link_list->children == dev_mc)) {
printk(BIOS_DEBUG, "%s move to ",dev_path(dev_mc));
dev_mc->bus->secondary = CONFIG_CBB; // move to 0xff
@@ -1469,7 +1469,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_PCI_DOMAIN) {
+ if (dev->path.type == DEVICE_PATH_DOMAIN) {
dev->ops = &pci_domain_ops;
}
else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) {
diff --git a/src/northbridge/amd/amdk8/northbridge.c b/src/northbridge/amd/amdk8/northbridge.c
index 2f3d77849..c5859f003 100644
--- a/src/northbridge/amd/amdk8/northbridge.c
+++ b/src/northbridge/amd/amdk8/northbridge.c
@@ -1355,7 +1355,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_PCI_DOMAIN) {
+ if (dev->path.type == DEVICE_PATH_DOMAIN) {
dev->ops = &pci_domain_ops;
}
else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) {
diff --git a/src/northbridge/amd/gx1/northbridge.c b/src/northbridge/amd/gx1/northbridge.c
index 83b84e373..8df0427f7 100644
--- a/src/northbridge/amd/gx1/northbridge.c
+++ b/src/northbridge/amd/gx1/northbridge.c
@@ -154,8 +154,8 @@ static void enable_dev(struct device *dev)
{
printk(BIOS_SPEW, "%s:%s()\n", NORTHBRIDGE_FILE, __func__);
/* Set the operations if it is a special bus type */
- if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) {
- printk(BIOS_SPEW, "DEVICE_PATH_PCI_DOMAIN\n");
+ if (dev->path.type == DEVICE_PATH_DOMAIN) {
+ printk(BIOS_SPEW, "DEVICE_PATH_DOMAIN\n");
dev->ops = &pci_domain_ops;
pci_set_method(dev);
}
diff --git a/src/northbridge/amd/gx2/northbridge.c b/src/northbridge/amd/gx2/northbridge.c
index 80bcdf611..8b8ef719e 100644
--- a/src/northbridge/amd/gx2/northbridge.c
+++ b/src/northbridge/amd/gx2/northbridge.c
@@ -349,7 +349,7 @@ static void enable_dev(struct device *dev)
__func__, dev->path.type);
/* Set the operations if it is a special bus type */
- if (dev->path.type == DEVICE_PATH_PCI_DOMAIN)
+ if (dev->path.type == DEVICE_PATH_DOMAIN)
dev->ops = &pci_domain_ops;
else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER)
dev->ops = &cpu_bus_ops;
diff --git a/src/northbridge/amd/lx/northbridge.c b/src/northbridge/amd/lx/northbridge.c
index aaaf46b20..26b488448 100644
--- a/src/northbridge/amd/lx/northbridge.c
+++ b/src/northbridge/amd/lx/northbridge.c
@@ -453,7 +453,7 @@ static void enable_dev(struct device *dev)
__func__, dev->path.type);
/* Set the operations if it is a special bus type */
- if (dev->path.type == DEVICE_PATH_PCI_DOMAIN)
+ if (dev->path.type == DEVICE_PATH_DOMAIN)
dev->ops = &pci_domain_ops;
else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER)
dev->ops = &cpu_bus_ops;
diff --git a/src/northbridge/intel/e7501/northbridge.c b/src/northbridge/intel/e7501/northbridge.c
index e7d7d5ddf..60929aa03 100644
--- a/src/northbridge/intel/e7501/northbridge.c
+++ b/src/northbridge/intel/e7501/northbridge.c
@@ -125,7 +125,7 @@ static struct device_operations cpu_bus_ops = {
static void enable_dev(struct device *dev)
{
/* Set the operations if it is a special bus type */
- if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) {
+ if (dev->path.type == DEVICE_PATH_DOMAIN) {
dev->ops = &pci_domain_ops;
}
else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) {
diff --git a/src/northbridge/intel/e7505/northbridge.c b/src/northbridge/intel/e7505/northbridge.c
index db0ece251..00b8f5783 100644
--- a/src/northbridge/intel/e7505/northbridge.c
+++ b/src/northbridge/intel/e7505/northbridge.c
@@ -137,7 +137,7 @@ static struct device_operations cpu_bus_ops = {
static void enable_dev(struct device *dev)
{
/* Set the operations if it is a special bus type */
- if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) {
+ if (dev->path.type == DEVICE_PATH_DOMAIN) {
dev->ops = &pci_domain_ops;
}
else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) {
diff --git a/src/northbridge/intel/e7520/northbridge.c b/src/northbridge/intel/e7520/northbridge.c
index 962e8cdda..536ceba59 100644
--- a/src/northbridge/intel/e7520/northbridge.c
+++ b/src/northbridge/intel/e7520/northbridge.c
@@ -200,7 +200,7 @@ static struct device_operations cpu_bus_ops = {
static void enable_dev(device_t dev)
{
/* Set the operations if it is a special bus type */
- if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) {
+ if (dev->path.type == DEVICE_PATH_DOMAIN) {
dev->ops = &pci_domain_ops;
}
else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) {
diff --git a/src/northbridge/intel/e7525/northbridge.c b/src/northbridge/intel/e7525/northbridge.c
index ceb7afa7c..f854913a5 100644
--- a/src/northbridge/intel/e7525/northbridge.c
+++ b/src/northbridge/intel/e7525/northbridge.c
@@ -200,7 +200,7 @@ static struct device_operations cpu_bus_ops = {
static void enable_dev(device_t dev)
{
/* Set the operations if it is a special bus type */
- if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) {
+ if (dev->path.type == DEVICE_PATH_DOMAIN) {
dev->ops = &pci_domain_ops;
}
else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) {
diff --git a/src/northbridge/intel/gm45/northbridge.c b/src/northbridge/intel/gm45/northbridge.c
index 1839ec63e..e1e2b92e0 100644
--- a/src/northbridge/intel/gm45/northbridge.c
+++ b/src/northbridge/intel/gm45/northbridge.c
@@ -233,7 +233,7 @@ static struct device_operations cpu_bus_ops = {
static void enable_dev(device_t dev)
{
/* Set the operations if it is a special bus type */
- if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) {
+ if (dev->path.type == DEVICE_PATH_DOMAIN) {
dev->ops = &pci_domain_ops;
} else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) {
dev->ops = &cpu_bus_ops;
diff --git a/src/northbridge/intel/i3100/northbridge.c b/src/northbridge/intel/i3100/northbridge.c
index d90d0b52e..ee8d5364b 100644
--- a/src/northbridge/intel/i3100/northbridge.c
+++ b/src/northbridge/intel/i3100/northbridge.c
@@ -221,7 +221,7 @@ static struct device_operations cpu_bus_ops = {
static void enable_dev(device_t dev)
{
/* Set the operations if it is a special bus type */
- if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) {
+ if (dev->path.type == DEVICE_PATH_DOMAIN) {
dev->ops = &pci_domain_ops;
}
else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) {
diff --git a/src/northbridge/intel/i440bx/northbridge.c b/src/northbridge/intel/i440bx/northbridge.c
index ccd5e9cf6..5f8bd7b38 100644
--- a/src/northbridge/intel/i440bx/northbridge.c
+++ b/src/northbridge/intel/i440bx/northbridge.c
@@ -107,7 +107,7 @@ static struct device_operations cpu_bus_ops = {
static void enable_dev(struct device *dev)
{
/* Set the operations if it is a special bus type */
- if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) {
+ if (dev->path.type == DEVICE_PATH_DOMAIN) {
dev->ops = &pci_domain_ops;
pci_set_method(dev);
}
diff --git a/src/northbridge/intel/i440lx/northbridge.c b/src/northbridge/intel/i440lx/northbridge.c
index c75a4bbe5..c2c50ce21 100644
--- a/src/northbridge/intel/i440lx/northbridge.c
+++ b/src/northbridge/intel/i440lx/northbridge.c
@@ -136,7 +136,7 @@ static struct device_operations cpu_bus_ops = {
static void enable_dev(struct device *dev)
{
/* Set the operations if it is a special bus type */
- if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) {
+ if (dev->path.type == DEVICE_PATH_DOMAIN) {
dev->ops = &pci_domain_ops;
pci_set_method(dev);
}
diff --git a/src/northbridge/intel/i5000/northbridge.c b/src/northbridge/intel/i5000/northbridge.c
index 071616cf2..01d694531 100644
--- a/src/northbridge/intel/i5000/northbridge.c
+++ b/src/northbridge/intel/i5000/northbridge.c
@@ -183,7 +183,7 @@ static struct device_operations pci_domain_ops = {
static void enable_dev(device_t dev)
{
/* Set the operations if it is a special bus type */
- if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) {
+ if (dev->path.type == DEVICE_PATH_DOMAIN) {
dev->ops = &pci_domain_ops;
} else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) {
dev->ops = &cpu_bus_ops;
diff --git a/src/northbridge/intel/i82810/northbridge.c b/src/northbridge/intel/i82810/northbridge.c
index ed9876fa3..40d8df867 100644
--- a/src/northbridge/intel/i82810/northbridge.c
+++ b/src/northbridge/intel/i82810/northbridge.c
@@ -160,7 +160,7 @@ static struct device_operations cpu_bus_ops = {
static void enable_dev(struct device *dev)
{
/* Set the operations if it is a special bus type */
- if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) {
+ 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) {
diff --git a/src/northbridge/intel/i82830/northbridge.c b/src/northbridge/intel/i82830/northbridge.c
index f2505bd4c..194bacbb1 100644
--- a/src/northbridge/intel/i82830/northbridge.c
+++ b/src/northbridge/intel/i82830/northbridge.c
@@ -129,7 +129,7 @@ static void enable_dev(struct device *dev)
struct device_path;
/* Set the operations if it is a special bus type. */
- if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) {
+ 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) {
diff --git a/src/northbridge/intel/i855/northbridge.c b/src/northbridge/intel/i855/northbridge.c
index b1e150f9b..68fefcae0 100644
--- a/src/northbridge/intel/i855/northbridge.c
+++ b/src/northbridge/intel/i855/northbridge.c
@@ -144,7 +144,7 @@ static struct device_operations cpu_bus_ops = {
static void enable_dev(struct device *dev)
{
/* Set the operations if it is a special bus type */
- if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) {
+ if (dev->path.type == DEVICE_PATH_DOMAIN) {
dev->ops = &pci_domain_ops;
pci_set_method(dev);
}
diff --git a/src/northbridge/intel/i945/northbridge.c b/src/northbridge/intel/i945/northbridge.c
index c6c93e540..ab5048e9d 100644
--- a/src/northbridge/intel/i945/northbridge.c
+++ b/src/northbridge/intel/i945/northbridge.c
@@ -305,7 +305,7 @@ static struct device_operations cpu_bus_ops = {
static void enable_dev(device_t dev)
{
/* Set the operations if it is a special bus type */
- if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) {
+ if (dev->path.type == DEVICE_PATH_DOMAIN) {
dev->ops = &pci_domain_ops;
} else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) {
dev->ops = &cpu_bus_ops;
diff --git a/src/northbridge/intel/sandybridge/northbridge.c b/src/northbridge/intel/sandybridge/northbridge.c
index 8652838ad..0f5492dd6 100644
--- a/src/northbridge/intel/sandybridge/northbridge.c
+++ b/src/northbridge/intel/sandybridge/northbridge.c
@@ -501,7 +501,7 @@ static struct device_operations cpu_bus_ops = {
static void enable_dev(device_t dev)
{
/* Set the operations if it is a special bus type */
- if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) {
+ if (dev->path.type == DEVICE_PATH_DOMAIN) {
dev->ops = &pci_domain_ops;
} else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) {
dev->ops = &cpu_bus_ops;
diff --git a/src/northbridge/intel/sch/northbridge.c b/src/northbridge/intel/sch/northbridge.c
index fe5881c8b..33a74b5a1 100644
--- a/src/northbridge/intel/sch/northbridge.c
+++ b/src/northbridge/intel/sch/northbridge.c
@@ -323,7 +323,7 @@ static struct device_operations cpu_bus_ops = {
static void enable_dev(device_t dev)
{
/* Set the operations if it is a special bus type. */
- if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) {
+ if (dev->path.type == DEVICE_PATH_DOMAIN) {
dev->ops = &pci_domain_ops;
} else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) {
dev->ops = &cpu_bus_ops;
diff --git a/src/northbridge/rdc/r8610/northbridge.c b/src/northbridge/rdc/r8610/northbridge.c
index ebcccff7b..622b056c5 100644
--- a/src/northbridge/rdc/r8610/northbridge.c
+++ b/src/northbridge/rdc/r8610/northbridge.c
@@ -121,7 +121,7 @@ static struct device_operations pci_domain_ops = {
static void enable_dev(struct device *dev)
{
/* Set the operations if it is a special bus type */
- if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) {
+ if (dev->path.type == DEVICE_PATH_DOMAIN) {
dev->ops = &pci_domain_ops;
pci_set_method(dev);
}
diff --git a/src/northbridge/via/cn400/northbridge.c b/src/northbridge/via/cn400/northbridge.c
index ab9f08445..d126596ca 100644
--- a/src/northbridge/via/cn400/northbridge.c
+++ b/src/northbridge/via/cn400/northbridge.c
@@ -265,7 +265,7 @@ static void enable_dev(struct device *dev)
printk(BIOS_SPEW, "CN400: enable_dev for device %s.\n", dev_path(dev));
/* Set the operations if it is a special bus type. */
- if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) {
+ 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) {
diff --git a/src/northbridge/via/cn700/northbridge.c b/src/northbridge/via/cn700/northbridge.c
index 86c11a8d5..ec038e069 100644
--- a/src/northbridge/via/cn700/northbridge.c
+++ b/src/northbridge/via/cn700/northbridge.c
@@ -185,7 +185,7 @@ static void enable_dev(struct device *dev)
printk(BIOS_SPEW, "In cn700 enable_dev for device %s.\n", dev_path(dev));
/* Set the operations if it is a special bus type. */
- if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) {
+ 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) {
diff --git a/src/northbridge/via/cx700/northbridge.c b/src/northbridge/via/cx700/northbridge.c
index ce5edf8cb..b1e914069 100644
--- a/src/northbridge/via/cx700/northbridge.c
+++ b/src/northbridge/via/cx700/northbridge.c
@@ -115,7 +115,7 @@ static struct device_operations cpu_bus_ops = {
static void enable_dev(struct device *dev)
{
/* Our wonderful device model */
- if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) {
+ 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) {
diff --git a/src/northbridge/via/vt8601/northbridge.c b/src/northbridge/via/vt8601/northbridge.c
index 950d6838a..1c699ee33 100644
--- a/src/northbridge/via/vt8601/northbridge.c
+++ b/src/northbridge/via/vt8601/northbridge.c
@@ -129,7 +129,7 @@ static struct device_operations cpu_bus_ops = {
static void enable_dev(struct device *dev)
{
/* Set the operations if it is a special bus type */
- if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) {
+ if (dev->path.type == DEVICE_PATH_DOMAIN) {
dev->ops = &pci_domain_ops;
pci_set_method(dev);
}
diff --git a/src/northbridge/via/vt8623/northbridge.c b/src/northbridge/via/vt8623/northbridge.c
index e06115558..782583d94 100644
--- a/src/northbridge/via/vt8623/northbridge.c
+++ b/src/northbridge/via/vt8623/northbridge.c
@@ -191,7 +191,7 @@ static void enable_dev(struct device *dev)
printk(BIOS_SPEW, "In vt8623 enable_dev for device %s.\n", dev_path(dev));
/* Set the operations if it is a special bus type */
- if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) {
+ if (dev->path.type == DEVICE_PATH_DOMAIN) {
dev->ops = &pci_domain_ops;
pci_set_method(dev);
}
diff --git a/src/northbridge/via/vx800/northbridge.c b/src/northbridge/via/vx800/northbridge.c
index 4e0a36dae..1a438b02e 100644
--- a/src/northbridge/via/vx800/northbridge.c
+++ b/src/northbridge/via/vx800/northbridge.c
@@ -163,7 +163,7 @@ static void enable_dev(struct device *dev)
printk(BIOS_SPEW, "In VX800 enable_dev for device %s.\n", dev_path(dev));
/* Set the operations if it is a special bus type */
- if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) {
+ 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) {
diff --git a/src/southbridge/nvidia/ck804/pci.c b/src/southbridge/nvidia/ck804/pci.c
index c29ed100f..51fb7cd26 100644
--- a/src/southbridge/nvidia/ck804/pci.c
+++ b/src/southbridge/nvidia/ck804/pci.c
@@ -52,7 +52,7 @@ static void pci_init(struct device *dev)
pci_domain_dev = dev->bus->dev;
while (pci_domain_dev) {
- if (pci_domain_dev->path.type == DEVICE_PATH_PCI_DOMAIN)
+ if (pci_domain_dev->path.type == DEVICE_PATH_DOMAIN)
break;
pci_domain_dev = pci_domain_dev->bus->dev;
}
diff --git a/src/southbridge/nvidia/mcp55/pci.c b/src/southbridge/nvidia/mcp55/pci.c
index 2ea7daf3d..d2700d17d 100644
--- a/src/southbridge/nvidia/mcp55/pci.c
+++ b/src/southbridge/nvidia/mcp55/pci.c
@@ -58,7 +58,7 @@ static void pci_init(struct device *dev)
pci_domain_dev = dev->bus->dev;
while (pci_domain_dev) {
- if (pci_domain_dev->path.type == DEVICE_PATH_PCI_DOMAIN)
+ if (pci_domain_dev->path.type == DEVICE_PATH_DOMAIN)
break;
pci_domain_dev = pci_domain_dev->bus->dev;
}
diff --git a/util/sconfig/lex.yy.c_shipped b/util/sconfig/lex.yy.c_shipped
index 215da562c..70d6f2e82 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[116] =
+static yyconst flex_int16_t yy_accept[114] =
{ 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, 18, 29, 29, 29, 7, 29, 29, 29, 29,
- 28, 28, 24, 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,
- 13, 29, 29, 29, 5, 29, 10, 29, 29, 29,
- 29, 20, 29, 29, 29, 29, 29, 29, 29, 29,
-
- 6, 29, 29, 29, 29, 29, 19, 29, 15, 29,
- 29, 21, 29, 14, 0
+ 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
} ;
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[121] =
+static yyconst flex_int16_t yy_base[119] =
{ 0,
- 0, 0, 181, 0, 178, 182, 176, 37, 41, 38,
- 141, 0, 44, 163, 54, 58, 61, 45, 159, 53,
- 52, 154, 139, 0, 171, 182, 80, 167, 84, 168,
- 182, 0, 84, 87, 155, 144, 93, 137, 147, 147,
- 141, 147, 132, 132, 139, 0, 135, 129, 135, 139,
- 0, 182, 0, 145, 125, 129, 0, 0, 0, 132,
- 122, 0, 126, 0, 134, 0, 124, 115, 0, 0,
- 128, 114, 120, 125, 123, 109, 103, 119, 114, 119,
- 112, 98, 92, 92, 0, 90, 107, 103, 94, 99,
- 85, 0, 93, 91, 99, 83, 93, 81, 77, 86,
-
- 0, 83, 72, 64, 60, 59, 0, 42, 0, 52,
- 43, 0, 16, 0, 182, 40, 129, 131, 133, 135
+ 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
} ;
-static yyconst flex_int16_t yy_def[121] =
+static yyconst flex_int16_t yy_def[119] =
{ 0,
- 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, 10, 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, 116, 116, 0, 115, 115, 115, 115, 115
+ 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
} ;
-static yyconst flex_int16_t yy_nxt[221] =
+static yyconst flex_int16_t yy_nxt[219] =
{ 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, 114, 33, 33,
- 33, 33, 33, 40, 33, 33, 33, 33, 33, 33,
- 33, 33, 33, 113, 33, 33, 33, 33, 33, 33,
- 47, 112, 41, 42, 45, 111, 43, 36, 37, 48,
- 46, 28, 28, 110, 51, 30, 31, 109, 39, 38,
- 33, 33, 33, 53, 53, 53, 108, 53, 53, 33,
-
- 33, 33, 107, 53, 53, 53, 53, 53, 53, 106,
- 105, 104, 103, 102, 101, 100, 99, 98, 97, 96,
- 95, 94, 93, 92, 91, 90, 89, 88, 56, 27,
- 27, 29, 29, 28, 28, 30, 30, 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, 57, 55, 54,
- 31, 52, 25, 50, 49, 44, 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
+ 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
} ;
-static yyconst flex_int16_t yy_chk[221] =
+static yyconst flex_int16_t yy_chk[219] =
{ 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,
- 116, 8, 9, 9, 10, 10, 10, 113, 10, 10,
- 13, 13, 13, 18, 10, 10, 10, 10, 10, 10,
- 15, 15, 15, 111, 16, 16, 16, 17, 17, 17,
- 21, 110, 18, 18, 20, 108, 18, 15, 16, 21,
- 20, 27, 27, 106, 27, 29, 29, 105, 17, 16,
- 33, 33, 33, 34, 34, 34, 104, 34, 34, 37,
-
- 37, 37, 103, 34, 34, 34, 34, 34, 34, 102,
- 100, 99, 98, 97, 96, 95, 94, 93, 91, 90,
- 89, 88, 87, 86, 84, 83, 82, 81, 37, 117,
- 117, 118, 118, 119, 119, 120, 120, 80, 79, 78,
- 77, 76, 75, 74, 73, 72, 71, 68, 67, 65,
- 63, 61, 60, 56, 55, 54, 50, 49, 48, 47,
- 45, 44, 43, 42, 41, 40, 39, 38, 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
+ 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
} ;
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 >= 116 )
+ if ( yy_current_state >= 114 )
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] != 182 );
+ while ( yy_base[yy_current_state] != 180 );
yy_find_action:
yy_act = yy_accept[yy_current_state];
@@ -888,7 +888,7 @@ YY_RULE_SETUP
YY_BREAK
case 15:
YY_RULE_SETUP
-{yylval.number=PCI_DOMAIN; return(BUS);}
+{yylval.number=DOMAIN; return(BUS);}
YY_BREAK
case 16:
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 >= 116 )
+ if ( yy_current_state >= 114 )
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 >= 116 )
+ if ( yy_current_state >= 114 )
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 == 115);
+ yy_is_jam = (yy_current_state == 113);
return yy_is_jam ? 0 : yy_current_state;
}
diff --git a/util/sconfig/main.c b/util/sconfig/main.c
index 8dfd50c47..d87238f5e 100644
--- a/util/sconfig/main.c
+++ b/util/sconfig/main.c
@@ -266,8 +266,8 @@ struct device *new_device(struct device *parent, struct device *busdev, const in
new_d->path = ".type=DEVICE_PATH_APIC_CLUSTER,{.apic_cluster={ .cluster = 0x%x }}";
break;
- case PCI_DOMAIN:
- new_d->path = ".type=DEVICE_PATH_PCI_DOMAIN,{.pci_domain={ .domain = 0x%x }}";
+ case DOMAIN:
+ new_d->path = ".type=DEVICE_PATH_DOMAIN,{.domain={ .domain = 0x%x }}";
break;
case IOAPIC:
@@ -342,7 +342,7 @@ void add_register(struct device *dev, char *name, char *val) {
void add_pci_subsystem_ids(struct device *dev, int vendor, int device, int inherit)
{
- if (dev->bustype != PCI && dev->bustype != PCI_DOMAIN) {
+ if (dev->bustype != PCI && dev->bustype != DOMAIN) {
printf("ERROR: 'subsystem' only allowed for PCI devices\n");
exit(1);
}
@@ -365,7 +365,7 @@ void add_ioapic_info(struct device *dev, int apicid, const char *_srcpin, int ir
srcpin = _srcpin[3] - 'A';
- if (dev->bustype != PCI && dev->bustype != PCI_DOMAIN) {
+ if (dev->bustype != PCI && dev->bustype != DOMAIN) {
printf("ERROR: ioapic config only allowed for PCI devices\n");
exit(1);
}
@@ -529,7 +529,7 @@ static void inherit_subsystem_ids(FILE *file, struct device *dev)
for(p = dev; p && p != p->parent; p = p->parent) {
- if (p->bustype != PCI && p->bustype != PCI_DOMAIN)
+ if (p->bustype != PCI && p->bustype != DOMAIN)
continue;
if (p->inherit_subsystem) {
diff --git a/util/sconfig/sconfig.l b/util/sconfig/sconfig.l
index 3f3ac5c87..48561717f 100755
--- a/util/sconfig/sconfig.l
+++ b/util/sconfig/sconfig.l
@@ -39,7 +39,7 @@ 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);}
-pci_domain {yylval.number=PCI_DOMAIN; return(BUS);}
+domain {yylval.number=DOMAIN; return(BUS);}
irq {yylval.number=IRQ; return(RESOURCE);}
drq {yylval.number=DRQ; return(RESOURCE);}
io {yylval.number=IO; return(RESOURCE);}
diff --git a/util/sconfig/sconfig.tab.c_shipped b/util/sconfig/sconfig.tab.c_shipped
index 170ae7439..7fa6988b5 100644
--- a/util/sconfig/sconfig.tab.c_shipped
+++ b/util/sconfig/sconfig.tab.c_shipped
@@ -133,7 +133,7 @@ static struct device *cur_parent, *cur_bus;
I2C = 270,
APIC = 271,
APIC_CLUSTER = 272,
- PCI_DOMAIN = 273,
+ DOMAIN = 273,
IRQ = 274,
DRQ = 275,
IO = 276,
@@ -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", "PCI_DOMAIN", "IRQ", "DRQ", "IO", "NUMBER",
+ "APIC", "APIC_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 3b45778f6..e1257f94b 100644
--- a/util/sconfig/sconfig.tab.h_shipped
+++ b/util/sconfig/sconfig.tab.h_shipped
@@ -52,7 +52,7 @@
I2C = 270,
APIC = 271,
APIC_CLUSTER = 272,
- PCI_DOMAIN = 273,
+ DOMAIN = 273,
IRQ = 274,
DRQ = 275,
IO = 276,
diff --git a/util/sconfig/sconfig.y b/util/sconfig/sconfig.y
index 12573a7d2..9a133a784 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 PCI_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 APIC_CLUSTER DOMAIN IRQ DRQ IO NUMBER SUBSYSTEMID INHERIT IOAPIC_IRQ IOAPIC PCIINT
%%
devtree: { cur_parent = cur_bus = head; } chip { postprocess_devtree(); } ;