Change in coreboot[master]: util/sconfig: Move default includes out of emit_chips()

[Nico Huber (Code Review)]

Hello Furquan Shaikh, Patrick Georgi, Angel Pons, Arthur Heymans, Kyösti Mälkki, Aaron Durbin,

I'd like you to do a code review. Please visit

https://review.coreboot.org/c/coreboot/+/41744

to review the following change.

Change subject: util/sconfig: Move default includes out of emit_chips()
......................................................................

util/sconfig: Move default includes out of emit_chips()

This should make it easier to add more includes.

Change-Id: Ib4a25352901408c2b36de4972391df742a0d8037
Signed-off-by: Nico Huber 
---
M util/sconfig/main.c
1 file changed, 3 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/44/41744/1

diff --git a/util/sconfig/main.c b/util/sconfig/main.c
index 3e3bd17..0d8f7f8 100644
--- a/util/sconfig/main.c
+++ b/util/sconfig/main.c
@@ -889,9 +889,6 @@
 {
    struct chip *tmp = chip;

-	fprintf(fil, "#include <device/device.h>\n");
-	fprintf(fil, "#include <device/pci.h>\n");
-
    while (chip) {
    	if (chip->chiph_exists)
    		fprintf(fil, "#include "%s/chip.h"\n", chip->name);
@@ -1347,6 +1344,9 @@
    fprintf(autohead, "#define __STATIC_DEVICE_TREE_H\n\n");
    fprintf(autohead, "#include <device/device.h>\n\n");

+	fprintf(autogen, "#include <device/device.h>\n");
+	fprintf(autogen, "#include <device/pci.h>\n\n");
+
    emit_chips(autogen);

walk_device_tree(autogen, autohead, &base_root_dev, inherit_subsystem_ids);

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41744 )

Change subject: util/sconfig: Move default includes out of emit_chips()
......................................................................

Patch Set 3: Code-Review+1

[Aaron Durbin (Code Review)]

Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41744 )

Change subject: util/sconfig: Move default includes out of emit_chips()
......................................................................

Patch Set 3: Code-Review+2

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/41744 )

Change subject: util/sconfig: Move default includes out of emit_chips()
......................................................................

util/sconfig: Move default includes out of emit_chips()

This should make it easier to add more includes.

Change-Id: Ib4a25352901408c2b36de4972391df742a0d8037
Signed-off-by: Nico Huber 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/41744
Reviewed-by: Angel Pons 
Reviewed-by: Aaron Durbin 
Tested-by: build bot (Jenkins) 
---
M util/sconfig/main.c
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Aaron Durbin: Looks good to me, approved
  Angel Pons: Looks good to me, but someone else must approve

diff --git a/util/sconfig/main.c b/util/sconfig/main.c
index 3e3bd17..0d8f7f8 100644
--- a/util/sconfig/main.c
+++ b/util/sconfig/main.c
@@ -889,9 +889,6 @@
 {
    struct chip *tmp = chip;

-	fprintf(fil, "#include <device/device.h>\n");
-	fprintf(fil, "#include <device/pci.h>\n");
-
    while (chip) {
    	if (chip->chiph_exists)
    		fprintf(fil, "#include "%s/chip.h"\n", chip->name);
@@ -1347,6 +1344,9 @@
    fprintf(autohead, "#define __STATIC_DEVICE_TREE_H\n\n");
    fprintf(autohead, "#include <device/device.h>\n\n");

+	fprintf(autogen, "#include <device/device.h>\n");
+	fprintf(autogen, "#include <device/pci.h>\n\n");
+
    emit_chips(autogen);

walk_device_tree(autogen, autohead, &base_root_dev, inherit_subsystem_ids);

[9elements QA (Code Review)]

9elements QA has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41744 )

Change subject: util/sconfig: Move default includes out of emit_chips()
......................................................................

Patch Set 4:

Automatic boot test returned (PASS/FAIL/TOTAL): 4/0/4
Emulation targets:
"QEMU x86 q35/ich9" using payload TianoCore : SUCCESS : https://lava.9esec.io/r/4544
"QEMU x86 q35/ich9" using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/4543
"QEMU x86 i440fx/piix4" using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/4542
"QEMU AArch64" using payload LinuxBoot_u-root_kexec : SUCCESS : https://lava.9esec.io/r/4541

Please note: This test is under development and might not be accurate at all!