Remove support for compiling in OPTIONROM_VENDEV_1/2.

Passing in rom locations via absolute memory addresses hasn't been
needed since coreboot adopted CBFS support (which as several years
ago).

diff --git a/src/config.h b/src/config.h
index 5b4048830db06ad25281469d89e8c102dd1bee70..e6e07c9a91e736d7426eee00e1f526dc8265143f 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -14,13 +14,6 @@
 #define CONFIG_APPNAME6 "BOCHS "
 #define CONFIG_APPNAME4 "BXPC"
 
-// When option roms are not pre-deployed, SeaBIOS can copy an optionrom
-// from flash for up to 2 devices.
-#define OPTIONROM_VENDEV_1 0x00000000
-#define OPTIONROM_MEM_1 0x00000000
-#define OPTIONROM_VENDEV_2 0x00000000
-#define OPTIONROM_MEM_2 0x00000000
-
 // Maximum number of map entries in the e820 map
 #define CONFIG_MAX_E820 32
 // Space to reserve in f-segment for dynamic allocations

diff --git a/src/optionroms.c b/src/optionroms.c
index ff74c4fdc54dfbfb84419409d5a2fcd9580174f0..a612f3c586b890a988c76d1e3127910c8bd45cf1 100644 (file)
--- a/src/optionroms.c
+++ b/src/optionroms.c
@@ -240,14 +240,6 @@ getRomPriority(u64 *sources, struct rom_header *rom, int instance)
 static struct rom_header *
 lookup_hardcode(u32 vendev)
 {
-    if (OPTIONROM_VENDEV_1
-        && ((OPTIONROM_VENDEV_1 >> 16)
-            | ((OPTIONROM_VENDEV_1 & 0xffff)) << 16) == vendev)
-        return copy_rom((void*)OPTIONROM_MEM_1);
-    if (OPTIONROM_VENDEV_2
-        && ((OPTIONROM_VENDEV_2 >> 16)
-            | ((OPTIONROM_VENDEV_2 & 0xffff)) << 16) == vendev)
-        return copy_rom((void*)OPTIONROM_MEM_2);
     char fname[17];
     snprintf(fname, sizeof(fname), "pci%04x,%04x.rom"
              , pci_vd_to_ven(vendev), pci_vd_to_dev(vendev));