summaryrefslogtreecommitdiffstats
path: root/resources/scripts/helpers
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2015-10-10 15:54:15 (EDT)
committer Francis Rowe <info@gluglug.org.uk>2015-10-10 22:11:57 (EDT)
commitdcda30deb167742f2f369225141a6495239bcb7f (patch)
treef52f66cc02f69aa3a28445aeb6e80d7cd34aacf7 /resources/scripts/helpers
parent3841d9a98e10620a47e1b8151458c21584ca983e (diff)
downloadlibreboot-dcda30deb167742f2f369225141a6495239bcb7f.zip
libreboot-dcda30deb167742f2f369225141a6495239bcb7f.tar.gz
libreboot-dcda30deb167742f2f369225141a6495239bcb7f.tar.bz2
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.
Diffstat (limited to 'resources/scripts/helpers')
-rwxr-xr-xresources/scripts/helpers/download/coreboot13
1 files changed, 8 insertions, 5 deletions
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 "../"