add vboot to crossgcc/ directory (needed for building cbfstool in release/util)

5 files changed, 63 insertions, 1 deletions

diff --git a/resources/scripts/helpers/download/crossgcc b/resources/scripts/helpers/download/crossgcc
index 35bb2f38..6b77917c 100755
--- a/resources/scripts/helpers/download/crossgcc
+++ b/resources/scripts/helpers/download/crossgcc
@@ -34,14 +34,19 @@ fi
 
 # coreboot revisios used for crossgcc
 crossgccrevision="00aa45391ddb22b5ac24151d54615ca1d89eb745"
+vbootrevision="d187cd3fc792f8bcefbee4587c83eafbd08441fc"
 
 rm -Rf "crossgcc/"
 (
     git clone https://review.coreboot.org/coreboot crossgcc || git clone https://github.com/coreboot/coreboot.git crossgcc
     cd "crossgcc/"
     git reset --hard ${crossgccrevision}
+    git submodule update --init --checkout -- 3rdparty/vboot/
+    (
+        cd 3rdparty/vboot/
+        git reset --hard ${vbootrevision}
+    )
     rm -Rf .git* */*/.git*
-    rm -Rf "3rdparty/"
 )
 
 printf "Deblobbing coreboot\n"
diff --git a/resources/utilities/coreboot-libre/blobs/vboot/crossgcc/blobs.list b/resources/utilities/coreboot-libre/blobs/vboot/crossgcc/blobs.list
new file mode 100644
index 00000000..d16f9ec5
--- /dev/null
+++ b/resources/utilities/coreboot-libre/blobs/vboot/crossgcc/blobs.list
@@ -0,0 +1,19 @@
+3rdparty/vboot/tests/futility/data/bios_link_mp.bin
+3rdparty/vboot/tests/futility/data/bios_mario_mp.bin
+3rdparty/vboot/tests/futility/data/bios_peppy_mp.bin
+3rdparty/vboot/tests/futility/data/bios_zgb_mp.bin
+3rdparty/vboot/tests/futility/data/dingdong.signed
+3rdparty/vboot/tests/futility/data/dingdong.unsigned
+3rdparty/vboot/tests/futility/data/fw_gbb.bin
+3rdparty/vboot/tests/futility/data/fw_vblock.bin
+3rdparty/vboot/tests/futility/data/hoho.signed
+3rdparty/vboot/tests/futility/data/hoho.unsigned
+3rdparty/vboot/tests/futility/data/kern_preamble.bin
+3rdparty/vboot/tests/futility/data/minimuffin.signed
+3rdparty/vboot/tests/futility/data/minimuffin.unsigned
+3rdparty/vboot/tests/futility/data/rec_kernel_part.bin
+3rdparty/vboot/tests/futility/data/vmlinuz-amd64.bin
+3rdparty/vboot/tests/futility/data/vmlinuz-arm.bin
+3rdparty/vboot/tests/futility/data/zinger_mp_image.bin
+3rdparty/vboot/tests/futility/data/zinger.signed
+3rdparty/vboot/tests/futility/data/zinger.unsigned
diff --git a/resources/utilities/coreboot-libre/blobs/vboot/crossgcc/nonblobs.list b/resources/utilities/coreboot-libre/blobs/vboot/crossgcc/nonblobs.list
new file mode 100644
index 00000000..9293e3b8
--- /dev/null
+++ b/resources/utilities/coreboot-libre/blobs/vboot/crossgcc/nonblobs.list
@@ -0,0 +1,29 @@
+3rdparty/vboot/scripts/image_signing/tofactory.sh
+3rdparty/vboot/scripts/image_signing/sign_official_build.sh
+3rdparty/vboot/scripts/image_signing/tag_image.sh
+3rdparty/vboot/scripts/image_signing/make_dev_ssd.sh
+3rdparty/vboot/scripts/image_signing/strip_boot_from_image.sh
+3rdparty/vboot/tests/crc32_test.c
+3rdparty/vboot/tests/vb2_api_tests.c
+3rdparty/vboot/tests/run_vbutil_kernel_arg_tests.sh
+3rdparty/vboot/tests/sha_test_vectors.h
+3rdparty/vboot/tests/vb21_host_misc_tests.c
+3rdparty/vboot/tests/rsa_padding_test.h
+3rdparty/vboot/tests/gen_preamble_testdata.sh
+3rdparty/vboot/tests/load_kernel_tests.sh
+3rdparty/vboot/tests/cgptlib_test.c
+3rdparty/vboot/tests/futility/test_file_types.sh
+3rdparty/vboot/tests/futility/test_file_types.c
+3rdparty/vboot/tests/futility/test_dump_fmap.sh
+3rdparty/vboot/firmware/2lib/2sha512.c
+3rdparty/vboot/firmware/2lib/2sha256.c
+3rdparty/vboot/firmware/lib/cryptolib/sha512.c
+3rdparty/vboot/firmware/lib/cryptolib/sha256.c
+3rdparty/vboot/firmware/lib/tpm_lite/include/tlcl_structures.h
+3rdparty/vboot/utility/bmpblk_font.c
+3rdparty/vboot/utility/vbutil_what_keys
+3rdparty/vboot/cgpt/cgpt_wrapper.c
+3rdparty/vboot/futility/cmd_gbb_utility.c
+3rdparty/vboot/firmware/lib/cgptlib/crc32.c
+3rdparty/vboot/firmware/lib/cryptolib/padding.c
+3rdparty/vboot/tests/testcases/padding_test_vectors.inc
diff --git a/resources/utilities/coreboot-libre/blobs/vboot/crossgcc/nonblobs_notes b/resources/utilities/coreboot-libre/blobs/vboot/crossgcc/nonblobs_notes
new file mode 100644
index 00000000..1999d4f5
--- /dev/null
+++ b/resources/utilities/coreboot-libre/blobs/vboot/crossgcc/nonblobs_notes
@@ -0,0 +1,5 @@
+./3rdparty/vboot/tests/testcases/padding_test_vectors.inc
+It's not a blob, see tests/rsa_padding_test.h for explanation.
+
+The text in this file is CC-BY-SA 4.0 or higher. All contributions to it must
+be made under the same license.
diff --git a/resources/utilities/coreboot-libre/deblob b/resources/utilities/coreboot-libre/deblob
index 8f5ff6a5..4d7c4fb6 100755
--- a/resources/utilities/coreboot-libre/deblob
+++ b/resources/utilities/coreboot-libre/deblob
@@ -71,6 +71,10 @@ done
 for blob in $(cat "resources/utilities/coreboot-libre/blobs/coreboot/crossgcc/blobs.list"); do
     rm -f "crossgcc/${blob}"
 done
+for blob in $(cat "resources/utilities/coreboot-libre/blobs/vboot/crossgcc/blobs.list"); do
+    rm -f "crossgcc/${blob}"
+done
+
 
 printf "\n\n"