GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util/sconfig: Get rid of nextdev member in struct device 

Now that chips and devices are treated differently and the device tree
actually contains only devices, next and nextdev are exactly the same
for all devices in the tree. This change gets rid of nextdev pointer
and updates all uses of nextdev to next.

BUG=b:80081934
TEST=Verified that static.c generated for all boards built by abuild
is same with and without this change.

Change-Id: Ie50b3d769a78fe0beddba2e5551441b43cb212a2
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://review.coreboot.org/26741
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Furquan Shaikh 2018-05-31 11:03:17 -07:00
parent c56ae2ffa1
commit b72ab9e4d7
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
util/sconfig/main.c
View File

@ -20,7 +20,7 @@
extern int linenum; extern int linenum;
struct device *head, *lastdev; struct device *head, *lastnode;
static struct chip chip_header; static struct chip chip_header;
@ -185,9 +185,9 @@ void postprocess_devtree(void)
/* skip functions of the same device in sibling chain */ /* skip functions of the same device in sibling chain */
while (dev->sibling && dev->sibling->used) while (dev->sibling && dev->sibling->used)
dev->sibling = dev->sibling->sibling; dev->sibling = dev->sibling->sibling;
/* skip duplicate function elements in nextdev chain */ /* skip duplicate function elements in next chain */
while (dev->nextdev && dev->nextdev->used) while (dev->next && dev->next->used)
dev->nextdev = dev->nextdev->nextdev; dev->next = dev->next->next;
dev = dev->next_sibling; dev = dev->next_sibling;
} }
} }
@ -304,8 +304,8 @@ struct device *new_device(struct device *parent,
if (!parent->children) if (!parent->children)
parent->children = new_d; parent->children = new_d;
lastdev->nextdev = new_d; lastnode->next = new_d;
lastdev = new_d; lastnode = new_d;
switch (bustype) { switch (bustype) {
case PCI: case PCI:
@ -547,8 +547,8 @@ static void pass1(FILE *fil, struct device *ptr)
if (chip_ins->chip->chiph_exists) if (chip_ins->chip->chiph_exists)
fprintf(fil, "\t.chip_info = &%s_info_%d,\n", fprintf(fil, "\t.chip_info = &%s_info_%d,\n",
chip_ins->chip->name_underscore, chip_ins->id); chip_ins->chip->name_underscore, chip_ins->id);
if (ptr->nextdev) if (ptr->next)
fprintf(fil, "\t.next=&%s\n", ptr->nextdev->name); fprintf(fil, "\t.next=&%s\n", ptr->next->name);
fprintf(fil, "};\n"); fprintf(fil, "};\n");
} }
if (ptr->rescnt > 0) { if (ptr->rescnt > 0) {
@ -744,7 +744,7 @@ int main(int argc, char **argv)
yyrestart(filec); yyrestart(filec);
lastdev = head = &root; lastnode = head = &root;
yyparse(); yyparse();
@ -765,7 +765,7 @@ int main(int argc, char **argv)
walk_device_tree(autogen, &root, pass0, NULL); walk_device_tree(autogen, &root, pass0, NULL);
fprintf(autogen, "\n/* pass 1 */\n" fprintf(autogen, "\n/* pass 1 */\n"
"DEVTREE_CONST struct device * DEVTREE_CONST last_dev = &%s;\n", "DEVTREE_CONST struct device * DEVTREE_CONST last_dev = &%s;\n",
lastdev->name); lastnode->name);
walk_device_tree(autogen, &root, pass1, NULL); walk_device_tree(autogen, &root, pass1, NULL);
fclose(autogen); fclose(autogen);

1
util/sconfig/sconfig.h
View File

@ -98,7 +98,6 @@ struct device {
struct device *parent; struct device *parent;
struct device *next; struct device *next;
struct device *nextdev;
struct device *children; struct device *children;
struct device *latestchild; struct device *latestchild;
struct device *next_sibling; struct device *next_sibling;