1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
From ceb9ba56a8ef48e18712c38d97b8541a324c7edd Mon Sep 17 00:00:00 2001
From: Paul Kocialkowski <contact@paulk.fr>
Date: Mon, 10 Aug 2015 22:44:50 +0200
Subject: [PATCH 2/7] firmware: Text-based screen display in priority
This allows showing text-based screen displays before looking at the GBB bitmaps
since those encourage the use of non-free software (Chrome OS) and don't display
enough information to the user.
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
---
firmware/lib/vboot_display.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/firmware/lib/vboot_display.c b/firmware/lib/vboot_display.c
index c3cc636..542aaed 100644
--- a/firmware/lib/vboot_display.c
+++ b/firmware/lib/vboot_display.c
@@ -324,13 +324,12 @@ VbError_t VbDisplayScreen(VbCommonParams *cparams, uint32_t screen,
/* Request the screen */
disp_current_screen = screen;
- /* Look in the GBB first */
- if (VBERROR_SUCCESS == VbDisplayScreenFromGBB(cparams, screen,
- vncptr))
+ /* Display default first */
+ if (VBERROR_SUCCESS == VbExDisplayScreen(screen))
return VBERROR_SUCCESS;
- /* If screen wasn't in the GBB bitmaps, fall back to a default */
- return VbExDisplayScreen(screen);
+ /* If default doesn't have anything to show, fall back to GBB bitmaps */
+ return VbDisplayScreenFromGBB(cparams, screen, vncptr);
}
static void Uint8ToString(char *buf, uint8_t val)
--
1.9.1
|
