diff options
| -rw-r--r-- | config/coreboot/macbook11/target.cfg | 1 | ||||
| -rw-r--r-- | config/coreboot/t60_16mb_intelgpu/target.cfg | 1 | ||||
| -rw-r--r-- | config/coreboot/t60_intelgpu/target.cfg | 1 | ||||
| -rw-r--r-- | config/coreboot/x60/target.cfg | 1 | ||||
| -rw-r--r-- | config/coreboot/x60_16mb/target.cfg | 1 | ||||
| -rw-r--r-- | config/memtest86plus/patches/0001-add-central-Makefile-in-main-directory.patch | 23 | ||||
| -rwxr-xr-x | script/build/fw/coreboot | 2 |
7 files changed, 13 insertions, 17 deletions
diff --git a/config/coreboot/macbook11/target.cfg b/config/coreboot/macbook11/target.cfg index 1bbaa8fc..117e160d 100644 --- a/config/coreboot/macbook11/target.cfg +++ b/config/coreboot/macbook11/target.cfg @@ -4,7 +4,6 @@ arch="x86_32" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" -payload_memtest="y" grub_scan_disk="ahci" microcode_required="n" vendorfiles="n" diff --git a/config/coreboot/t60_16mb_intelgpu/target.cfg b/config/coreboot/t60_16mb_intelgpu/target.cfg index 91fc7462..8f4eb55e 100644 --- a/config/coreboot/t60_16mb_intelgpu/target.cfg +++ b/config/coreboot/t60_16mb_intelgpu/target.cfg @@ -4,7 +4,6 @@ arch="x86_32" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" -payload_memtest="y" grub_scan_disk="ahci" microcode_required="n" vendorfiles="n" diff --git a/config/coreboot/t60_intelgpu/target.cfg b/config/coreboot/t60_intelgpu/target.cfg index 91fc7462..8f4eb55e 100644 --- a/config/coreboot/t60_intelgpu/target.cfg +++ b/config/coreboot/t60_intelgpu/target.cfg @@ -4,7 +4,6 @@ arch="x86_32" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" -payload_memtest="y" grub_scan_disk="ahci" microcode_required="n" vendorfiles="n" diff --git a/config/coreboot/x60/target.cfg b/config/coreboot/x60/target.cfg index 91fc7462..8f4eb55e 100644 --- a/config/coreboot/x60/target.cfg +++ b/config/coreboot/x60/target.cfg @@ -4,7 +4,6 @@ arch="x86_32" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" -payload_memtest="y" grub_scan_disk="ahci" microcode_required="n" vendorfiles="n" diff --git a/config/coreboot/x60_16mb/target.cfg b/config/coreboot/x60_16mb/target.cfg index 91fc7462..8f4eb55e 100644 --- a/config/coreboot/x60_16mb/target.cfg +++ b/config/coreboot/x60_16mb/target.cfg @@ -4,7 +4,6 @@ arch="x86_32" payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" -payload_memtest="y" grub_scan_disk="ahci" microcode_required="n" vendorfiles="n" diff --git a/config/memtest86plus/patches/0001-add-central-Makefile-in-main-directory.patch b/config/memtest86plus/patches/0001-add-central-Makefile-in-main-directory.patch index 7a54c102..8291bfb8 100644 --- a/config/memtest86plus/patches/0001-add-central-Makefile-in-main-directory.patch +++ b/config/memtest86plus/patches/0001-add-central-Makefile-in-main-directory.patch @@ -1,39 +1,40 @@ -From 1727cb88a183a9e787e359e42c0a499917ba495b Mon Sep 17 00:00:00 2001 +From 81d850494c3cde1da33cc2df44837c839c1f2c60 Mon Sep 17 00:00:00 2001 From: Leah Rowe <leah@libreboot.org> Date: Fri, 6 Oct 2023 23:17:06 +0100 Subject: [PATCH 1/1] add central Makefile in main directory -it just runs the Makefiles in build32 and build64 +it only does build64. i'm disabling use of 32-bit memtest in lbmk, +until i can figure out a more consistent cross-compile method, +rather than relying on hostcc. -all, clean and distclean(runs clean) are supported +a user on irc reported build issues on pop os -this makes memtest86plus integrate easier in lbmk +it's not pop's fault. lbmk needs to start handling cross +compilers properly. (alternatively, i could rig memtest86+ +to use crossgcc. i'll explore that later) Signed-off-by: Leah Rowe <leah@libreboot.org> --- - Makefile | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) + Makefile | 11 +++++++++++ + 1 file changed, 11 insertions(+) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 -index 0000000..50f2d58 +index 0000000..59fcbef --- /dev/null +++ b/Makefile -@@ -0,0 +1,14 @@ +@@ -0,0 +1,11 @@ +# SPDX-License-Identifier: MIT +# SPDX-FileCopyrightText: 2023 Leah Rowe <leah@libreboot.org> + +all: -+ make -C build32 + make -C build64 + +clean: -+ make -C build32 clean + make -C build64 clean + +distclean: -+ make -C build32 clean + make -C build64 clean -- 2.39.2 diff --git a/script/build/fw/coreboot b/script/build/fw/coreboot index 091f9f0d..8efa39c3 100755 --- a/script/build/fw/coreboot +++ b/script/build/fw/coreboot @@ -130,7 +130,7 @@ prepare_target() build_dependency_seabios - memtest_bin="memtest86plus/build${arch#*_}/memtest.bin" + memtest_bin="memtest86plus/build64/memtest.bin" [ "${payload_memtest}" != "y" ] || [ -f "src/${memtest_bin}" ] || \ x_ ./update project trees -b memtest86plus |