Change in coreboot[master]: sconfig: Add function for parse+override of tree

List overview All Threads
Download

newer

older

Change in coreboot[master]:...

Duncan Laurie (Code Review)

30 Jul 2020 30 Jul '20

1:36 a.m.

Duncan Laurie has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/44036 )

Change subject: sconfig: Add function for parse+override of tree ......................................................................

sconfig: Add function for parse+override of tree

Extract the steps to parse and override a devicetree into a function so it can be used multiple times without copying the same logic.

Change-Id: I4e496a223757beb22e3bd678eb6115968bd32529 Signed-off-by: Duncan Laurie dlaurie@google.com --- M util/sconfig/main.c 1 file changed, 14 insertions(+), 10 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/36/44036/1

diff --git a/util/sconfig/main.c b/util/sconfig/main.c index 66f9cbf..251aa3f 100644 --- a/util/sconfig/main.c +++ b/util/sconfig/main.c @@ -1666,6 +1666,18 @@ } }

+static void parse_override_devicetree(const char *file, struct device *dev) +{ + parse_devicetree(file, dev->bus); + + if (!dev_has_children(dev)) { + fprintf(stderr, "ERROR: Override tree needs at least one device!\n"); + exit(1); + } + + override_devicetree(&base_root_bus, dev->bus); +} + int main(int argc, char **argv) { static const struct option long_options[] = { @@ -1708,16 +1720,8 @@

parse_devicetree(base_devtree, &base_root_bus);

- if (override_devtree) { - parse_devicetree(override_devtree, &override_root_bus); - - if (!dev_has_children(&override_root_dev)) { - fprintf(stderr, "ERROR: Override tree needs at least one device!\n"); - exit(1); - } - - override_devicetree(&base_root_bus, &override_root_bus); - } + if (override_devtree) + parse_override_devicetree(override_devtree, &override_root_dev);

FILE *autogen = fopen(outputc, "w"); if (!autogen) {

Attachments:

attachment.htm (text/html — 4.6 KB)

Show replies by date

Tim Wawrzynczak (Code Review)

1 Aug 1 Aug

12:38 a.m.

Tim Wawrzynczak has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44036 )

Change subject: sconfig: Add function for parse+override of tree ......................................................................

Patch Set 1: Code-Review+2

-- To view, visit https://review.coreboot.org/c/coreboot/+/44036 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I4e496a223757beb22e3bd678eb6115968bd32529 Gerrit-Change-Number: 44036 Gerrit-PatchSet: 1 Gerrit-Owner: Duncan Laurie dlaurie@chromium.org Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Tim Wawrzynczak twawrzynczak@chromium.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Comment-Date: Fri, 31 Jul 2020 22:38:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

Tim Wawrzynczak (Code Review)

10 Sep 10 Sep

9:26 p.m.

Tim Wawrzynczak has uploaded a new patch set (#4) to the change originally created by Duncan Laurie. ( https://review.coreboot.org/c/coreboot/+/44036 )

Change subject: sconfig: Add function for parse+override of tree ......................................................................

sconfig: Add function for parse+override of tree

Extract the steps to parse and override a devicetree into a function so it can be used multiple times without copying the same logic.

Change-Id: I4e496a223757beb22e3bd678eb6115968bd32529 Signed-off-by: Duncan Laurie dlaurie@google.com --- M util/sconfig/main.c 1 file changed, 18 insertions(+), 14 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/36/44036/4

Angel Pons (Code Review)

18 Sep 18 Sep

8:17 p.m.

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

Change subject: sconfig: Add function for parse+override of tree ......................................................................

Patch Set 5: Code-Review+2

-- To view, visit https://review.coreboot.org/c/coreboot/+/44036 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I4e496a223757beb22e3bd678eb6115968bd32529 Gerrit-Change-Number: 44036 Gerrit-PatchSet: 5 Gerrit-Owner: Duncan Laurie dlaurie@chromium.org Gerrit-Reviewer: Angel Pons th3fanbus@gmail.com Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Nico Huber nico.h@gmx.de Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Tim Wawrzynczak twawrzynczak@chromium.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-Comment-Date: Fri, 18 Sep 2020 18:17:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

Nick Vaccaro (Code Review)

9:16 p.m.

Nick Vaccaro has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44036 )

Change subject: sconfig: Add function for parse+override of tree ......................................................................

Patch Set 5:

This doesn't pick cleanly for me onto chromium coreboot.

-- To view, visit https://review.coreboot.org/c/coreboot/+/44036 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I4e496a223757beb22e3bd678eb6115968bd32529 Gerrit-Change-Number: 44036 Gerrit-PatchSet: 5 Gerrit-Owner: Duncan Laurie dlaurie@chromium.org Gerrit-Reviewer: Angel Pons th3fanbus@gmail.com Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Nico Huber nico.h@gmx.de Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Tim Wawrzynczak twawrzynczak@chromium.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-CC: Nick Vaccaro nvaccaro@google.com Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-Comment-Date: Fri, 18 Sep 2020 19:16:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

Nick Vaccaro (Code Review)

10 p.m.

Nick Vaccaro has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44036 )

Change subject: sconfig: Add function for parse+override of tree ......................................................................

Patch Set 5: Code-Review+2

-- To view, visit https://review.coreboot.org/c/coreboot/+/44036 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I4e496a223757beb22e3bd678eb6115968bd32529 Gerrit-Change-Number: 44036 Gerrit-PatchSet: 5 Gerrit-Owner: Duncan Laurie dlaurie@chromium.org Gerrit-Reviewer: Angel Pons th3fanbus@gmail.com Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Nick Vaccaro nvaccaro@google.com Gerrit-Reviewer: Nico Huber nico.h@gmx.de Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Tim Wawrzynczak twawrzynczak@chromium.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-Comment-Date: Fri, 18 Sep 2020 20:00:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

Tim Wawrzynczak (Code Review)

19 Sep 19 Sep

12:41 a.m.

Tim Wawrzynczak has submitted this change. ( https://review.coreboot.org/c/coreboot/+/44036 )

Change subject: sconfig: Add function for parse+override of tree ......................................................................

sconfig: Add function for parse+override of tree

Extract the steps to parse and override a devicetree into a function so it can be used multiple times without copying the same logic.

Change-Id: I4e496a223757beb22e3bd678eb6115968bd32529 Signed-off-by: Duncan Laurie dlaurie@google.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/44036 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Angel Pons th3fanbus@gmail.com Reviewed-by: Nick Vaccaro nvaccaro@google.com --- M util/sconfig/main.c 1 file changed, 14 insertions(+), 10 deletions(-)

Approvals: build bot (Jenkins): Verified Nick Vaccaro: Looks good to me, approved Angel Pons: Looks good to me, approved

diff --git a/util/sconfig/main.c b/util/sconfig/main.c index f561806..dbb266b 100644 --- a/util/sconfig/main.c +++ b/util/sconfig/main.c @@ -1666,6 +1666,18 @@ } }

