diff options
| author | peter <peter@FreeBSD.org> | 2003-04-30 22:00:16 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2003-04-30 22:00:16 +0000 |
| commit | a2b7260f7d58670581d01616b5054f809cc9ff92 (patch) | |
| tree | 4b1ab8fa0dfd621d2f3a0f18989018bca1069a28 /sys/boot/powerpc | |
| parent | a2678ea95769648c4745c185f59744569ba3a340 (diff) | |
| download | FreeBSD-src-a2b7260f7d58670581d01616b5054f809cc9ff92.zip FreeBSD-src-a2b7260f7d58670581d01616b5054f809cc9ff92.tar.gz | |
Also look for an "elf64 kernel" (for sparc64) and "elf32 kernel" (for
powerpc) when building metadata.
Diffstat (limited to 'sys/boot/powerpc')
| -rw-r--r-- | sys/boot/powerpc/loader/metadata.c | 4 | ||||
| -rw-r--r-- | sys/boot/powerpc/ofw/metadata.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/boot/powerpc/loader/metadata.c b/sys/boot/powerpc/loader/metadata.c index 0ef06a9..bb02c5e 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 0ef06a9..bb02c5e 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); |
