From dcda30deb167742f2f369225141a6495239bcb7f Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Sat, 10 Oct 2015 15:54:15 -0400
Subject: Update coreboot-libre based on coreboot a2bed346a

More microcode blobs were deleted upstream, which are therefore no
longer deleted by coreboot-libre.

util/broadcom/secimage/misc.c is not a blob.

Some non-blobs were deleted upstream, which are therefore no
longer listed in libreboot's nonblobs list.

New non-blobs were found, added to the nonblobs list.

vboot submodule was added, since there are parts of it that
cbfstool needs. This submodule is now deblobbed by libreboot.
---
(limited to 'resources/scripts/helpers/download')

diff --git a/resources/scripts/helpers/download/coreboot b/resources/scripts/helpers/download/coreboot
index 21d86de..7fee71d 100755
--- a/resources/scripts/helpers/download/coreboot
+++ b/resources/scripts/helpers/download/coreboot
@@ -44,7 +44,10 @@ git clone http://review.coreboot.org/coreboot
 cd "coreboot/"
 
 # reset to previously tested revision
-git reset --hard 5d5fcdd82b72c1fc621aab9fd6ff88cce9345d8e
+git reset --hard a2bed346a1a45c822bc255e90a0bf6a6ae1d1d50
+
+# vboot submodule is needed
+git submodule update --init --checkout -- 3rdparty/vboot/
 
 # Get patches from review.coreboot.org
 # ------------------------------------------------------------------------------
@@ -61,9 +64,10 @@ git reset --hard 5d5fcdd82b72c1fc621aab9fd6ff88cce9345d8e
 
 # ----
 
-printf "southbridge/intel/common/spi: Add Flash lockdown option\n"
+# Had issues building with. This patch isn't even used, anyway.
+# printf "southbridge/intel/common/spi: Add Flash lockdown option\n"
 # git fetch http://review.coreboot.org/coreboot refs/changes/70/9370/4 && git cherry-pick FETCH_HEAD
-git am "../resources/libreboot/patch/0001-southbridge-intel-common-spi-Add-Flash-lockdown-opti.patch"
+# git am "../resources/libreboot/patch/0001-southbridge-intel-common-spi-Add-Flash-lockdown-opti.patch"
 
 # This patch doesn't actually work...
 # printf "mainboards/lenovo/t400: Enable serial debug option for use with dock\n"
@@ -144,8 +148,7 @@ rm -f ".gitreview"
 rm -f ".gitmodules"
 rm -f ".gitignore"
 
-# Strictly overkill. libreboot doesn't even checkout this submodule
-rm -Rf "3rdparty/"
+rm -Rf 3rdparty/*/.git*
 
 cd "../"
 
--
cgit v0.9.1