Change in coreboot[master]: Fix sarien depthcharge make build

List overview All Threads
Download

newer

older

Change in coreboot[master]:...

Selma Bensaid (Code Review)

25 Oct 2019 25 Oct '19

11:37 a.m.

Selma Bensaid has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/36336 )

Change subject: Fix sarien depthcharge make build ......................................................................

Fix sarien depthcharge make build

CONFIG_MAINBOARD_DEPTHCHARGE is set to "" for boards not configuring it.

Signed-off-by: Selma BENSAID selma.bensaid@intel.com Change-Id: If61a1371ad8baf165b09ce045fc1a6c205c2c0ae --- M payloads/external/Makefile.inc 1 file changed, 5 insertions(+), 3 deletions(-)

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

diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index f6417fd..d3d10f8 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -30,9 +30,11 @@ PAYLOAD_CONFIG=payloads/external/depthcharge/depthcharge/.config $(PAYLOAD_CONFIG): payloads/external/depthcharge/depthcharge/build/depthcharge.elf ifneq ($(CONFIG_MAINBOARD_DEPTHCHARGE),) - BOARD=$(CONFIG_MAINBOARD_DEPTHCHARGE) -else - BOARD=$(call ws_to_under,$(call strip_quotes,$(call tolower,$(CONFIG_MAINBOARD_PART_NUMBER)))) + ifeq ($(CONFIG_MAINBOARD_DEPTHCHARGE),"") + BOARD=$(call ws_to_under,$(call strip_quotes,$(call tolower,$(CONFIG_MAINBOARD_PART_NUMBER)))) + else + BOARD=$(CONFIG_MAINBOARD_DEPTHCHARGE) + endif endif #TODO: Figure out version endif

Attachments:

attachment.htm (text/html — 3.1 KB)

Show replies by date

Patrick Georgi (Code Review)

25 Oct 25 Oct

12:07 p.m.

Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36336 )

Change subject: Fix sarien depthcharge make build ......................................................................

Patch Set 1:

(1 comment)

https://review.coreboot.org/c/coreboot/+/36336/1/payloads/external/Makefile.... File payloads/external/Makefile.inc:

https://review.coreboot.org/c/coreboot/+/36336/1/payloads/external/Makefile.... PS1, Line 32: $(CONFIG_MAINBOARD_DEPTHCHARGE) How about wrapping this in $(call strip_quotes,...)? That should also solve the issue without leaving BOARD empty if CONFIG_MAINBOARD_DEPTHCHARGE ends up, for some reason, being empty (without quotes), no?

-- To view, visit https://review.coreboot.org/c/coreboot/+/36336 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: If61a1371ad8baf165b09ce045fc1a6c205c2c0ae Gerrit-Change-Number: 36336 Gerrit-PatchSet: 1 Gerrit-Owner: Selma Bensaid selma.bensaid@intel.com Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Selma Bensaid selma.bensaid@intel.com Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Comment-Date: Fri, 25 Oct 2019 19:07:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

Selma Bensaid (Code Review)

28 Oct 28 Oct

9:37 a.m.

Hello build bot (Jenkins), Patrick Georgi, Martin Roth,

I'd like you to reexamine a change. Please visit

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

to look at the new patch set (#2).

Change subject: Fix sarien depthcharge make build ......................................................................

Fix sarien depthcharge make build

CONFIG_MAINBOARD_DEPTHCHARGE is set to "" for boards not configuring it.

Signed-off-by: Selma BENSAID selma.bensaid@intel.com Change-Id: If61a1371ad8baf165b09ce045fc1a6c205c2c0ae --- M payloads/external/Makefile.inc 1 file changed, 5 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/36/36336/2

Selma Bensaid (Code Review)

9:38 a.m.

Selma Bensaid has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36336 )

Change subject: Fix sarien depthcharge make build ......................................................................

Patch Set 2:

(1 comment)

https://review.coreboot.org/c/coreboot/+/36336/1/payloads/external/Makefile.... File payloads/external/Makefile.inc:

