diff options
| author | Martin Roth <martinroth@google.com> | 2016-02-28 15:56:27 -0800 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2016-03-05 22:57:53 +0100 |
| commit | be63a24c4ce29e7e9f096b9ebd94e6d5a65f24a9 (patch) | |
| tree | 8ffdd441bcfd8d05d92f77259ed57397833b535b /payloads/external/Makefile.inc | |
| parent | f7fd63066fe3b74a1ae10fa6eabf2605d5730449 (diff) | |
BuildSystem: Add Memtest86+ as a secondary payload
This allows memtest86+ to be added to CBFS as a 'secondary'
payload on x86 systems, to be loaded by the main payload
if desired.
Selecting this option, which defaults to no, builds the memtest86+
payload and adds it to CBFS as `img/memtest` which can then be
loaded by for example SeaBIOS or GRUB.
Change-Id: Iecf876aaf588ba1df7abdf6668cb26f089bf5f42
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/13858
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: build bot (Jenkins)
Reviewed-by: Ben Gardner <gardner.ben@gmail.com>
Diffstat (limited to 'payloads/external/Makefile.inc')
| -rw-r--r-- | payloads/external/Makefile.inc | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index 6a76020ffe..557de2ad83 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -82,3 +82,22 @@ payloads/external/U-Boot/u-boot/u-boot-dtb.bin u-boot: $(top)/$(DOTCONFIG) $(MAKE) -C payloads/external/U-Boot -f Makefile.inc \ CONFIG_UBOOT_MASTER=$(CONFIG_UBOOT_MASTER) \ CONFIG_UBOOT_STABLE=$(CONFIG_UBOOT_STABLE) + +cbfs-files-$(CONFIG_MEMTEST_SECONDARY_PAYLOAD) += img/memtest +img/memtest-file := payloads/external/Memtest86Plus/memtest86plus/memtest +img/memtest-type := payload + +ifeq ($(CONFIG_CONSOLE_SERIAL)$(CONFIG_DRIVERS_UART_8250IO),yy) + MEMTEST_SERIAL_OPTIONS=SERIAL_CONSOLE_DEFAULT=1 \ + SERIAL_TTY=$(CONFIG_UART_FOR_CONSOLE) \ + SERIAL_BAUD_RATE=$(CONFIG_TTYS0_BAUD) +endif + +payloads/external/Memtest86Plus/memtest86plus/memtest: $(top)/$(DOTCONFIG) + $(MAKE) -C payloads/external/Memtest86Plus -f Makefile.inc all \ + CC="$(CC_x86_32)" \ + LD="$(LD_x86_32)" \ + OBJCOPY="$(OBJCOPY_x86_32)" \ + AS="$(AS_x86_32)" \ + $(MEMTEST_SERIAL_OPTIONS) \ + MFLAGS= MAKEFLAGS= |