KekenoBSD/src
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

stand: remove unnecessary checks for "elfN kernel"

Browse Source 
We never set the kernel type to either "elf64 kernel" nor "elf32
kernel".

Reviewed by: imp, kib
Pull Request: https://github.com/freebsd/freebsd-src/pull/1394
This commit is contained in:
Ahmad Khalifa
2024-08-22 22:07:59 +03:00
committed by Warner Losh
parent b72ae900d4
commit 707136024f
8 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stand/common/bootstrap.h
+1 -1
View File
@@ -230,7 +230,7 @@ struct kernel_module
struct preloaded_file struct preloaded_file
{ {
char *f_name; /* file name */ char *f_name; /* file name */
char *f_type; /* verbose file type, eg 'ELF kernel', 'pnptable', etc. */ char *f_type; /* verbose file type, eg 'elf kernel', 'pnptable', etc. */
char *f_args; /* arguments for the file */ char *f_args; /* arguments for the file */
/* metadata that will be placed in the module directory */ /* metadata that will be placed in the module directory */
struct file_metadata *f_metadata; struct file_metadata *f_metadata;
stand/common/gfx_fb.c
-4
View File
@@ -2983,8 +2983,6 @@ build_font_module(vm_offset_t addr)
fi.fi_checksum = -checksum; fi.fi_checksum = -checksum;
fp = file_findfile(NULL, "elf kernel"); fp = file_findfile(NULL, "elf kernel");
if (fp == NULL)
fp = file_findfile(NULL, "elf64 kernel");
if (fp == NULL) if (fp == NULL)
panic("can't find kernel file"); panic("can't find kernel file");
@@ -3027,8 +3025,6 @@ build_splash_module(vm_offset_t addr)
} }
fp = file_findfile(NULL, "elf kernel"); fp = file_findfile(NULL, "elf kernel");
if (fp == NULL)
fp = file_findfile(NULL, "elf64 kernel");
if (fp == NULL) if (fp == NULL)
panic("can't find kernel file"); panic("can't find kernel file");
stand/common/metadata.c
-2
View File
@@ -146,8 +146,6 @@ md_load_dual(char *args, vm_offset_t *modulep, vm_offset_t *dtb, int kern64)
#endif #endif
kernend = 0; kernend = 0;
kfp = file_findfile(NULL, kern64 ? "elf64 kernel" : "elf32 kernel");
if (kfp == NULL)
kfp = file_findfile(NULL, "elf kernel"); kfp = file_findfile(NULL, "elf kernel");
if (kfp == NULL) if (kfp == NULL)
panic("can't find kernel file"); panic("can't find kernel file");
stand/efi/loader/bootinfo.c
-2
View File
@@ -421,8 +421,6 @@ bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp, bool exit_bs)
#endif #endif
kfp = file_findfile(NULL, "elf kernel"); kfp = file_findfile(NULL, "elf kernel");
if (kfp == NULL)
kfp = file_findfile(NULL, "elf64 kernel");
if (kfp == NULL) if (kfp == NULL)
panic("can't find kernel file"); panic("can't find kernel file");
kernend = 0; /* fill it in later */ kernend = 0; /* fill it in later */
stand/i386/libi386/bootinfo32.c
-2
View File
@@ -130,8 +130,6 @@ bi_load32(char *args, int *howtop, int *bootdevp, vm_offset_t *bip, vm_offset_t
addr = roundup(addr, PAGE_SIZE); addr = roundup(addr, PAGE_SIZE);
kfp = file_findfile(NULL, "elf kernel"); kfp = file_findfile(NULL, "elf kernel");
if (kfp == NULL)
kfp = file_findfile(NULL, "elf32 kernel");
if (kfp == NULL) if (kfp == NULL)
panic("can't find kernel file"); panic("can't find kernel file");
kernend = 0; /* fill it in later */ kernend = 0; /* fill it in later */
stand/i386/libi386/bootinfo64.c
-2
View File
@@ -144,8 +144,6 @@ bi_load64(char *args, vm_offset_t *modulep,
module = *modulep = addr; module = *modulep = addr;
kfp = file_findfile(NULL, "elf kernel"); kfp = file_findfile(NULL, "elf kernel");
if (kfp == NULL)
kfp = file_findfile(NULL, "elf64 kernel");
if (kfp == NULL) if (kfp == NULL)
panic("can't find kernel file"); panic("can't find kernel file");
kernend = 0; /* fill it in later */ kernend = 0; /* fill it in later */
stand/userboot/userboot/bootinfo32.c
-2
View File
@@ -109,8 +109,6 @@ bi_load32(char *args, int *howtop, int *bootdevp, vm_offset_t *bip, vm_offset_t
addr = roundup(addr, PAGE_SIZE); addr = roundup(addr, PAGE_SIZE);
kfp = file_findfile(NULL, "elf kernel"); kfp = file_findfile(NULL, "elf kernel");
if (kfp == NULL)
kfp = file_findfile(NULL, "elf32 kernel");
if (kfp == NULL) if (kfp == NULL)
panic("can't find kernel file"); panic("can't find kernel file");
kernend = 0; /* fill it in later */ kernend = 0; /* fill it in later */
stand/userboot/userboot/bootinfo64.c
-2
View File
@@ -141,8 +141,6 @@ bi_load64(char *args, vm_offset_t *modulep, vm_offset_t *kernendp)
addr = roundup(addr, PAGE_SIZE); addr = roundup(addr, PAGE_SIZE);
kfp = file_findfile(NULL, "elf kernel"); kfp = file_findfile(NULL, "elf kernel");
if (kfp == NULL)
kfp = file_findfile(NULL, "elf64 kernel");
if (kfp == NULL) if (kfp == NULL)
panic("can't find kernel file"); panic("can't find kernel file");
kernend = 0; /* fill it in later */ kernend = 0; /* fill it in later */