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>

4 files changed, 2 insertions, 35 deletions

diff --git a/tests/futility/expect_output/show.tests_futility_data_bios_mario_mp.bin b/tests/futility/expect_output/show.tests_futility_data_bios_mario_mp.bin
index 882b9782..36c9ab8b 100644
--- a/tests/futility/expect_output/show.tests_futility_data_bios_mario_mp.bin
+++ b/tests/futility/expect_output/show.tests_futility_data_bios_mario_mp.bin
@@ -21,7 +21,6 @@ GBB content:
     Algorithm:           11 RSA8192 SHA512
     Key Version:         1
     Key sha1sum:         5d0d163b824cab5ae4f23fb2cc012e2a4124f4fe
-  BmpBlock:              <invalid>
 Firmware body:           Firmware A Data
   Offset:                0x00040000
   Size:                  0x000d0000
diff --git a/tests/futility/expect_output/show.tests_futility_data_bios_zgb_mp.bin b/tests/futility/expect_output/show.tests_futility_data_bios_zgb_mp.bin
index 6a29c909..5dfa5874 100644
--- a/tests/futility/expect_output/show.tests_futility_data_bios_zgb_mp.bin
+++ b/tests/futility/expect_output/show.tests_futility_data_bios_zgb_mp.bin
@@ -21,7 +21,6 @@ GBB content:
     Algorithm:           11 RSA8192 SHA512
     Key Version:         1
     Key sha1sum:         9bd99a594c45b6739899a17ec29ac2289ee75463
-  BmpBlock:              <invalid>
 Firmware body:           FW_MAIN_A
   Offset:                0x00030000
   Size:                  0x000dffc0
diff --git a/tests/futility/expect_output/show.tests_futility_data_fw_gbb.bin b/tests/futility/expect_output/show.tests_futility_data_fw_gbb.bin
index ea202bfd..3f81d86e 100644
--- a/tests/futility/expect_output/show.tests_futility_data_fw_gbb.bin
+++ b/tests/futility/expect_output/show.tests_futility_data_fw_gbb.bin
@@ -20,8 +20,3 @@ GBB content:
     Algorithm:           11 RSA8192 SHA512
     Key Version:         1
     Key sha1sum:         bf39d0d3e30cbf6a121416d04df4603ad5310779
-  BmpBlock:
-    Version:             2.0
-    Localizations:       18
-    Screen layouts:      10
-    Image infos:         269
diff --git a/tests/futility/test_gbb_utility.sh b/tests/futility/test_gbb_utility.sh
index 58855711..bdfa2628 100755
--- a/tests/futility/test_gbb_utility.sh
+++ b/tests/futility/test_gbb_utility.sh
@@ -35,28 +35,22 @@ ${FUTILITY} gbb -g ${TMP}.blob | grep "0123456789ABCDE"
 # too long
 dd if=/dev/urandom bs=17 count=1 of=${TMP}.data1.toolong
 dd if=/dev/urandom bs=17 count=1 of=${TMP}.data2.toolong
-dd if=/dev/urandom bs=17 count=1 of=${TMP}.data3.toolong
 if ${FUTILITY} gbb -s --rootkey     ${TMP}.data1.toolong ${TMP}.blob; then false; fi
 if ${FUTILITY} gbb -s --recoverykey ${TMP}.data2.toolong ${TMP}.blob; then false; fi
-if ${FUTILITY} gbb -s --bmpfv       ${TMP}.data3.toolong ${TMP}.blob; then false; fi
 
 # shorter than max should be okay, though
 dd if=/dev/urandom bs=10 count=1 of=${TMP}.data1.short
 dd if=/dev/urandom bs=10 count=1 of=${TMP}.data2.short
-dd if=/dev/urandom bs=10 count=1 of=${TMP}.data3.short
 ${FUTILITY} gbb -s \
   --rootkey     ${TMP}.data1.short \
-  --recoverykey ${TMP}.data2.short \
-  --bmpfv       ${TMP}.data3.short ${TMP}.blob
+  --recoverykey ${TMP}.data2.short ${TMP}.blob
 # read 'em back
 ${FUTILITY} gbb -g \
   --rootkey     ${TMP}.read1 \
-  --recoverykey ${TMP}.read2 \
-  --bmpfv       ${TMP}.read3 ${TMP}.blob
+  --recoverykey ${TMP}.read2 ${TMP}.blob
 # Verify (but remember, it's short)
 cmp -n 10 ${TMP}.data1.short ${TMP}.read1
 cmp -n 10 ${TMP}.data2.short ${TMP}.read2
