Julius Werner has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/32112
Change subject: bootmode: display_init_required() to check VBOOT and OPROM_MATTERS ......................................................................
bootmode: display_init_required() to check VBOOT and OPROM_MATTERS
Skipping display init on normal-mode boot is a vboot feature, not specific to Chrome OS. Fix the code in display_init_required() to check CONFIG_VBOOT rather than CONFIG_CHROMEOS now that the two aren't always the same anymore.
Also add a check to guarantee at compile time that VBOOT_OPROM_MATTERS is enabled on all platforms that make a check to this function (when VBOOT is also enabled). The whole display skipping mechanism is based on the oprom_needed NVRAM flag, and skipping display init without enabling the option to tell vboot that it needs to pay attention to that flag would make the whole thing not work right.
Change-Id: I5d6421509bdcdaa61b78015af3fa6241fe75bb7f Signed-off-by: Julius Werner jwerner@chromium.org --- M src/lib/bootmode.c 1 file changed, 6 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/12/32112/1
diff --git a/src/lib/bootmode.c b/src/lib/bootmode.c index e402536..b7ab649 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>
@@ -35,8 +36,12 @@ int display_init_required(void) { /* For Chrome OS always honor vboot_handoff_skip_display_init(). */ - if (CONFIG(CHROMEOS)) + if (CONFIG(VBOOT)) { + if (!CONFIG(VBOOT_OPROM_MATTERS)) + dead_code("If you call display_init_required() anywhere" + ", you need to select VBOOT_OPROM_MATTERS!"); return !vboot_handoff_skip_display_init(); + }
/* By default always initialize display. */ return 1;