ie++;
}
- if (CONFIG_COREBOOT_FLASH) {
+ if (CONFIG_COREBOOT && CONFIG_COREBOOT_FLASH) {
ie->type = IPL_TYPE_CBFS;
ie->description = "CBFS";
ie++;
static void
boot_cbfs(struct ipl_entry_s *ie)
{
- if (! CONFIG_COREBOOT_FLASH)
+ if (!CONFIG_COREBOOT || !CONFIG_COREBOOT_FLASH)
return;
int count = ie->subchoice;
struct cbfs_file *file = NULL;
#define CONFIG_PCI_ROOT1 0x00
#define CONFIG_PCI_ROOT2 0x00
// Support searching coreboot flash format.
-#define CONFIG_COREBOOT_FLASH 0
+#define CONFIG_COREBOOT_FLASH 1
// Support floppy images in the coreboot flash.
#define CONFIG_FLASH_FLOPPY 1
// Support the lzma decompression algorighm.
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);
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);
int
cbfs_copy_optionrom(void *dst, u32 maxlen, u32 vendev)
{
- if (! CONFIG_COREBOOT_FLASH)
+ if (!CONFIG_COREBOOT || !CONFIG_COREBOOT_FLASH)
return -1;
char fname[17];
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);
void
ramdisk_setup(void)
{
- if (!CONFIG_COREBOOT_FLASH || !CONFIG_FLASH_FLOPPY)
+ if (!CONFIG_COREBOOT || !CONFIG_COREBOOT_FLASH || !CONFIG_FLASH_FLOPPY)
return;
// Find image.
int
process_ramdisk_op(struct disk_op_s *op)
{
- if (!CONFIG_COREBOOT_FLASH || !CONFIG_FLASH_FLOPPY)
+ if (!CONFIG_COREBOOT || !CONFIG_COREBOOT_FLASH || !CONFIG_FLASH_FLOPPY)
return 0;
switch (op->command) {