diff options
| author | Julius Werner <jwerner@chromium.org> | 2019-04-01 15:45:30 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-04-04 15:10:17 -0700 |
| commit | cbbda444f7d57da09fd7fdf6651ab9250464f2cc (patch) | |
| tree | e5ef0a1436d7bd5f36d83108771dca7618e11618 | |
| parent | e8f2bbbeeaecc9b545a512ec0bd7d9979c921acf (diff) | |
| download | vboot-cbbda444f7d57da09fd7fdf6651ab9250464f2cc.tar.gz | |
VbCheckDisplayKey: Remove easter egg support
We haven't used the easter egg screen since Mario. Time to get rid of
that code.
BRANCH=None
BUG=None
TEST=Booted Kevin.
Change-Id: I8f403f296ebb2a3d14ba6a70f12cd13a58e67b64
Signed-off-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1548303
Reviewed-by: Furquan Shaikh <furquan@chromium.org>
| -rw-r--r-- | firmware/lib/include/utility.h | 7 | ||||
| -rw-r--r-- | firmware/lib/vboot_display.c | 17 |
2 files changed, 0 insertions, 24 deletions
diff --git a/firmware/lib/include/utility.h b/firmware/lib/include/utility.h index ca9bcd7e..e8872492 100644 --- a/firmware/lib/include/utility.h +++ b/firmware/lib/include/utility.h @@ -22,13 +22,6 @@ #define VbAssert(expr) #endif -/* Optional, up to the BIOS */ -#ifdef VBOOT_EASTER_EGG -#define VBEASTEREGG VbExEasterEgg() -#else -#define VBEASTEREGG 0 -#endif - /* * Combine [msw] and [lsw] uint16s to a uint32_t with its [msw] and [lsw] * forming the most and least signficant 16-bit words. diff --git a/firmware/lib/vboot_display.c b/firmware/lib/vboot_display.c index e7359460..c4b4f87a 100644 --- a/firmware/lib/vboot_display.c +++ b/firmware/lib/vboot_display.c @@ -399,22 +399,11 @@ VbError_t VbDisplayDebugInfo(struct vb2_context *ctx) return VbExDisplayDebugInfo(buf, 1); } -#define MAGIC_WORD_LEN 5 -#define MAGIC_WORD "xyzzy" -static uint8_t MagicBuffer[MAGIC_WORD_LEN]; - VbError_t VbCheckDisplayKey(struct vb2_context *ctx, uint32_t key, const VbScreenData *data) { uint32_t loc = 0; uint32_t count = 0; - int i; - - /* Update key buffer */ - for(i = 1; i < MAGIC_WORD_LEN; i++) - MagicBuffer[i - 1] = MagicBuffer[i]; - /* Save as lower-case ASCII */ - MagicBuffer[MAGIC_WORD_LEN - 1] = (key | 0x20) & 0xFF; switch (key) { case '\t': @@ -457,11 +446,5 @@ VbError_t VbCheckDisplayKey(struct vb2_context *ctx, uint32_t key, return VbDisplayScreen(ctx, disp_current_screen, 1, data); } - if (0 == memcmp(MagicBuffer, MAGIC_WORD, MAGIC_WORD_LEN)) { - if (VBEASTEREGG) - (void)VbDisplayScreen(ctx, disp_current_screen, 1, - NULL); - } - return VBERROR_SUCCESS; } |