Selma Bensaid has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/35510 )
Change subject: depthcharge: add CONFIG_MAINBOARD_DEPTHCHARGE ......................................................................
depthcharge: add CONFIG_MAINBOARD_DEPTHCHARGE
CONFIG_MAINBOARD_DEPTHCHARGE is used to override the Board config for depthcharge which inherit from CONFIG_MAINBOARD_PART_NUMBER. This is mainly to avoid depthcharge config duplication.
Signed-off-by: Selma BENSAID selma.bensaid@intel.com Change-Id: I6cbc93ca38ad6deeca2c2fb7770024a24233b6f8 --- M payloads/external/Makefile.inc M payloads/external/depthcharge/Kconfig 2 files changed, 11 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/10/35510/1
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index d5c4e7f..f6417fd 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -29,6 +29,11 @@ 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 + BOARD=$(call ws_to_under,$(call strip_quotes,$(call tolower,$(CONFIG_MAINBOARD_PART_NUMBER)))) +endif #TODO: Figure out version endif
@@ -114,7 +119,7 @@
payloads/external/depthcharge/depthcharge/build/depthcharge.elf depthcharge: $(DOTCONFIG) $(CBFSTOOL) $(MAKE) -C payloads/external/depthcharge \ - BOARD=$(call ws_to_under,$(call strip_quotes,$(call tolower,$(CONFIG_MAINBOARD_PART_NUMBER)))) \ + BOARD=$(BOARD) \ MFLAGS= MAKEFLAGS= \ DEPTHCHARGE_MASTER=$(CONFIG_DEPTHCHARGE_MASTER) \ DEPTHCHARGE_STABLE=$(CONFIG_DEPTHCHARGE_STABLE) \ diff --git a/payloads/external/depthcharge/Kconfig b/payloads/external/depthcharge/Kconfig index 9fd1268..22f1a85 100644 --- a/payloads/external/depthcharge/Kconfig +++ b/payloads/external/depthcharge/Kconfig @@ -35,6 +35,11 @@ string default "payloads/external/depthcharge/depthcharge/build/depthcharge.elf"
+config MAINBOARD_DEPTHCHARGE + string "" + help + Override BOARD setting for depthcharge + config LP_DEFCONFIG_OVERRIDE bool "Use default libpayload config" help
Hello Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/35510
to look at the new patch set (#2).
Change subject: depthcharge: add CONFIG_MAINBOARD_DEPTHCHARGE ......................................................................
depthcharge: add CONFIG_MAINBOARD_DEPTHCHARGE
CONFIG_MAINBOARD_DEPTHCHARGE is used to override the Board config for depthcharge which inherit from CONFIG_MAINBOARD_PART_NUMBER. This is mainly to avoid depthcharge config duplication.
Signed-off-by: Selma BENSAID selma.bensaid@intel.com Change-Id: I6cbc93ca38ad6deeca2c2fb7770024a24233b6f8 --- M payloads/external/Makefile.inc M payloads/external/depthcharge/Kconfig 2 files changed, 11 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/10/35510/2
Mathew King has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35510 )
Change subject: depthcharge: add CONFIG_MAINBOARD_DEPTHCHARGE ......................................................................
Patch Set 2: Code-Review+2
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/35510 )
Change subject: depthcharge: add CONFIG_MAINBOARD_DEPTHCHARGE ......................................................................
depthcharge: add CONFIG_MAINBOARD_DEPTHCHARGE
CONFIG_MAINBOARD_DEPTHCHARGE is used to override the Board config for depthcharge which inherit from CONFIG_MAINBOARD_PART_NUMBER. This is mainly to avoid depthcharge config duplication.
Signed-off-by: Selma BENSAID selma.bensaid@intel.com Change-Id: I6cbc93ca38ad6deeca2c2fb7770024a24233b6f8 Reviewed-on: https://review.coreboot.org/c/coreboot/+/35510 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Mathew King mathewk@chromium.org --- M payloads/external/Makefile.inc M payloads/external/depthcharge/Kconfig 2 files changed, 11 insertions(+), 1 deletion(-)
Approvals: build bot (Jenkins): Verified Mathew King: Looks good to me, approved
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index d5c4e7f..f6417fd 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -29,6 +29,11 @@ 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 + BOARD=$(call ws_to_under,$(call strip_quotes,$(call tolower,$(CONFIG_MAINBOARD_PART_NUMBER)))) +endif #TODO: Figure out version endif
@@ -114,7 +119,7 @@
payloads/external/depthcharge/depthcharge/build/depthcharge.elf depthcharge: $(DOTCONFIG) $(CBFSTOOL) $(MAKE) -C payloads/external/depthcharge \ - BOARD=$(call ws_to_under,$(call strip_quotes,$(call tolower,$(CONFIG_MAINBOARD_PART_NUMBER)))) \ + BOARD=$(BOARD) \ MFLAGS= MAKEFLAGS= \ DEPTHCHARGE_MASTER=$(CONFIG_DEPTHCHARGE_MASTER) \ DEPTHCHARGE_STABLE=$(CONFIG_DEPTHCHARGE_STABLE) \ diff --git a/payloads/external/depthcharge/Kconfig b/payloads/external/depthcharge/Kconfig index 9fd1268..89c81ef 100644 --- a/payloads/external/depthcharge/Kconfig +++ b/payloads/external/depthcharge/Kconfig @@ -35,6 +35,11 @@ string default "payloads/external/depthcharge/depthcharge/build/depthcharge.elf"
+config MAINBOARD_DEPTHCHARGE + string "" + help + Override BOARD setting for depthcharge + config LP_DEFCONFIG_OVERRIDE bool "Use default libpayload config" help
-
Mathew King (Code Review) -
Patrick Georgi (Code Review)
-
Selma Bensaid (Code Review)