summaryrefslogtreecommitdiff
path: root/payloads
diff options
context:
space:
mode:
authorPaul Menzel <paulepanter@users.sourceforge.net>2018-05-12 11:05:06 +0200
committerPatrick Rudolph <siro@das-labor.org>2018-05-15 11:20:45 +0000
commit717ba748366cda19b7532897a5b8d59fc2cd25d9 (patch)
treee6ebc16a1f986b71f483319ae1b832b6599ecfc0 /payloads
parent9d22172558b802d7ed45bfc37496acf73dcc281d (diff)
downloadcoreboot-717ba748366cda19b7532897a5b8d59fc2cd25d9.tar.xz
cbfs/payload type: Fix build warning and whitespace in name
Currently, adding a payload to CBFS using the build system, the warning below is shown. W: Unknown type 'payload' ignored Update payload type from "simple elf" to "simple_elf" and rename the word "payload" to "simple_elf" in all Makefiles. Fixes: 4f5bed52 (cbfs: Rename CBFS_TYPE_PAYLOAD to CBFS_TYPE_SELF) Change-Id: Iccf6cc889b7ddd0c6ae04bda194fe5f9c00e495d Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net> Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com> Reviewed-on: https://review.coreboot.org/26240 Reviewed-by: Julius Werner <jwerner@chromium.org> Reviewed-by: Nico Huber <nico.h@gmx.de> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'payloads')
-rw-r--r--payloads/Makefile.inc4
-rw-r--r--payloads/coreinfo/cbfs_module.c2
-rw-r--r--payloads/external/Makefile.inc6
3 files changed, 6 insertions, 6 deletions
diff --git a/payloads/Makefile.inc b/payloads/Makefile.inc
index d894dec4a7..ead2376dfa 100644
--- a/payloads/Makefile.inc
+++ b/payloads/Makefile.inc
@@ -15,12 +15,12 @@
cbfs-files-$(CONFIG_COREINFO_SECONDARY_PAYLOAD) += img/coreinfo
img/coreinfo-file := payloads/coreinfo/build/coreinfo.elf
-img/coreinfo-type := payload
+img/coreinfo-type := simple_elf
img/coreinfo-compression := $(CBFS_SECONDARY_PAYLOAD_COMPRESS_FLAG)
cbfs-files-$(CONFIG_NVRAMCUI_SECONDARY_PAYLOAD) += img/nvramcui
img/nvramcui-file := payloads/nvramcui/nvramcui.elf
-img/nvramcui-type := payload
+img/nvramcui-type := simple_elf
img/nvramcui-compression := $(CBFS_SECONDARY_PAYLOAD_COMPRESS_FLAG)
PAYLOADS_LIST=\
diff --git a/payloads/coreinfo/cbfs_module.c b/payloads/coreinfo/cbfs_module.c
index ee759352bf..b1690ba4ca 100644
--- a/payloads/coreinfo/cbfs_module.c
+++ b/payloads/coreinfo/cbfs_module.c
@@ -188,7 +188,7 @@ static int cbfs_module_redraw(WINDOW * win)
mvwprintw(win, row++, 38, "stage");
break;
case COMPONENT_SELF:
- mvwprintw(win, row++, 38, "simple ELF");
+ mvwprintw(win, row++, 38, "simple_elf");
break;
case COMPONENT_OPTIONROM:
mvwprintw(win, row++, 38, "optionrom");
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc
index ec7d9a83ba..d5e780c0b1 100644
--- a/payloads/external/Makefile.inc
+++ b/payloads/external/Makefile.inc
@@ -48,7 +48,7 @@ $(CONFIG_CBFS_PREFIX)/payload-file := $(CONFIG_PAYLOAD_FILE)
ifeq ($(CONFIG_PAYLOAD_IS_FLAT_BINARY),y)
$(CONFIG_CBFS_PREFIX)/payload-type := flat-binary
else
-$(CONFIG_CBFS_PREFIX)/payload-type := payload
+$(CONFIG_CBFS_PREFIX)/payload-type := simple_elf
endif
$(CONFIG_CBFS_PREFIX)/payload-compression := $(CBFS_PAYLOAD_COMPRESS_FLAG)
$(CONFIG_CBFS_PREFIX)/payload-options := $(ADDITIONAL_PAYLOAD_CONFIG)
@@ -184,14 +184,14 @@ payloads/external/tint/tint/tint.elf tint:
cbfs-files-$(CONFIG_TINT_SECONDARY_PAYLOAD) += img/tint
img/tint-file := payloads/external/tint/tint/tint.elf
-img/tint-type := payload
+img/tint-type := simple_elf
img/tint-compression := $(CBFS_SECONDARY_PAYLOAD_COMPRESS_FLAG)
# Memtest86+
cbfs-files-$(CONFIG_MEMTEST_SECONDARY_PAYLOAD) += img/memtest
img/memtest-file := payloads/external/Memtest86Plus/memtest86plus/memtest
-img/memtest-type := payload
+img/memtest-type := simple_elf
img/memtest-compression := $(CBFS_SECONDARY_PAYLOAD_COMPRESS_FLAG)
ifeq ($(CONFIG_CONSOLE_SERIAL)$(CONFIG_DRIVERS_UART_8250IO),yy)