mirror of
https://codeberg.org/libreboot/lbmk.git
synced 2026-07-15 17:36:11 +02:00
Leah Rowe
d22f7f9633
This brings these extra changes: * eaa3b8f0f Bump version to 2.15 * d38d6a1a9 Release 2.14 * 35bfd6c47 build: Add grub-core/tests/crypto_cipher_mode_vectors.h file to EXTRA_DIST * ac042f3f5 configure: Print a more helpful error if autoconf-archive is not installed * e37d02158 kern/ieee1275/openfw: Add a check for invalid partition number * f94eae0f8 grub-mkimage: Do not generate empty SBAT metadata * 1aa0dd0c0 configure: Defer check for -mcmodel=large until PIC/PIE checks are done * ff1edd975 util/grub-mkimagexx: Stop generating unaligned appended signatures * 51ebc6f67 tests: Add functional tests for ecb/cbc helpers * caaf50b9a osdep/aros/hostdisk: Fix use-after-free bug during MsgPort deletion * 18f08826f kern/efi/sb: Enable loading GRUB_FILE_TYPE_CRYPTODISK_ENCRYPTION_KEY and GRUB_FILE_TYPE_CRYPTODISK_DETACHED_HEADER NOTE: This patch was reversed: * ac042f3f5 configure: Print a more helpful error if autoconf-archive is not installed Because it quite unhelpfully broke the build. Signed-off-by: Leah Rowe <leah@libreboot.org>
38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
From 9ec8534a4d27db37cf4feebd44fd9f8973a89e59 Mon Sep 17 00:00:00 2001
|
|
From: Paul Menzel <pmenzel@molgen.mpg.de>
|
|
Date: Mon, 17 May 2021 10:24:36 +0200
|
|
Subject: [PATCH 09/10] kern/coreboot/mmap: Map to reserved
|
|
|
|
https://git.savannah.gnu.org/cgit/grub.git/commit/?id=6de9ee86bf9ae50967413e6a73b5dfd13e5ffb50
|
|
|
|
Signed-off-by: Paul Menzel <pmenzel@molgen.mpg.de>
|
|
---
|
|
grub-core/kern/coreboot/mmap.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/grub-core/kern/coreboot/mmap.c b/grub-core/kern/coreboot/mmap.c
|
|
index caf8f7cef..2fc316e8d 100644
|
|
--- a/grub-core/kern/coreboot/mmap.c
|
|
+++ b/grub-core/kern/coreboot/mmap.c
|
|
@@ -59,7 +59,7 @@ iterate_linuxbios_table (grub_linuxbios_table_item_t table_item, void *data)
|
|
/* Multiboot mmaps match with the coreboot mmap
|
|
definition. Therefore, we can just pass type
|
|
through. */
|
|
- mem_region->type,
|
|
+ (mem_region->type >= 13) ? 2 : mem_region->type,
|
|
ctx->hook_data))
|
|
return 1;
|
|
if (start < 0xa0000)
|
|
@@ -81,7 +81,7 @@ iterate_linuxbios_table (grub_linuxbios_table_item_t table_item, void *data)
|
|
/* Multiboot mmaps match with the coreboot mmap
|
|
definition. Therefore, we can just pass type
|
|
through. */
|
|
- mem_region->type,
|
|
+ (mem_region->type >= 13) ? 2 : mem_region->type,
|
|
ctx->hook_data))
|
|
return 1;
|
|
}
|
|
--
|
|
2.47.3
|
|
|