Remove code for displaying screen from GBB

This patch removes the code displaying vboot screens using bitmap
and layout data stored in GBB. bmpblk_utility, and futility
support for BmpBlock is also removed.

BUG=chromium:622501,chrome-os-partner:54619,b:124141368
BRANCH=none
CQ-DEPEND=CL:373123
TEST=Verified screens on eve && emerge-eve chromeos-bootimage &&
make runtests

Change-Id: I1a8dd8ff0162965e81df121d5a87ea64310a0854
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/367882
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Joel Kitching <kitching@chromium.org>

2 files changed, 0 insertions, 65 deletions

diff --git a/firmware/lib/include/bmpblk_font.h b/firmware/lib/include/bmpblk_font.h
deleted file mode 100644
index 24f908ea..00000000
--- a/firmware/lib/include/bmpblk_font.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- * This describes the internal format used to pack a set of character glpyhs so
- * we can render strings by drawing one character at a time.
- *
- * The format is this:
- *
- *   +-------------------------+
- *   | FontArrayHeader         |
- *   +-------------------------+
- *   | FontArrayEntryHeader[0] |
- *   +-------------------------+
- *   | raw image data[0]       |
- *   +-------------------------+
- *   | FontArrayEntryHeader[1] |
- *   +-------------------------+
- *   | raw image data[1]       |
- *   +-------------------------+
- *   | FontArrayEntryHeader[2] |
- *   +-------------------------+
- *   | raw image data[2]       |
- *   +-------------------------+
- *      ...
- *   +-------------------------+
- *   | FontArrayEntryHeader[n] |
- *   +-------------------------+
- *   | raw image data[n]       |
- *   +-------------------------+
- *
- * The FontArrayHeader describes how many characters will be encoded.
- * Each character encoding consists of a FontArrayEntryHeader followed
- * immediately by the raw image data for that character.
- */
-
-#ifndef VBOOT_REFERENCE_BMPBLK_FONT_H_
-#define VBOOT_REFERENCE_BMPBLK_FONT_H_
-
-#include "bmpblk_header.h"
-
-#define FONT_SIGNATURE      "FONT"
-#define FONT_SIGNATURE_SIZE 4
-
-typedef struct FontArrayHeader {
-	uint8_t  signature[FONT_SIGNATURE_SIZE];
-	uint32_t num_entries;  /* Number of chars encoded here. */
-} __attribute__((packed)) FontArrayHeader;
-
-typedef struct FontArrayEntryHeader {
-	uint32_t ascii;  /* What to show. Could even be UTF? */
-	ImageInfo info;  /* Describes the bitmap. */
-
-	/*
-	 * The image to use follows immediately, NOT compressed. It's
-	 * uncompressed because each glyph is only a few hundred bytes, but
-	 * they have much in common (colormaps, for example). When we add the
-	 * whole font blob to the bmpblk, it will be compressed as a single
-	 * item there.
-	 */
-} __attribute__((packed)) FontArrayEntryHeader;
-
-#endif  /* VBOOT_REFERENCE_BMPBLK_FONT_H_ */
diff --git a/firmware/lib/include/vboot_display.h b/firmware/lib/include/vboot_display.h
index 99e49f1a..ed259a0c 100644
--- a/firmware/lib/include/vboot_display.h
+++ b/firmware/lib/include/vboot_display.h
@@ -8,8 +8,6 @@
 #ifndef VBOOT_REFERENCE_VBOOT_DISPLAY_H_
 #define VBOOT_REFERENCE_VBOOT_DISPLAY_H_
 
-struct vb2_context;
-
 VbError_t VbDisplayScreen(struct vb2_context *ctx, uint32_t screen, int force,
 			  const VbScreenData *data);
 VbError_t VbDisplayMenu(struct vb2_context *ctx,