-cmp -n 10 ${TMP}.data3.short ${TMP}.read3
 
 # Okay
 dd if=/dev/urandom bs=16 count=1 of=${TMP}.data1
@@ -64,16 +58,13 @@ dd if=/dev/urandom bs=16 count=1 of=${TMP}.data2
 dd if=/dev/urandom bs=16 count=1 of=${TMP}.data3
 ${FUTILITY} gbb -s --rootkey     ${TMP}.data1 ${TMP}.blob
 ${FUTILITY} gbb -s --recoverykey ${TMP}.data2 ${TMP}.blob
-${FUTILITY} gbb -s --bmpfv       ${TMP}.data3 ${TMP}.blob
 
 # Read 'em back.
 ${FUTILITY} gbb -g --rootkey     ${TMP}.read1 ${TMP}.blob
 ${FUTILITY} gbb -g --recoverykey ${TMP}.read2 ${TMP}.blob
-${FUTILITY} gbb -g --bmpfv       ${TMP}.read3 ${TMP}.blob
 # Verify
 cmp ${TMP}.data1 ${TMP}.read1
 cmp ${TMP}.data2 ${TMP}.read2
-cmp ${TMP}.data3 ${TMP}.read3
 
 
 # Okay, creating GBB blobs seems to work. Now let's make sure that corrupted
@@ -147,12 +138,6 @@ if ${FUTILITY} gbb ${TMP}.blob.bad; then false; fi
 cat ${TMP}.blob | ${REPLACE} 0x18 0x00 > ${TMP}.blob.bad
 if ${FUTILITY} gbb ${TMP}.blob.bad; then false; fi
 
-#  bmpfv_offset < GBB_HEADER_SIZE is invalid
-cat ${TMP}.blob | ${REPLACE} 0x20 0x7f > ${TMP}.blob.bad
-if ${FUTILITY} gbb ${TMP}.blob.bad; then false; fi
-cat ${TMP}.blob | ${REPLACE} 0x20 0x00 > ${TMP}.blob.bad
-if ${FUTILITY} gbb ${TMP}.blob.bad; then false; fi
-
 #  recovery_key_offset < GBB_HEADER_SIZE is invalid
 cat ${TMP}.blob | ${REPLACE} 0x28 0x7f > ${TMP}.blob.bad
 if ${FUTILITY} gbb ${TMP}.blob.bad; then false; fi
@@ -171,12 +156,6 @@ ${FUTILITY} gbb -g ${TMP}.blob.bad
 cat ${TMP}.blob | ${REPLACE} 0x1c 0x31 > ${TMP}.blob.bad
 if ${FUTILITY} gbb -g ${TMP}.blob.bad; then false; fi
 
-#  bmpfv: offset + size  == end of file is okay; beyond is invalid
-cat ${TMP}.blob | ${REPLACE} 0x24 0x20 > ${TMP}.blob.bad
-${FUTILITY} gbb -g ${TMP}.blob.bad
-cat ${TMP}.blob | ${REPLACE} 0x24 0x21 > ${TMP}.blob.bad
-if ${FUTILITY} gbb -g ${TMP}.blob.bad; then false; fi
-
 #  recovery_key: offset + size  == end of file is okay; beyond is invalid
 cat ${TMP}.blob | ${REPLACE} 0x2c 0x10 > ${TMP}.blob.bad
 ${FUTILITY} gbb -g ${TMP}.blob.bad
@@ -193,11 +172,6 @@ cat ${TMP}.blob | ${REPLACE} 0x1c 0x00 > ${TMP}.blob.bad
 ${FUTILITY} gbb -g --rootkey     ${TMP}.read1 ${TMP}.blob.bad
 if ${FUTILITY} gbb -s --rootkey  ${TMP}.data1 ${TMP}.blob.bad; then false; fi
 
-# bmpfv_size == 0 gives warning, gets nothing, can't be set
-cat ${TMP}.blob | ${REPLACE} 0x24 0x00 > ${TMP}.blob.bad
-${FUTILITY} gbb -g --bmpfv       ${TMP}.read3 ${TMP}.blob.bad
-if ${FUTILITY} gbb -s --bmpfv    ${TMP}.data3 ${TMP}.blob.bad; then false; fi
-
 # recovery_key_size == 0 gives warning, gets nothing, can't be set
 cat ${TMP}.blob | ${REPLACE} 0x2c 0x00 > ${TMP}.blob.bad
 ${FUTILITY} gbb -g --recoverykey ${TMP}.read2 ${TMP}.blob.bad