summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIru Cai <mytbk920423@gmail.com>2016-04-15 15:48:14 +0800
committerMartin Roth <martinroth@google.com>2016-04-20 18:42:52 +0200
commit736aa74fafc4b829fe5114b2e2c7e52efcf9fd3f (patch)
tree04b45dd8c7fdb391825bbb018dd0f8fdd3e8a219
parente44b407b00981f63aed24d48067a3010d169d1d2 (diff)
downloadcoreboot-736aa74fafc4b829fe5114b2e2c7e52efcf9fd3f.tar.xz
add nvramcui as a secondary payload
Change-Id: Ie38a358ebd2d040ce32b3eeaeb664c568d4dc51e Signed-off-by: Iru Cai <mytbk920423@gmail.com> Reviewed-on: https://review.coreboot.org/14378 Reviewed-by: Martin Roth <martinroth@google.com> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Tested-by: build bot (Jenkins)
-rw-r--r--payloads/Kconfig8
-rw-r--r--payloads/Makefile.inc8
2 files changed, 16 insertions, 0 deletions
diff --git a/payloads/Kconfig b/payloads/Kconfig
index c7b9e2aba4..00d5d88e96 100644
--- a/payloads/Kconfig
+++ b/payloads/Kconfig
@@ -77,5 +77,13 @@ config MEMTEST_SECONDARY_PAYLOAD
Memtest86+ can be loaded as a secondary payload under SeaBIOS, GRUB,
or any other payload that can load additional payloads.
+config NVRAMCUI_SECONDARY_PAYLOAD
+ bool "Load nvramcui as a secondary payload"
+ default n
+ depends on ARCH_X86
+ help
+ nvramcui can be loaded as a secondary payload under SeaBIOS, GRUB,
+ or any other payload that can load additional payloads.
+
endmenu # "Secondary Payloads"
endmenu
diff --git a/payloads/Makefile.inc b/payloads/Makefile.inc
index 83609c80c7..70a3b530bb 100644
--- a/payloads/Makefile.inc
+++ b/payloads/Makefile.inc
@@ -17,8 +17,13 @@ cbfs-files-$(CONFIG_COREINFO_SECONDARY_PAYLOAD) += img/coreinfo
img/coreinfo-file := payloads/coreinfo/build/coreinfo.elf
img/coreinfo-type := payload
+cbfs-files-$(CONFIG_NVRAMCUI_SECONDARY_PAYLOAD) += img/nvramcui
+img/nvramcui-file := payloads/nvramcui/nvramcui.elf
+img/nvramcui-type := payload
+
PAYLOADS_LIST=\
payloads/coreinfo \
+payloads/nvramcui \
payloads/libpayload \
payloads/external/depthcharge \
payloads/external/SeaBIOS \
@@ -29,6 +34,9 @@ payloads/external/iPXE
payloads/coreinfo/build/coreinfo.elf coreinfo:
$(MAKE) -C payloads/coreinfo defaultbuild
+payloads/nvramcui/nvramcui.elf:
+ $(MAKE) -C payloads/nvramcui
+
clean-payloads:
$(foreach payload, $(PAYLOADS_LIST), $(MAKE) -C $(payload) clean; )