https://review.coreboot.org/c/coreboot/+/36336/1/payloads/external/Makefile.... PS1, Line 32: $(CONFIG_MAINBOARD_DEPTHCHARGE)

...

How about wrapping this in $(call strip_quotes,... […]

Done

-- To view, visit https://review.coreboot.org/c/coreboot/+/36336 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: If61a1371ad8baf165b09ce045fc1a6c205c2c0ae Gerrit-Change-Number: 36336 Gerrit-PatchSet: 2 Gerrit-Owner: Selma Bensaid selma.bensaid@intel.com Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Selma Bensaid selma.bensaid@intel.com Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Comment-Date: Mon, 28 Oct 2019 16:38:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Patrick Georgi pgeorgi@google.com Gerrit-MessageType: comment

Patrick Georgi (Code Review)

13 Nov 13 Nov

1:36 a.m.

Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36336 )

Change subject: Fix sarien depthcharge make build ......................................................................

Patch Set 2:

(1 comment)

https://review.coreboot.org/c/coreboot/+/36336/1/payloads/external/Makefile.... File payloads/external/Makefile.inc:

https://review.coreboot.org/c/coreboot/+/36336/1/payloads/external/Makefile.... PS1, Line 32: $(CONFIG_MAINBOARD_DEPTHCHARGE)

...

Done

Sorry, the diff between patchset 1 and patchset 2 only seems to show an update in the commit message's header. Missed adding the change to the CL perhaps?

-- To view, visit https://review.coreboot.org/c/coreboot/+/36336 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: If61a1371ad8baf165b09ce045fc1a6c205c2c0ae Gerrit-Change-Number: 36336 Gerrit-PatchSet: 2 Gerrit-Owner: Selma Bensaid selma.bensaid@intel.com Gerrit-Reviewer: Bora Guvendik bora.guvendik@intel.com Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Mathew King mathewk@chromium.org Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Selma Bensaid selma.bensaid@intel.com Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Comment-Date: Wed, 13 Nov 2019 09:36:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Selma Bensaid selma.bensaid@intel.com Comment-In-Reply-To: Patrick Georgi pgeorgi@google.com Gerrit-MessageType: comment

Selma Bensaid (Code Review)

12:31 p.m.

Hello Mathew King, Bora Guvendik, build bot (Jenkins), Patrick Georgi, Martin Roth,

I'd like you to reexamine a change. Please visit

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

to look at the new patch set (#3).

Change subject: Fix sarien depthcharge make build ......................................................................

Fix sarien depthcharge make build

CONFIG_MAINBOARD_DEPTHCHARGE is set to "" for boards not configuring it.

Signed-off-by: Selma BENSAID selma.bensaid@intel.com Change-Id: If61a1371ad8baf165b09ce045fc1a6c205c2c0ae --- M payloads/external/Makefile.inc 1 file changed, 3 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/36/36336/3

-- To view, visit https://review.coreboot.org/c/coreboot/+/36336 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: If61a1371ad8baf165b09ce045fc1a6c205c2c0ae Gerrit-Change-Number: 36336 Gerrit-PatchSet: 3 Gerrit-Owner: Selma Bensaid selma.bensaid@intel.com Gerrit-Reviewer: Bora Guvendik bora.guvendik@intel.com Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Mathew King mathewk@chromium.org Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Selma Bensaid selma.bensaid@intel.com Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-MessageType: newpatchset

Selma Bensaid (Code Review)

12:32 p.m.

Selma Bensaid has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36336 )

Change subject: Fix sarien depthcharge make build ......................................................................

Patch Set 3:

(1 comment)

https://review.coreboot.org/c/coreboot/+/36336/1/payloads/external/Makefile.... File payloads/external/Makefile.inc:

https://review.coreboot.org/c/coreboot/+/36336/1/payloads/external/Makefile.... PS1, Line 32: $(CONFIG_MAINBOARD_DEPTHCHARGE)

...

