summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonald G. Minnich <rminnich@gmail.com>2018-05-15 18:05:07 -0700
committerPatrick Georgi <pgeorgi@google.com>2018-05-16 04:50:55 +0000
commitc6d134988c856d0025153fb885045d995bc8c397 (patch)
tree3c60e894d592805e736710abe9d5ab34e2d852bf
parent77a30af41cd252bb72883f30e57683b1d11a8c36 (diff)
downloadcoreboot-c6d134988c856d0025153fb885045d995bc8c397.tar.xz
Revert "cbfs/payload type: Fix build warning and whitespace in name"
This reverts commit 717ba748366cda19b7532897a5b8d59fc2cd25d9. This breaks seabios and a few other payloads. This is not ready for use. Change-Id: I48ebe2e2628c11e935357b900d01953882cd20dd Signed-off-by: Ronald G. Minnich <rminnich@gmail.com> Reviewed-on: https://review.coreboot.org/26310 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Julius Werner <jwerner@chromium.org> Reviewed-by: Werner Zeh <werner.zeh@siemens.com> Reviewed-by: Patrick Georgi <pgeorgi@google.com>
-rw-r--r--payloads/Makefile.inc4
-rw-r--r--payloads/coreinfo/cbfs_module.c2
-rw-r--r--payloads/external/Makefile.inc6
-rw-r--r--src/arch/arm64/Makefile.inc2
-rw-r--r--util/cbfstool/cbfs.h2
5 files changed, 8 insertions, 8 deletions
diff --git a/payloads/Makefile.inc b/payloads/Makefile.inc
index ead2376dfa..d894dec4a7 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 := simple_elf
+img/coreinfo-type := payload
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 := simple_elf
+img/nvramcui-type := payload
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 b1690ba4ca..ee759352bf 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 d5e780c0b1..ec7d9a83ba 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 := simple_elf
+$(CONFIG_CBFS_PREFIX)/payload-type := payload
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 := simple_elf
+img/tint-type := payload
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 := simple_elf
+img/memtest-type := payload
img/memtest-compression := $(CBFS_SECONDARY_PAYLOAD_COMPRESS_FLAG)
ifeq ($(CONFIG_CONSOLE_SERIAL)$(CONFIG_DRIVERS_UART_8250IO),yy)
diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc
index 2514aa949c..997c2da70f 100644
--- a/src/arch/arm64/Makefile.inc
+++ b/src/arch/arm64/Makefile.inc
@@ -194,7 +194,7 @@ $(BL31): $(obj)/build.h
BL31_CBFS := $(CONFIG_CBFS_PREFIX)/bl31
$(BL31_CBFS)-file := $(BL31)
-$(BL31_CBFS)-type := simple_elf
+$(BL31_CBFS)-type := payload
$(BL31_CBFS)-compression := $(CBFS_COMPRESS_FLAG)
cbfs-files-y += $(BL31_CBFS)
diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h
index b76e83eac1..1a4f101b57 100644
--- a/util/cbfstool/cbfs.h
+++ b/util/cbfstool/cbfs.h
@@ -204,7 +204,7 @@ static struct typedesc_t filetypes[] unused = {
{CBFS_COMPONENT_BOOTBLOCK, "bootblock"},
{CBFS_COMPONENT_CBFSHEADER, "cbfs header"},
{CBFS_COMPONENT_STAGE, "stage"},
- {CBFS_COMPONENT_SELF, "simple_elf"},
+ {CBFS_COMPONENT_SELF, "simple elf"},
{CBFS_COMPONENT_OPTIONROM, "optionrom"},
{CBFS_COMPONENT_BOOTSPLASH, "bootsplash"},
{CBFS_COMPONENT_RAW, "raw"},