coreboot-mirror
/
seabios
mirror of https://review.coreboot.org/seabios.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "geometry: Read LCHS from fw_cfg" 

This reverts commit 7c66a439c0.
This commit is contained in:
Gerd Hoffmann 2019-11-15 12:19:42 +01:00
parent acc70aa8d1
commit 695f176d3e
1 changed files with 0 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
src/boot.c
View File

@ -72,92 +72,6 @@ build_pci_path(char *buf, int max, const char *devname, struct pci_device *pci)
}
/****************************************************************
* Boot device parameters
****************************************************************/
typedef struct BootDeviceSerialized {
u32 lcyls;
u32 lheads;
u32 lsecs;
} PACKED BootDeviceSerialized;
typedef struct BootDevice {
char *name;
u32 lcyls;
u32 lheads;
u32 lsecs;
} BootDevice;
static BootDevice *BootDevices VARVERIFY32INIT;
static int BootDeviceCount;
static void
loadBootDevices(void)
{
BootDeviceCount = 0;
int fsize;
char *f = romfile_loadfile("bootdevices", &fsize);
if (!f)
return;
if (fsize < sizeof(u32))
return;
u32 struct_size = *((u32 *)f);
if (struct_size < sizeof(BootDeviceSerialized))
return;
fsize -= sizeof(u32);
f += sizeof(u32);
int i;
int str_found = 0;
for (i = 0; i < fsize; i++) {
if (f[i] != '\0')
str_found = 1;
else if (f[i] == '\0' && str_found) {
str_found = 0;
i++;
if (i + struct_size > fsize)
break;
i += struct_size - 1;
BootDeviceCount++;
} else
break;
}
BootDevices = malloc_tmphigh(BootDeviceCount * sizeof(BootDevice));
if (!BootDevices) {
warn_noalloc();
free(f);
BootDeviceCount = 0;
return;
}
dprintf(1, "boot devices:\n");
BootDeviceSerialized *blk;
BootDevice *d;
for (i = 0; i < BootDeviceCount; i++) {
d = &BootDevices[i];
d->name = f;
f += strlen(f) + 1;
blk = (BootDeviceSerialized *)f;
d->lcyls = blk->lcyls;
d->lheads = blk->lheads;
d->lsecs = blk->lsecs;
f += struct_size;
dprintf(1, "%s: (%u, %u, %u)\n",
d->name, d->lcyls, d->lheads, d->lsecs);
}
}
/****************************************************************
* Boot priority ordering
****************************************************************/
@ -378,7 +292,6 @@ boot_init(void)
BootRetryTime = romfile_loadint("etc/boot-fail-wait", 60*1000);
loadBootOrder();
loadBootDevices();
}