Sorry, the diff between patchset 1 and patchset 2 only seems to show an update in the commit message […]

Ack I'm sorry.

-- To view, visit https://review.coreboot.org/c/coreboot/+/36336 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: If61a1371ad8baf165b09ce045fc1a6c205c2c0ae Gerrit-Change-Number: 36336 Gerrit-PatchSet: 3 Gerrit-Owner: Selma Bensaid selma.bensaid@intel.com Gerrit-Reviewer: Bora Guvendik bora.guvendik@intel.com Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Mathew King mathewk@chromium.org Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Selma Bensaid selma.bensaid@intel.com Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Comment-Date: Wed, 13 Nov 2019 20:32:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Selma Bensaid selma.bensaid@intel.com Comment-In-Reply-To: Patrick Georgi pgeorgi@google.com Gerrit-MessageType: comment

Patrick Georgi (Code Review)

14 Nov 14 Nov

3:08 a.m.

Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36336 )

Change subject: Fix sarien depthcharge make build ......................................................................

Patch Set 3: Code-Review+2

-- To view, visit https://review.coreboot.org/c/coreboot/+/36336 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: If61a1371ad8baf165b09ce045fc1a6c205c2c0ae Gerrit-Change-Number: 36336 Gerrit-PatchSet: 3 Gerrit-Owner: Selma Bensaid selma.bensaid@intel.com Gerrit-Reviewer: Bora Guvendik bora.guvendik@intel.com Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Mathew King mathewk@chromium.org Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Selma Bensaid selma.bensaid@intel.com Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Comment-Date: Thu, 14 Nov 2019 11:08:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

Patrick Georgi (Code Review)

3:08 a.m.

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

Change subject: Fix sarien depthcharge make build ......................................................................

Fix sarien depthcharge make build

CONFIG_MAINBOARD_DEPTHCHARGE is set to "" for boards not configuring it.

Signed-off-by: Selma BENSAID selma.bensaid@intel.com Change-Id: If61a1371ad8baf165b09ce045fc1a6c205c2c0ae Reviewed-on: https://review.coreboot.org/c/coreboot/+/36336 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Patrick Georgi pgeorgi@google.com --- M payloads/external/Makefile.inc 1 file changed, 3 insertions(+), 3 deletions(-)

Approvals: build bot (Jenkins): Verified Patrick Georgi: Looks good to me, approved

diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index f6417fd..b8af8c9 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -29,10 +29,10 @@ ifeq ($(CONFIG_PAYLOAD_DEPTHCHARGE),y) PAYLOAD_CONFIG=payloads/external/depthcharge/depthcharge/.config $(PAYLOAD_CONFIG): payloads/external/depthcharge/depthcharge/build/depthcharge.elf -ifneq ($(CONFIG_MAINBOARD_DEPTHCHARGE),) - BOARD=$(CONFIG_MAINBOARD_DEPTHCHARGE) -else +ifeq ($(call strip_quotes,$(CONFIG_MAINBOARD_DEPTHCHARGE))),) BOARD=$(call ws_to_under,$(call strip_quotes,$(call tolower,$(CONFIG_MAINBOARD_PART_NUMBER)))) +else + BOARD=$(CONFIG_MAINBOARD_DEPTHCHARGE) endif #TODO: Figure out version endif

-- To view, visit https://review.coreboot.org/c/coreboot/+/36336 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: If61a1371ad8baf165b09ce045fc1a6c205c2c0ae Gerrit-Change-Number: 36336 Gerrit-PatchSet: 4 Gerrit-Owner: Selma Bensaid selma.bensaid@intel.com Gerrit-Reviewer: Bora Guvendik bora.guvendik@intel.com Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Mathew King mathewk@chromium.org Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Selma Bensaid selma.bensaid@intel.com Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-MessageType: merged

1831

days inactive

1851

days old

coreboot-gerrit@coreboot.org

8 comments

2 participants

tags (0)

participants (2)

Patrick Georgi (Code Review)
Selma Bensaid (Code Review)