diff options
| author | Martin Roth <gaumless@gmail.com> | 2022-11-07 11:33:58 -0700 |
|---|---|---|
| committer | Felix Singer <service+coreboot-gerrit@felixsinger.de> | 2023-08-21 20:16:05 +0000 |
| commit | 8fc6d18fc0ae1c47718ee51c86d38193b12e6e5d (patch) | |
| tree | c3021de06dbbe443f54439a2a1096ed32ca19ba1 /payloads/external/Makefile.inc | |
| parent | 08f97328158fa9b444e66a40acbfc2894ffea82a (diff) | |
payloads/external: Add memtest86+ v6 as secondary payload
This adds a Kconfig option to select memtest86+ version 6 as a secondary
payload and sets that as the default. The coreboot version 5 code may
still be selected and used if desired.
Compiling for 32 bit requires glibc from multilib installed, if the host
system is running on 64 bit, as header files, e.g. gnu/stubs-32.h, are
required from there. So introduce a new choice menu which allows to
choose between 32 and 64 bit.
By default, the stable 6.20 version is selected instead of the top of
the main branch.
TEST=Build both V5 and V6, boot them in QEMU
Signed-off-by: Martin Roth <gaumless@gmail.com>
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Change-Id: Ie0eedc25fcf37b925b072ca809c019a599a20392
Reviewed-on: https://review.coreboot.org/c/coreboot/+/69277
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Singer <service+coreboot-gerrit@felixsinger.de>
Diffstat (limited to 'payloads/external/Makefile.inc')
| -rw-r--r-- | payloads/external/Makefile.inc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index 8222dc8918..779b3f4260 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -304,8 +304,14 @@ img/tint-compression := $(CBFS_SECONDARY_PAYLOAD_COMPRESS_FLAG) # Memtest86+ +ifeq ($(CONFIG_MEMTEST86PLUS_V6),y) +memtest_dir:=memtest86plus_v6 +else +memtest_dir:=memtest86plus_v5 +endif + cbfs-files-$(CONFIG_MEMTEST_SECONDARY_PAYLOAD) += img/memtest -img/memtest-file := payloads/external/Memtest86Plus/memtest86plus/memtest +img/memtest-file := payloads/external/Memtest86Plus/$(memtest_dir)/memtest img/memtest-type := payload img/memtest-compression := $(CBFS_SECONDARY_PAYLOAD_COMPRESS_FLAG) @@ -315,7 +321,7 @@ ifeq ($(CONFIG_CONSOLE_SERIAL)$(CONFIG_DRIVERS_UART_8250IO),yy) SERIAL_BAUD_RATE=$(CONFIG_TTYS0_BAUD) endif -payloads/external/Memtest86Plus/memtest86plus/memtest: $(DOTCONFIG) +payloads/external/Memtest86Plus/$(memtest_dir)/memtest: $(DOTCONFIG) $(MAKE) -C payloads/external/Memtest86Plus all \ CC="$(CC_x86_32)" \ LD="$(LD_x86_32)" \ @@ -325,6 +331,8 @@ payloads/external/Memtest86Plus/memtest86plus/memtest: $(DOTCONFIG) CONFIG_MEMTEST_REVISION_ID=$(CONFIG_MEMTEST_REVISION_ID) \ CONFIG_MEMTEST_MAIN=$(CONFIG_MEMTEST_MAIN) \ CONFIG_MEMTEST_STABLE=$(CONFIG_MEMTEST_STABLE) \ + CONFIG_MEMTEST86PLUS_V5=$(CONFIG_MEMTEST86PLUS_V5) \ + CONFIG_MEMTEST86PLUS_V6=$(CONFIG_MEMTEST86PLUS_V6) \ $(MEMTEST_SERIAL_OPTIONS) \ MFLAGS= MAKEFLAGS= |