summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/device/pci_device.c11
-rw-r--r--src/include/device/pci_rom.h1
2 files changed, 9 insertions, 3 deletions
diff --git a/src/device/pci_device.c b/src/device/pci_device.c
index c043dd6591..0a4b69bfb2 100644
--- a/src/device/pci_device.c
+++ b/src/device/pci_device.c
@@ -679,10 +679,15 @@ void pci_dev_set_subsystem(struct device *dev, unsigned int vendor,
}
}
-static int should_run_oprom(struct device *dev)
+static int should_run_oprom(struct device *dev, struct rom_header *rom)
{
static int should_run = -1;
+ if (CONFIG(VENDORCODE_ELTAN_VBOOT))
+ if (rom != NULL)
+ if (!verified_boot_should_run_oprom(rom))
+ return 0;
+
if (should_run >= 0)
return should_run;
@@ -711,7 +716,7 @@ static int should_load_oprom(struct device *dev)
return 0;
if (CONFIG(ALWAYS_LOAD_OPROM))
return 1;
- if (should_run_oprom(dev))
+ if (should_run_oprom(dev, NULL))
return 1;
return 0;
@@ -742,7 +747,7 @@ void pci_dev_init(struct device *dev)
return;
timestamp_add_now(TS_OPROM_COPY_END);
- if (!should_run_oprom(dev))
+ if (!should_run_oprom(dev, rom))
return;
run_bios(dev, (unsigned long)ram);
diff --git a/src/include/device/pci_rom.h b/src/include/device/pci_rom.h
index a4aa52aa09..82f3c40005 100644
--- a/src/include/device/pci_rom.h
+++ b/src/include/device/pci_rom.h
@@ -47,4 +47,5 @@ void pci_rom_ssdt(struct device *device);
u32 map_oprom_vendev(u32 vendev);
+int verified_boot_should_run_oprom(struct rom_header *rom_header);
#endif