| main.c (271406) | main.c (281138) |
|---|---|
| 1/*- 2 * Copyright (c) 1998 Michael Smith <msmith@freebsd.org> 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 11 unchanged lines hidden (view full) --- 20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 */ 26 27#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 1998 Michael Smith <msmith@freebsd.org> 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 11 unchanged lines hidden (view full) --- 20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 */ 26 27#include <sys/cdefs.h> |
| 28__FBSDID("$FreeBSD: head/sys/boot/i386/loader/main.c 271406 2014-09-10 21:07:00Z imp $"); | 28__FBSDID("$FreeBSD: head/sys/boot/i386/loader/main.c 281138 2015-04-06 06:55:47Z rpaulo $"); |
| 29 30/* 31 * MD bootstrap main() and assorted miscellaneous 32 * commands. 33 */ 34 35#include <stand.h> 36#include <stddef.h> 37#include <string.h> 38#include <machine/bootinfo.h> 39#include <machine/cpufunc.h> 40#include <machine/psl.h> 41#include <sys/reboot.h> 42 43#include "bootstrap.h" 44#include "common/bootargs.h" 45#include "libi386/libi386.h" | 29 30/* 31 * MD bootstrap main() and assorted miscellaneous 32 * commands. 33 */ 34 35#include <stand.h> 36#include <stddef.h> 37#include <string.h> 38#include <machine/bootinfo.h> 39#include <machine/cpufunc.h> 40#include <machine/psl.h> 41#include <sys/reboot.h> 42 43#include "bootstrap.h" 44#include "common/bootargs.h" 45#include "libi386/libi386.h" |
| 46#include "libi386/smbios.h" |
|
| 46#include "btxv86.h" 47 48#ifdef LOADER_ZFS_SUPPORT 49#include "../zfs/libzfs.h" 50#endif 51 52CTASSERT(sizeof(struct bootargs) == BOOTARGS_SIZE); 53CTASSERT(offsetof(struct bootargs, bootinfo) == BA_BOOTINFO); --- 56 unchanged lines hidden (view full) --- 110 } else 111#endif 112 { 113 heap_top = (void *)PTOV(bios_basemem); 114 heap_bottom = (void *)end; 115 } 116 setheap(heap_bottom, heap_top); 117 | 47#include "btxv86.h" 48 49#ifdef LOADER_ZFS_SUPPORT 50#include "../zfs/libzfs.h" 51#endif 52 53CTASSERT(sizeof(struct bootargs) == BOOTARGS_SIZE); 54CTASSERT(offsetof(struct bootargs, bootinfo) == BA_BOOTINFO); --- 56 unchanged lines hidden (view full) --- 111 } else 112#endif 113 { 114 heap_top = (void *)PTOV(bios_basemem); 115 heap_bottom = (void *)end; 116 } 117 setheap(heap_bottom, heap_top); 118 |
| 118 /* | 119 /* |
| 119 * XXX Chicken-and-egg problem; we want to have console output early, but some 120 * console attributes may depend on reading from eg. the boot device, which we 121 * can't do yet. 122 * 123 * We can use printf() etc. once this is done. 124 * If the previous boot stage has requested a serial console, prefer that. 125 */ 126 bi_setboothowto(initial_howto); --- 49 unchanged lines hidden (view full) --- 176 initial_bootinfo->bi_basemem = bios_basemem / 1024; 177 initial_bootinfo->bi_extmem = bios_extmem / 1024; 178 } 179 180 /* detect ACPI for future reference */ 181 biosacpi_detect(); 182 183 /* detect SMBIOS for future reference */ | 120 * XXX Chicken-and-egg problem; we want to have console output early, but some 121 * console attributes may depend on reading from eg. the boot device, which we 122 * can't do yet. 123 * 124 * We can use printf() etc. once this is done. 125 * If the previous boot stage has requested a serial console, prefer that. 126 */ 127 bi_setboothowto(initial_howto); --- 49 unchanged lines hidden (view full) --- 177 initial_bootinfo->bi_basemem = bios_basemem / 1024; 178 initial_bootinfo->bi_extmem = bios_extmem / 1024; 179 } 180 181 /* detect ACPI for future reference */ 182 biosacpi_detect(); 183 184 /* detect SMBIOS for future reference */ |
| 184 smbios_detect(); | 185 smbios_detect(NULL); |
| 185 186 /* detect PCI BIOS for future reference */ 187 biospci_detect(); 188 189 printf("\n"); 190 printf("%s, Revision %s\n", bootprog_name, bootprog_rev); 191 printf("(%s, %s)\n", bootprog_maker, bootprog_date); 192 --- 205 unchanged lines hidden --- | 186 187 /* detect PCI BIOS for future reference */ 188 biospci_detect(); 189 190 printf("\n"); 191 printf("%s, Revision %s\n", bootprog_name, bootprog_rev); 192 printf("(%s, %s)\n", bootprog_maker, bootprog_date); 193 --- 205 unchanged lines hidden --- |