diff options
author | Kevin O'Connor <kevin@koconnor.net> | 2010-12-29 11:18:04 -0500 |
---|---|---|
committer | Kevin O'Connor <kevin@koconnor.net> | 2010-12-29 13:26:33 -0500 |
commit | baaadb6e1d195e8e871d060dc86b2a86228b076e (patch) | |
tree | 2c8dc84379a799e012c6fa266ffbd0f0c6e5114e | |
parent | a0842f8d49c7f02cecd029a0023a97253a7a8b06 (diff) |
Move IPL.checkfloppysig to a global (CheckFloppySig) in boot.c.
-rw-r--r-- | src/boot.c | 7 | ||||
-rw-r--r-- | src/boot.h | 1 |
2 files changed, 4 insertions, 4 deletions
@@ -86,6 +86,8 @@ int bootprio_find_named_rom(const char *name, int instance) * Boot setup ****************************************************************/ +static int CheckFloppySig = 1; + #define DEFAULT_PRIO 9999 static int DefaultFloppyPrio = 101; @@ -100,12 +102,11 @@ boot_setup(void) return; SET_EBDA(boot_sequence, 0xffff); - IPL.checkfloppysig = 1; if (!CONFIG_COREBOOT) { // On emulators, get boot order from nvram. if (inb_cmos(CMOS_BIOS_BOOTFLAG1) & 1) - IPL.checkfloppysig = 0; + CheckFloppySig = 0; u32 bootorder = (inb_cmos(CMOS_BIOS_BOOTFLAG2) | ((inb_cmos(CMOS_BIOS_BOOTFLAG1) & 0xf0) << 4)); DefaultFloppyPrio = DefaultCDPrio = DefaultHDPrio @@ -473,7 +474,7 @@ do_boot(u16 seq_nr) switch (ie->type) { case IPL_TYPE_FLOPPY: printf("Booting from Floppy...\n"); - boot_disk(0x00, IPL.checkfloppysig); + boot_disk(0x00, CheckFloppySig); break; case IPL_TYPE_HARDDISK: printf("Booting from Hard Disk...\n"); @@ -15,7 +15,6 @@ struct ipl_entry_s { struct ipl_s { struct ipl_entry_s bev[8]; int bevcount; - int checkfloppysig; char **fw_bootorder; int fw_bootorder_count; }; |