parse_devicetree(base_devtree, &base_root_bus);

FILE *autogen = fopen(outputc, "w"); if (!autogen) {

-- To view, visit https://review.coreboot.org/c/coreboot/+/44036 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I4e496a223757beb22e3bd678eb6115968bd32529 Gerrit-Change-Number: 44036 Gerrit-PatchSet: 6 Gerrit-Owner: Duncan Laurie dlaurie@chromium.org Gerrit-Reviewer: Angel Pons th3fanbus@gmail.com Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Nick Vaccaro nvaccaro@google.com Gerrit-Reviewer: Nico Huber nico.h@gmx.de Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Tim Wawrzynczak twawrzynczak@chromium.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-MessageType: merged

9elements QA (Code Review)

1:28 a.m.

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

Change subject: sconfig: Add function for parse+override of tree ......................................................................

Patch Set 6:

Automatic boot test returned (PASS/FAIL/TOTAL): 8/1/9 "QEMU x86 q35/ich9" (x86_32) using payload TianoCore : SUCCESS : https://lava.9esec.io/r/20019 "QEMU x86 q35/ich9" (x86_32) using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/20018 "QEMU x86 i440fx/piix4" (x86_64) using payload SeaBIOS : FAIL : https://lava.9esec.io/r/20017 "QEMU x86 i440fx/piix4" (x86_32) using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/20016 "QEMU AArch64" using payload LinuxBoot_u-root_kexec : SUCCESS : https://lava.9esec.io/r/20015 "HP Z220 SFF Workstation" (x86_32) using payload LinuxBoot_BusyBox_kexec : SUCCESS : https://lava.9esec.io/r/20023 "HP Z220 SFF Workstation" (x86_32) using payload LinuxBoot_BusyBox_kexec : SUCCESS : https://lava.9esec.io/r/20022 "HP Compaq 8200 Elite SFF PC" (x86_32) using payload TianoCore : SUCCESS : https://lava.9esec.io/r/20021 "HP Compaq 8200 Elite SFF PC" (x86_32) using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/20020

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

-- To view, visit https://review.coreboot.org/c/coreboot/+/44036 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I4e496a223757beb22e3bd678eb6115968bd32529 Gerrit-Change-Number: 44036 Gerrit-PatchSet: 6 Gerrit-Owner: Duncan Laurie dlaurie@chromium.org Gerrit-Reviewer: Angel Pons th3fanbus@gmail.com Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Nick Vaccaro nvaccaro@google.com Gerrit-Reviewer: Nico Huber nico.h@gmx.de Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Tim Wawrzynczak twawrzynczak@chromium.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-CC: 9elements QA hardwaretestrobot@gmail.com Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-Comment-Date: Fri, 18 Sep 2020 23:28:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1318

days inactive

1369

days old

coreboot-gerrit@coreboot.org

7 comments

5 participants

tags (0)

participants (5)

9elements QA (Code Review)
Angel Pons (Code Review)
Duncan Laurie (Code Review)
Nick Vaccaro (Code Review)
Tim Wawrzynczak (Code Review)