From c6d134988c856d0025153fb885045d995bc8c397 Mon Sep 17 00:00:00 2001 From: "Ronald G. Minnich" Date: Tue, 15 May 2018 18:05:07 -0700 Subject: 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 Reviewed-on: https://review.coreboot.org/26310 Tested-by: build bot (Jenkins) Reviewed-by: Julius Werner Reviewed-by: Werner Zeh Reviewed-by: Patrick Georgi --- payloads/external/Makefile.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'payloads/external') 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) -- cgit v1.2.3