diff options
| author | Selma BENSAID <selma.bensaid@intel.com> | 2019-09-20 17:38:59 -0700 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2019-09-24 10:34:42 +0000 |
| commit | b458a4f745c8d7cf44f1d613cab0bef3b7f23a3a (patch) | |
| tree | a8de7e6b6ff0530a06684e4a799a82d7f9257e59 | |
| parent | 0962b1fa5d3f7a165c9b427faab76c45989d9b40 (diff) | |
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>
| -rw-r--r-- | payloads/external/Makefile.inc | 7 | ||||
| -rw-r--r-- | payloads/external/depthcharge/Kconfig | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index d5c4e7f5d3..f6417fd946 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -29,6 +29,11 @@ endif 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 @@ endif 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 9fd1268b91..89c81ef70e 100644 --- a/payloads/external/depthcharge/Kconfig +++ b/payloads/external/depthcharge/Kconfig @@ -35,6 +35,11 @@ config PAYLOAD_FILE 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 |