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

Revert "cbfs/payload type: Fix build warning and whitespace in name" 

This reverts commit 717ba74836.

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>
This commit is contained in:
Ronald G. Minnich 2018-05-15 18:05:07 -07:00 committed by Patrick Georgi
parent 77a30af41c
commit c6d134988c
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
payloads/Makefile.inc
View File

@ -15,12 +15,12 @@
cbfs-files-$(CONFIG_COREINFO_SECONDARY_PAYLOAD) += img/coreinfo cbfs-files-$(CONFIG_COREINFO_SECONDARY_PAYLOAD) += img/coreinfo
img/coreinfo-file := payloads/coreinfo/build/coreinfo.elf 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) img/coreinfo-compression := $(CBFS_SECONDARY_PAYLOAD_COMPRESS_FLAG)
cbfs-files-$(CONFIG_NVRAMCUI_SECONDARY_PAYLOAD) += img/nvramcui cbfs-files-$(CONFIG_NVRAMCUI_SECONDARY_PAYLOAD) += img/nvramcui
img/nvramcui-file := payloads/nvramcui/nvramcui.elf img/nvramcui-file := payloads/nvramcui/nvramcui.elf
img/nvramcui-type := simple_elf img/nvramcui-type := payload
img/nvramcui-compression := $(CBFS_SECONDARY_PAYLOAD_COMPRESS_FLAG) img/nvramcui-compression := $(CBFS_SECONDARY_PAYLOAD_COMPRESS_FLAG)
PAYLOADS_LIST=\ PAYLOADS_LIST=\

2
payloads/coreinfo/cbfs_module.c
View File

@ -188,7 +188,7 @@ static int cbfs_module_redraw(WINDOW * win)
mvwprintw(win, row++, 38, "stage"); mvwprintw(win, row++, 38, "stage");
break; break;
case COMPONENT_SELF: case COMPONENT_SELF:
mvwprintw(win, row++, 38, "simple_elf"); mvwprintw(win, row++, 38, "simple ELF");
break; break;
case COMPONENT_OPTIONROM: case COMPONENT_OPTIONROM:
mvwprintw(win, row++, 38, "optionrom"); mvwprintw(win, row++, 38, "optionrom");

6
payloads/external/Makefile.inc vendored
View File

@ -48,7 +48,7 @@ $(CONFIG_CBFS_PREFIX)/payload-file := $(CONFIG_PAYLOAD_FILE)
ifeq ($(CONFIG_PAYLOAD_IS_FLAT_BINARY),y) ifeq ($(CONFIG_PAYLOAD_IS_FLAT_BINARY),y)
$(CONFIG_CBFS_PREFIX)/payload-type := flat-binary $(CONFIG_CBFS_PREFIX)/payload-type := flat-binary
else else
$(CONFIG_CBFS_PREFIX)/payload-type := simple_elf $(CONFIG_CBFS_PREFIX)/payload-type := payload
endif endif
$(CONFIG_CBFS_PREFIX)/payload-compression := $(CBFS_PAYLOAD_COMPRESS_FLAG) $(CONFIG_CBFS_PREFIX)/payload-compression := $(CBFS_PAYLOAD_COMPRESS_FLAG)
$(CONFIG_CBFS_PREFIX)/payload-options := $(ADDITIONAL_PAYLOAD_CONFIG) $(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 cbfs-files-$(CONFIG_TINT_SECONDARY_PAYLOAD) += img/tint
img/tint-file := payloads/external/tint/tint/tint.elf 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) img/tint-compression := $(CBFS_SECONDARY_PAYLOAD_COMPRESS_FLAG)
# Memtest86+ # Memtest86+
cbfs-files-$(CONFIG_MEMTEST_SECONDARY_PAYLOAD) += img/memtest cbfs-files-$(CONFIG_MEMTEST_SECONDARY_PAYLOAD) += img/memtest
img/memtest-file := payloads/external/Memtest86Plus/memtest86plus/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) img/memtest-compression := $(CBFS_SECONDARY_PAYLOAD_COMPRESS_FLAG)
ifeq ($(CONFIG_CONSOLE_SERIAL)$(CONFIG_DRIVERS_UART_8250IO),yy) ifeq ($(CONFIG_CONSOLE_SERIAL)$(CONFIG_DRIVERS_UART_8250IO),yy)

2
src/arch/arm64/Makefile.inc
View File

@ -194,7 +194,7 @@ $(BL31): $(obj)/build.h
BL31_CBFS := $(CONFIG_CBFS_PREFIX)/bl31 BL31_CBFS := $(CONFIG_CBFS_PREFIX)/bl31
$(BL31_CBFS)-file := $(BL31) $(BL31_CBFS)-file := $(BL31)
$(BL31_CBFS)-type := simple_elf $(BL31_CBFS)-type := payload
$(BL31_CBFS)-compression := $(CBFS_COMPRESS_FLAG) $(BL31_CBFS)-compression := $(CBFS_COMPRESS_FLAG)
cbfs-files-y += $(BL31_CBFS) cbfs-files-y += $(BL31_CBFS)

2
util/cbfstool/cbfs.h
View File

@ -204,7 +204,7 @@ static struct typedesc_t filetypes[] unused = {
{CBFS_COMPONENT_BOOTBLOCK, "bootblock"}, {CBFS_COMPONENT_BOOTBLOCK, "bootblock"},
{CBFS_COMPONENT_CBFSHEADER, "cbfs header"}, {CBFS_COMPONENT_CBFSHEADER, "cbfs header"},
{CBFS_COMPONENT_STAGE, "stage"}, {CBFS_COMPONENT_STAGE, "stage"},
{CBFS_COMPONENT_SELF, "simple_elf"}, {CBFS_COMPONENT_SELF, "simple elf"},
{CBFS_COMPONENT_OPTIONROM, "optionrom"}, {CBFS_COMPONENT_OPTIONROM, "optionrom"},
{CBFS_COMPONENT_BOOTSPLASH, "bootsplash"}, {CBFS_COMPONENT_BOOTSPLASH, "bootsplash"},
{CBFS_COMPONENT_RAW, "raw"}, {CBFS_COMPONENT_RAW, "raw"},