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

gpt*boot: Save a bit more memory when LOADER_NO_GELI_SUPPORT is specified

Browse Source 
Don't compile geliargs into the image and don't pass geliargs to the respective
bootloader code via __exec(..).

This saves a negligible amount of memory/disk space.

X-MFC with:	r296963
Obtained from:	Isilon OneFS
Sponsored by:	Dell EMC Isilon
This commit is contained in:
Enji Cooper 2017-03-28 07:10:35 +00:00
parent fa7083e0a0
commit 156715d048
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/boot/i386/gptboot/gptboot.c
View File

@ -84,7 +84,9 @@ static struct dsk dsk;
static char kname[1024]; static char kname[1024];
static int comspeed = SIOSPD; static int comspeed = SIOSPD;
static struct bootinfo bootinfo; static struct bootinfo bootinfo;
#ifdef LOADER_GELI_SUPPORT
static struct geli_boot_args geliargs; static struct geli_boot_args geliargs;
#endif
static vm_offset_t high_heap_base; static vm_offset_t high_heap_base;
static uint32_t bios_basemem, bios_extmem, high_heap_size; static uint32_t bios_basemem, bios_extmem, high_heap_size;
@ -476,16 +478,18 @@ load(void)
bootinfo.bi_esymtab = VTOP(p); bootinfo.bi_esymtab = VTOP(p);
bootinfo.bi_kernelname = VTOP(kname); bootinfo.bi_kernelname = VTOP(kname);
bootinfo.bi_bios_dev = dsk.drive; bootinfo.bi_bios_dev = dsk.drive;
geliargs.size = sizeof(geliargs);
#ifdef LOADER_GELI_SUPPORT #ifdef LOADER_GELI_SUPPORT
geliargs.size = sizeof(geliargs);
bcopy(gelipw, geliargs.gelipw, sizeof(geliargs.gelipw)); bcopy(gelipw, geliargs.gelipw, sizeof(geliargs.gelipw));
bzero(gelipw, sizeof(gelipw)); bzero(gelipw, sizeof(gelipw));
#else
geliargs.gelipw[0] = '\0';
#endif #endif
__exec((caddr_t)addr, RB_BOOTINFO | (opts & RBX_MASK), __exec((caddr_t)addr, RB_BOOTINFO | (opts & RBX_MASK),
MAKEBOOTDEV(dev_maj[dsk.type], dsk.part + 1, dsk.unit, 0xff), MAKEBOOTDEV(dev_maj[dsk.type], dsk.part + 1, dsk.unit, 0xff),
KARGS_FLAGS_EXTARG, 0, 0, VTOP(&bootinfo), geliargs); KARGS_FLAGS_EXTARG, 0, 0, VTOP(&bootinfo)
#ifdef LOADER_GELI_SUPPORT
, geliargs
#endif
);
} }
static int static int