summaryrefslogtreecommitdiffstats
path: root/sys/boot
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2001-11-19 07:05:10 +0000
committerpeter <peter@FreeBSD.org>2001-11-19 07:05:10 +0000
commit40fe009adb3a6ecfafb8f5dcc8760b8cd95ceef9 (patch)
tree19f3d7058562ed8d9b23c4a42a8a13103e8ef293 /sys/boot
parent536bf9b42bcef8da5af14ab7cadcd5902db77a24 (diff)
downloadFreeBSD-src-40fe009adb3a6ecfafb8f5dcc8760b8cd95ceef9.zip
FreeBSD-src-40fe009adb3a6ecfafb8f5dcc8760b8cd95ceef9.tar.gz
Remove bootinfo.bi_kernel. It isn't used by the kernel. struct bootinfo
should go away on ia64, we should be loader metadata based since that is the only way we can boot (loader, skiload).
Diffstat (limited to 'sys/boot')
-rw-r--r--sys/boot/efi/libefi/bootinfo.c6
-rw-r--r--sys/boot/ia64/common/bootinfo.c6
-rw-r--r--sys/boot/ia64/libski/bootinfo.c5
-rw-r--r--sys/boot/ia64/ski/bootinfo.c5
4 files changed, 0 insertions, 22 deletions
diff --git a/sys/boot/efi/libefi/bootinfo.c b/sys/boot/efi/libefi/bootinfo.c
index 18e5405..5fdbebf 100644
--- a/sys/boot/efi/libefi/bootinfo.c
+++ b/sys/boot/efi/libefi/bootinfo.c
@@ -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);
diff --git a/sys/boot/ia64/common/bootinfo.c b/sys/boot/ia64/common/bootinfo.c
index 18e5405..5fdbebf 100644
--- a/sys/boot/ia64/common/bootinfo.c
+++ b/sys/boot/ia64/common/bootinfo.c
@@ -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);
diff --git a/sys/boot/ia64/libski/bootinfo.c b/sys/boot/ia64/libski/bootinfo.c
index 7edba21..f7b8ae3 100644
--- a/sys/boot/ia64/libski/bootinfo.c
+++ b/sys/boot/ia64/libski/bootinfo.c
@@ -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);
diff --git a/sys/boot/ia64/ski/bootinfo.c b/sys/boot/ia64/ski/bootinfo.c
index 7edba21..f7b8ae3 100644
--- a/sys/boot/ia64/ski/bootinfo.c
+++ b/sys/boot/ia64/ski/bootinfo.c
@@ -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);
OpenPOWER on IntegriCloud