Makefile.inc: Drop spurious -t from cbfstool add-payload

The `-t` argument was never required for `add-payload` and results in
a warning now because the type was renamed.

TEST=Built with BUILD_TIMELESS=1 and compared binaries with and without
     this patch.

Change-Id: I6ccb70acc6e88a602b90c625040d4f05d8e3630a
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/26332
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

Makefile.inc

@@ -685,8 +685,8 @@ define cbfs-add-cmd-for-region
 		$(filter flat-binary,$(call extract_nth,3,$(1))),-flat-binary) \
 	-f $(call extract_nth,1,$(1)) \
 	-n $(call extract_nth,2,$(1)) \
-	$(if $(filter-out flat-binary,$(filter-out stage,$(call \
-		extract_nth,3,$(1)))),-t $(call extract_nth,3,$(1))) \
+	$(if $(filter-out flat-binary payload stage,$(call \
+		extract_nth,3,$(1))),-t $(call extract_nth,3,$(1))) \
 	$(if $(call extract_nth,4,$(1)),-c $(call extract_nth,4,$(1))) \
 	$(cbfs-autogen-attributes) \
 	-r $(2) \

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=\

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");

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)

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)
 

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"},