diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/device/pci_device.c | 2 | ||||
| -rw-r--r-- | src/lib/bootmode.c | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/device/pci_device.c b/src/device/pci_device.c index 5f908d2f68..b5453c7e76 100644 --- a/src/device/pci_device.c +++ b/src/device/pci_device.c @@ -780,7 +780,7 @@ static int should_run_oprom(struct device *dev) */ should_run = display_init_required(); - if (!should_run && CONFIG(CHROMEOS)) + if (!should_run && CONFIG(VBOOT)) should_run = vboot_wants_oprom(); if (!should_run) diff --git a/src/lib/bootmode.c b/src/lib/bootmode.c index e402536fde..052eb8f282 100644 --- a/src/lib/bootmode.c +++ b/src/lib/bootmode.c @@ -13,6 +13,7 @@ * GNU General Public License for more details. */ +#include <assert.h> #include <bootmode.h> #include <vendorcode/google/chromeos/chromeos.h> @@ -34,9 +35,13 @@ void gfx_set_init_done(int done) int display_init_required(void) { - /* For Chrome OS always honor vboot_handoff_skip_display_init(). */ - if (CONFIG(CHROMEOS)) + /* For vboot always honor vboot_handoff_skip_display_init(). */ + if (CONFIG(VBOOT)) { + /* Must always select OPROM_MATTERS when using this function. */ + if (!CONFIG(VBOOT_OPROM_MATTERS)) + dead_code(); return !vboot_handoff_skip_display_init(); + } /* By default always initialize display. */ return 1; |