[coreboot-gerrit] Change in coreboot[master]: cbfs/payload type: Fix build warning and whitespace in name, again
Patrick Rudolph (Code Review)
gerrit at coreboot.org
Wed May 16 09:16:01 CEST 2018
Patrick Rudolph has uploaded this change for review. ( https://review.coreboot.org/26311
Change subject: cbfs/payload type: Fix build warning and whitespace in name, again
......................................................................
cbfs/payload type: Fix build warning and whitespace in name, again
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.
Also fix top level Makefile.inc to call cbfstool with the correct
add command, to make sure the self_loader still works.
Tested on real hardware using Seabios 1.11.1 as payload.
Change-Id: I1bffa04d82b1d2537f65eeaf337e92f250e6f0ff
---
M Makefile.inc
M payloads/Makefile.inc
M payloads/coreinfo/cbfs_module.c
M payloads/external/Makefile.inc
M src/arch/arm64/Makefile.inc
M util/cbfstool/cbfs.h
6 files changed, 10 insertions(+), 10 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/11/26311/1
diff --git a/Makefile.inc b/Makefile.inc
index b11f6e2..ba73304 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -644,7 +644,7 @@
# 1 - Path and name of file [FILENAME: Added to cbfs-files-y list variable]
# 2 - Name of file in cbfs [$(FILENAME)-file]
# 3 - File type: [$(FILENAME)-type]
-# bootblock, cbfs header, stage, payload, optionrom, bootsplash, raw, vsa,
+# bootblock, cbfs header, stage, simple_elf, optionrom, bootsplash, raw, vsa,
# mbi, microcode, fsp, mrc, cmos_default, cmos_layout, spd, mrc_cache,
# mma, efi, deleted, null
# 4 - Compression type [$(FILENAME)-compression]
@@ -681,7 +681,7 @@
define cbfs-add-cmd-for-region
$(CBFSTOOL) $@.tmp \
add$(if $(filter stage,$(call extract_nth,3,$(1))),-stage)$(if \
- $(filter payload,$(call extract_nth,3,$(1))),-payload)$(if \
+ $(filter simple_elf,$(call extract_nth,3,$(1))),-payload)$(if \
$(filter flat-binary,$(call extract_nth,3,$(1))),-flat-binary) \
-f $(call extract_nth,1,$(1)) \
-n $(call extract_nth,2,$(1)) \
diff --git a/payloads/Makefile.inc b/payloads/Makefile.inc
index d894dec..ead2376 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 ee75935..b1690ba 100644
--- a/payloads/coreinfo/cbfs_module.c
+++ b/payloads/coreinfo/cbfs_module.c
@@ -188,7 +188,7 @@
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 ec7d9a8..d5e780c 100644
--- a/payloads/external/Makefile.inc
+++ b/payloads/external/Makefile.inc
@@ -48,7 +48,7 @@
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 @@
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)
diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc
index 997c2da..2514aa9 100644
--- a/src/arch/arm64/Makefile.inc
+++ b/src/arch/arm64/Makefile.inc
@@ -194,7 +194,7 @@
BL31_CBFS := $(CONFIG_CBFS_PREFIX)/bl31
$(BL31_CBFS)-file := $(BL31)
-$(BL31_CBFS)-type := payload
+$(BL31_CBFS)-type := simple_elf
$(BL31_CBFS)-compression := $(CBFS_COMPRESS_FLAG)
cbfs-files-y += $(BL31_CBFS)
diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h
index 1a4f101..b76e83e 100644
--- a/util/cbfstool/cbfs.h
+++ b/util/cbfstool/cbfs.h
@@ -204,7 +204,7 @@
{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"},
--
To view, visit https://review.coreboot.org/26311
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1bffa04d82b1d2537f65eeaf337e92f250e6f0ff
Gerrit-Change-Number: 26311
Gerrit-PatchSet: 1
Gerrit-Owner: Patrick Rudolph <patrick.rudolph at 9elements.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180516/5bc8a544/attachment-0001.html>
More information about the coreboot-gerrit
mailing list