GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

payloads/depthcharge: Allow generic libpayload config 

Change depthcharge to not require a board-specific config file for
libpayload.  If the Kconfig option is selected, use the settings
in libpayload/configs/defconfig instead.

Change-Id: I4fd1a5915472f28e757c62f3f2415716f1fdfc71
Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Reviewed-on: https://review.coreboot.org/18271
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
This commit is contained in:
Marshall Dawson 2016-12-22 20:25:29 -05:00 committed by Martin Roth
parent 9be3f5dab4
commit fc18507134
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
payloads/external/Makefile.inc vendored
View File

@ -109,7 +109,8 @@ payloads/external/depthcharge/depthcharge/build/depthcharge.elf depthcharge: $(D
DEPTHCHARGE_MASTER=$(CONFIG_DEPTHCHARGE_MASTER) \ DEPTHCHARGE_MASTER=$(CONFIG_DEPTHCHARGE_MASTER) \
DEPTHCHARGE_STABLE=$(CONFIG_DEPTHCHARGE_STABLE) \ DEPTHCHARGE_STABLE=$(CONFIG_DEPTHCHARGE_STABLE) \
DEPTHCHARGE_REVISION=$(CONFIG_DEPTHCHARGE_REVISION) \ DEPTHCHARGE_REVISION=$(CONFIG_DEPTHCHARGE_REVISION) \
DEPTHCHARGE_REVISION_ID=$(CONFIG_DEPTHCHARGE_REVISION_ID) DEPTHCHARGE_REVISION_ID=$(CONFIG_DEPTHCHARGE_REVISION_ID) \
OVERRIDE_DEFCONFIG=$(CONFIG_LP_DEFCONFIG_OVERRIDE)
# FILO # FILO

8
payloads/external/depthcharge/Kconfig vendored
View File

@ -35,4 +35,12 @@ config PAYLOAD_FILE
string string
default "payloads/external/depthcharge/depthcharge/build/depthcharge.elf" default "payloads/external/depthcharge/depthcharge/build/depthcharge.elf"
config LP_DEFCONFIG_OVERRIDE
def_bool n
help
The Depthcharge makefile looks for a file config.<boardname> in the
libpayload/configs directory. Say Y here to use the file defconfig
instead. This is can be a convenience for development purposes, or
if the defaults in defconfig are sufficient for your system.
endif endif

13
payloads/external/depthcharge/Makefile vendored
View File

@ -30,6 +30,13 @@ unexport src srck obj objk
BOARD:=$(notdir $(CONFIG_MAINBOARD_DIR)) BOARD:=$(notdir $(CONFIG_MAINBOARD_DIR))
ifeq ($(OVERRIDE_DEFCONFIG),y)
$(info Depthcharge: Using default defconfig for libpayload)
libpayload_config=$(libpayload_dir)/configs/defconfig
else
libpayload_config=$(libpayload_dir)/configs/config.$(BOARD)
endif
all: build all: build
$(project_dir): $(project_dir):
@ -47,10 +54,10 @@ checkout: fetch
cd $(project_dir) ; git checkout master; git branch -D coreboot 2>/dev/null; git checkout -b coreboot $(TAG-y) cd $(project_dir) ; git checkout master; git branch -D coreboot 2>/dev/null; git checkout -b coreboot $(TAG-y)
$(libpayload_install_dir): $(project_dir) $(libpayload_install_dir): $(project_dir)
test -f $(libpayload_dir)/configs/config.$(BOARD) || \ test -f $(libpayload_config)|| \
(echo "Error: $(libpayload_dir)/configs/config.$(BOARD) is not present" && \ (echo "Error: $(libpayload_config) is not present" && \
false) false)
cp $(libpayload_dir)/configs/config.$(BOARD) $(libpayload_dir)/.config cp $(libpayload_config) $(libpayload_dir)/.config
$(MAKE) -C $(libpayload_dir) olddefconfig $(MAKE) -C $(libpayload_dir) olddefconfig
$(MAKE) -C $(libpayload_dir) $(MAKE) -C $(libpayload_dir)
$(MAKE) -C $(libpayload_dir) install DESTDIR=$(libpayload_install_dir) $(MAKE) -C $(libpayload_dir) install DESTDIR=$(libpayload_install_dir)