aboutsummaryrefslogtreecommitdiff
path: root/sys/boot
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>2003-04-30 22:00:16 +0000
committerPeter Wemm <peter@FreeBSD.org>2003-04-30 22:00:16 +0000
commit145b0eb56d335da7530e1d0cb3da9a03d608f823 (patch)
tree4b1ab8fa0dfd621d2f3a0f18989018bca1069a28 /sys/boot
parentdaf509c61255abad091e469276bb74e2ea25f162 (diff)
Notes
Diffstat (limited to 'sys/boot')
-rw-r--r--sys/boot/powerpc/loader/metadata.c4
-rw-r--r--sys/boot/powerpc/ofw/metadata.c4
-rw-r--r--sys/boot/sparc64/loader/metadata.c4
3 files changed, 9 insertions, 3 deletions
diff --git a/sys/boot/powerpc/loader/metadata.c b/sys/boot/powerpc/loader/metadata.c
index 0ef06a908bba..bb02c5ed851a 100644
--- a/sys/boot/powerpc/loader/metadata.c
+++ b/sys/boot/powerpc/loader/metadata.c
@@ -294,7 +294,9 @@ md_load(char *args, vm_offset_t *modulep)
addr = roundup(addr, PAGE_SIZE);
kernend = 0;
- kfp = file_findfile(NULL, "elf kernel");
+ kfp = file_findfile(NULL, "elf32 kernel");
+ if (kfp == NULL)
+ kfp = file_findfile(NULL, "elf kernel");
if (kfp == NULL)
panic("can't find kernel file");
file_addmetadata(kfp, MODINFOMD_HOWTO, sizeof howto, &howto);
diff --git a/sys/boot/powerpc/ofw/metadata.c b/sys/boot/powerpc/ofw/metadata.c
index 0ef06a908bba..bb02c5ed851a 100644
--- a/sys/boot/powerpc/ofw/metadata.c
+++ b/sys/boot/powerpc/ofw/metadata.c
@@ -294,7 +294,9 @@ md_load(char *args, vm_offset_t *modulep)
addr = roundup(addr, PAGE_SIZE);
kernend = 0;
- kfp = file_findfile(NULL, "elf kernel");
+ kfp = file_findfile(NULL, "elf32 kernel");
+ if (kfp == NULL)
+ kfp = file_findfile(NULL, "elf kernel");
if (kfp == NULL)
panic("can't find kernel file");
file_addmetadata(kfp, MODINFOMD_HOWTO, sizeof howto, &howto);
diff --git a/sys/boot/sparc64/loader/metadata.c b/sys/boot/sparc64/loader/metadata.c
index 5de7e7d13d56..a4122a899551 100644
--- a/sys/boot/sparc64/loader/metadata.c
+++ b/sys/boot/sparc64/loader/metadata.c
@@ -296,7 +296,9 @@ md_load(char *args, vm_offset_t *modulep)
addr = roundup(addr, PAGE_SIZE);
kernend = 0;
- kfp = file_findfile(NULL, "elf kernel");
+ kfp = file_findfile(NULL, "elf64 kernel");
+ if (kfp == NULL)
+ kfp = file_findfile(NULL, "elf kernel");
if (kfp == NULL)
panic("can't find kernel file");
file_addmetadata(kfp, MODINFOMD_HOWTO, sizeof howto, &howto);