The branch main has been updated by royger:
URL:
https://cgit.FreeBSD.org/src/commit/?id=97527e9c4fd37140da3129bc12003172edbf7a23
commit 97527e9c4fd37140da3129bc12003172edbf7a23
Author: Roger Pau Monné <roy...@freebsd.org>
AuthorDate: 2021-02-16 15:06:14 +0000
Commit: Roger Pau Monné <roy...@freebsd.org>
CommitDate: 2021-02-16 15:14:32 +0000
bi_load: only add MODULEP on arches that have it defined
Do not attempt to add MODINFOMD_MODULEP to the kernel medatada on
arches that don't have it defined.
This fixes the build for arches different than amd64 after
7d3259775cb69f250df3e7fe51d6fff2283c6f20.
Sponsored by: Citrix Systems R&D
Reported by: lwhsu, arichardson
---
stand/efi/loader/bootinfo.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/stand/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.c
index 89ff6dca18d9..9924901d29e6 100644
--- a/stand/efi/loader/bootinfo.c
+++ b/stand/efi/loader/bootinfo.c
@@ -532,7 +532,9 @@ bi_load(char *args, vm_offset_t *modulep, vm_offset_t
*kernendp, bool exit_bs)
"device tree blob found!\n");
#endif
file_addmetadata(kfp, MODINFOMD_KERNEND, sizeof(kernend), &kernend);
+#ifdef MODINFOMD_MODULEP
file_addmetadata(kfp, MODINFOMD_MODULEP, sizeof(module), &module);
+#endif
file_addmetadata(kfp, MODINFOMD_FW_HANDLE, sizeof(ST), &ST);
#ifdef LOADER_GELI_SUPPORT
geli_export_key_metadata(kfp);
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
