Mariusz Szafrański has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/51180 )
Change subject: util/sconfig: Fix for multidomain support sconfig/devicetree.cb ......................................................................
util/sconfig: Fix for multidomain support sconfig/devicetree.cb
Fixes sconfig related build errors while there exists DEV.FUNC number shared by two devices from different domains (root buses) i.e. device domain 0 on device pci 00.0 on end ....... end device domain 1 on device pci 00.0 on end ....... end Two domains (each with it`s own root PCI bus) and device with 00.0 exists on both buses.
Change-Id: Idd639d0cb3ed1a49ed7c7b1c77ac747ba6f77672 Signed-off-by: Mariusz Szafranski mariuszx.szafranski@intel.com --- M util/sconfig/main.c 1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/51180/1
diff --git a/util/sconfig/main.c b/util/sconfig/main.c index 91407bc..5df8b94 100644 --- a/util/sconfig/main.c +++ b/util/sconfig/main.c @@ -1219,10 +1219,10 @@
/* Only devices on root bus here. */ if (ptr->bustype == PCI && ptr->parent->dev->bustype == DOMAIN) { - fprintf(head, "extern DEVTREE_CONST struct device *const __pci_0_%02x_%d;\n", - ptr->path_a, ptr->path_b); - fprintf(fil, "DEVTREE_CONST struct device *const __pci_0_%02x_%d = &%s;\n", - ptr->path_a, ptr->path_b, ptr->name); + fprintf(head, "extern DEVTREE_CONST struct device *DEVTREE_CONST __pci_%d_%02x_%d;\n", + ptr->parent->dev->path_a, ptr->path_a, ptr->path_b); + fprintf(fil, "DEVTREE_CONST struct device *DEVTREE_CONST __pci_%d_%02x_%d = &%s;\n", + ptr->parent->dev->path_a, ptr->path_a, ptr->path_b, ptr->name);
if (chip_ins->chip->chiph_exists) { fprintf(head, "extern DEVTREE_CONST void *const __pci_0_%02x_%d_config;\n",