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)
diff --git a/payloads/Kconfig b/payloads/Kconfig
index c7b9e2a..00d5d88 100644
--- a/payloads/Kconfig
+++ b/payloads/Kconfig
@@ -77,5 +77,13 @@
 	  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 83609c8..70a3b53 100644
--- a/payloads/Makefile.inc
+++ b/payloads/Makefile.inc
@@ -17,8 +17,13 @@
 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/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; )