d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove bootinfo.bi_kernel. It isn't used by the kernel. struct bootinfo

Browse Source 
should go away on ia64, we should be loader metadata based since that is
the only way we can boot (loader, skiload).
This commit is contained in:
Peter Wemm 2001-11-19 07:05:10 +00:00
parent a812f645bc
commit de76c8189e
5 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/boot/efi/libefi/bootinfo.c
View File

@ -249,7 +249,6 @@ bi_load(struct bootinfo *bi, struct preloaded_file *fp, UINTN *mapkey)
struct preloaded_file *xp;
vm_offset_t addr, bootinfo_addr;
u_int pad;
char *kernelname;
vm_offset_t ssym, esym;
struct file_metadata *md;
EFI_STATUS status;
@ -328,11 +327,6 @@ bi_load(struct bootinfo *bi, struct preloaded_file *fp, UINTN *mapkey)
/* all done copying stuff in, save end of loaded object space */
bi->bi_kernend = addr;
kernelname = getenv("kernelname");
if (kernelname) {
strncpy(bi->bi_kernel, kernelname, sizeof(bi->bi_kernel) - 1);
}
/* read memory map and stash it after bootinfo */
bi->bi_memmap = (u_int64_t)(bi + 1);
bi->bi_memmap_size = 8192 - sizeof(struct bootinfo);

6
sys/boot/ia64/common/bootinfo.c
View File

@ -249,7 +249,6 @@ bi_load(struct bootinfo *bi, struct preloaded_file *fp, UINTN *mapkey)
struct preloaded_file *xp;
vm_offset_t addr, bootinfo_addr;
u_int pad;
char *kernelname;
vm_offset_t ssym, esym;
struct file_metadata *md;
EFI_STATUS status;
@ -328,11 +327,6 @@ bi_load(struct bootinfo *bi, struct preloaded_file *fp, UINTN *mapkey)
/* all done copying stuff in, save end of loaded object space */
bi->bi_kernend = addr;
kernelname = getenv("kernelname");
if (kernelname) {
strncpy(bi->bi_kernel, kernelname, sizeof(bi->bi_kernel) - 1);
}
/* read memory map and stash it after bootinfo */
bi->bi_memmap = (u_int64_t)(bi + 1);
bi->bi_memmap_size = 8192 - sizeof(struct bootinfo);

5
sys/boot/ia64/libski/bootinfo.c
View File

@ -318,11 +318,6 @@ bi_load(struct bootinfo *bi, struct preloaded_file *fp, char *args)
/* all done copying stuff in, save end of loaded object space */
bi->bi_kernend = addr;
kernelname = getenv("kernelname");
if (kernelname) {
strncpy(bi->bi_kernel, kernelname, sizeof(bi->bi_kernel) - 1);
}
/* Describe the SKI memory map. */
bi->bi_memmap = (u_int64_t)(bi + 1);
bi->bi_memmap_size = 2 * sizeof(EFI_MEMORY_DESCRIPTOR);

5
sys/boot/ia64/ski/bootinfo.c
View File

@ -318,11 +318,6 @@ bi_load(struct bootinfo *bi, struct preloaded_file *fp, char *args)
/* all done copying stuff in, save end of loaded object space */
bi->bi_kernend = addr;
kernelname = getenv("kernelname");
if (kernelname) {
strncpy(bi->bi_kernel, kernelname, sizeof(bi->bi_kernel) - 1);
}
/* Describe the SKI memory map. */
bi->bi_memmap = (u_int64_t)(bi + 1);
bi->bi_memmap_size = 2 * sizeof(EFI_MEMORY_DESCRIPTOR);

2
sys/ia64/include/bootinfo.h
View File

@ -46,7 +46,7 @@
struct bootinfo {
u_int64_t bi_magic; /* BOOTINFO_MAGIC */
u_int64_t bi_version; /* version 1 */
char bi_kernel[64]; /* name of booted kernel */
u_int64_t bi_spare[8]; /* was: name of booted kernel */
u_int64_t bi_boothowto; /* value for boothowto */
u_int64_t bi_systab; /* pa of EFI system table */
u_int64_t bi_memmap; /* pa of EFI memory map */