aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Pau Monné <royger@FreeBSD.org>2021-02-16 15:06:14 +0000
committerRoger Pau Monné <royger@FreeBSD.org>2021-02-16 15:14:32 +0000
commit97527e9c4fd37140da3129bc12003172edbf7a23 (patch)
tree895703d2fd9caa69f7f25f45abf167adcbecfd1f
parent0fc8a796722846d0d676548aa0f5cc660199db73 (diff)
downloadsrc-97527e9c4fd37140da3129bc12003172edbf7a23.tar.gz
src-97527e9c4fd37140da3129bc12003172edbf7a23.zip
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
-rw-r--r--stand/efi/loader/bootinfo.c2
1 files changed, 2 insertions, 0 deletions
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);