#include "memmap.h" // add_e820
#include "util.h" // dprintf
-#include "pci.h" // struct pir_header
-#include "acpi.h" // struct rsdp_descriptor
-#include "mptable.h" // MPTABLE_SIGNATURE
#include "biosvar.h" // GET_EBDA
#include "lzmadecode.h" // LzmaDecode
#include "smbios.h" // smbios_init
+#include "boot.h" // boot_add_cbfs
/****************************************************************
}
static struct cb_memory *CBMemTable;
+const char *CBvendor = "", *CBpart = "";
// Populate max ram and e820 map info by scanning for a coreboot table.
static void
{
dprintf(3, "Attempting to find coreboot table\n");
- CBMemTable = NULL;
-
// Find coreboot table.
struct cb_header *cbh = find_cb_header(0, 0x1000);
if (!cbh)
struct cb_mainboard *cbmb = find_cb_subtable(cbh, CB_TAG_MAINBOARD);
if (cbmb) {
- const char *vendor = &cbmb->strings[cbmb->vendor_idx];
- const char *part = &cbmb->strings[cbmb->part_idx];
- dprintf(1, "Found mainboard %s %s\n", vendor, part);
-
- vgahook_setup(vendor, part);
+ CBvendor = &cbmb->strings[cbmb->vendor_idx];
+ CBpart = &cbmb->strings[cbmb->part_idx];
+ dprintf(1, "Found mainboard %s %s\n", CBvendor, CBpart);
}
return;
* BIOS table copying
****************************************************************/
-static void
-copy_pir(void *pos)
-{
- struct pir_header *p = pos;
- if (p->signature != PIR_SIGNATURE)
- return;
- if (PirOffset)
- return;
- if (p->size < sizeof(*p))
- return;
- if (checksum(pos, p->size) != 0)
- return;
- void *newpos = malloc_fseg(p->size);
- if (!newpos) {
- warn_noalloc();
- return;
- }
- dprintf(1, "Copying PIR from %p to %p\n", pos, newpos);
- memcpy(newpos, pos, p->size);
- PirOffset = (u32)newpos - BUILD_BIOS_ADDR;
-}
-
-static void
-copy_mptable(void *pos)
-{
- struct mptable_floating_s *p = pos;
- if (p->signature != MPTABLE_SIGNATURE)
- return;
- if (!p->physaddr)
- return;
- if (checksum(pos, sizeof(*p)) != 0)
- return;
- u32 length = p->length * 16;
- u16 mpclength = ((struct mptable_config_s *)p->physaddr)->length;
- struct mptable_floating_s *newpos = malloc_fseg(length + mpclength);
- if (!newpos) {
- warn_noalloc();
- return;
- }
- dprintf(1, "Copying MPTABLE from %p/%x to %p\n", pos, p->physaddr, newpos);
- memcpy(newpos, pos, length);
- newpos->physaddr = (u32)newpos + length;
- newpos->checksum -= checksum(newpos, sizeof(*newpos));
- memcpy((void*)newpos + length, (void*)p->physaddr, mpclength);
-}
-
-static void
-copy_acpi_rsdp(void *pos)
-{
- if (RsdpAddr)
- return;
- struct rsdp_descriptor *p = pos;
- if (p->signature != RSDP_SIGNATURE)
- return;
- u32 length = 20;
- if (checksum(pos, length) != 0)
- return;
- if (p->revision > 1) {
- length = p->length;
- if (checksum(pos, length) != 0)
- return;
- }
- void *newpos = malloc_fseg(length);
- if (!newpos) {
- warn_noalloc();
- return;
- }
- dprintf(1, "Copying ACPI RSDP from %p to %p\n", pos, newpos);
- memcpy(newpos, pos, length);
- RsdpAddr = newpos;
-}
-
// Attempt to find (and relocate) any standard bios tables found in a
// given address range.
static void
copy_pir(p);
copy_mptable(p);
copy_acpi_rsdp(p);
+ copy_smbios(p);
}
}
dprintf(3, "Relocating coreboot bios tables\n");
- // Init variables set in coreboot table memory scan.
- PirOffset = 0;
- RsdpAddr = 0;
-
// Scan CB_MEM_TABLE areas for bios tables.
int i, count = MEM_RANGE_COUNT(cbm);
for (i=0; i<count; i++) {
scan_tables(m->start, m->size);
}
- // XXX - just create dummy smbios table for now - should detect if
- // smbios/dmi table is found from coreboot and use that instead.
- smbios_init();
+ // XXX - create a dummy smbios table for now.
+ if (!SMBiosAddr)
+ smbios_init();
}
u8 scratch[15980];
int need = (LzmaGetNumProbs(&state.Properties) * sizeof(CProb));
if (need > sizeof(scratch)) {
- dprintf(1, "LzmaDecode need %d have %d\n", need, sizeof(scratch));
+ dprintf(1, "LzmaDecode need %d have %d\n", need, (unsigned int)sizeof(scratch));
return -1;
}
state.Probs = (CProb *)scratch;
static void
cbfs_setup(void)
{
- if (! CONFIG_COREBOOT_FLASH)
+ if (!CONFIG_COREBOOT || !CONFIG_COREBOOT_FLASH)
return;
CBHDR = *(void **)CBFS_HEADPTR_ADDR;
struct cbfs_file *
cbfs_findprefix(const char *prefix, struct cbfs_file *last)
{
- if (! CONFIG_COREBOOT_FLASH)
+ if (!CONFIG_COREBOOT || !CONFIG_COREBOOT_FLASH)
return NULL;
dprintf(3, "Searching CBFS for prefix %s\n", prefix);
}
// Find a file with the given filename (possibly with ".lzma" extension).
-static struct cbfs_file *
+struct cbfs_file *
cbfs_finddatafile(const char *fname)
{
int fnlen = strlen(fname);
int
cbfs_copyfile(struct cbfs_file *file, void *dst, u32 maxlen)
{
- if (! CONFIG_COREBOOT_FLASH || !file)
+ if (!CONFIG_COREBOOT || !CONFIG_COREBOOT_FLASH || !file)
return -1;
u32 size = ntohl(file->len);
void *src = (void*)file + ntohl(file->offset);
if (cbfs_iscomp(file)) {
// Compressed - copy to temp ram and uncompress it.
- u32 asize = ALIGN(size, 4);
- void *temp = malloc_tmphigh(asize);
+ void *temp = malloc_tmphigh(size);
if (!temp)
return -1;
- iomemcpy(temp, src, asize);
+ iomemcpy(temp, src, size);
int ret = ulzma(dst, maxlen, temp, size);
yield();
free(temp);
return size;
}
-// Find and copy the optionrom for the given vendor/device id.
-int
-cbfs_copy_optionrom(void *dst, u32 maxlen, u32 vendev)
-{
- if (! CONFIG_COREBOOT_FLASH)
- return -1;
-
- char fname[17];
- snprintf(fname, sizeof(fname), "pci%04x,%04x.rom"
- , (u16)vendev, vendev >> 16);
- return cbfs_copyfile(cbfs_finddatafile(fname), dst, maxlen);
-}
-
struct cbfs_payload_segment {
u32 type;
u32 compression;
void
cbfs_run_payload(struct cbfs_file *file)
{
- if (!CONFIG_COREBOOT_FLASH || !file)
+ if (!CONFIG_COREBOOT || !CONFIG_COREBOOT_FLASH || !file)
return;
dprintf(1, "Run %s\n", file->filename);
struct cbfs_payload *pay = (void*)file + ntohl(file->offset);
}
}
+// Register payloads in "img/" directory with boot system.
+void
+cbfs_payload_setup(void)
+{
+ struct cbfs_file *file = NULL;
+ for (;;) {
+ file = cbfs_findprefix("img/", file);
+ if (!file)
+ break;
+ const char *filename = cbfs_filename(file);
+ char *desc = znprintf(MAXDESCSIZE, "Payload [%s]", &filename[4]);
+ boot_add_cbfs(file, desc, bootprio_find_named_rom(filename, 0));
+ }
+}
+
void
coreboot_setup(void)
{
projects / seabios.git / blobdiff