Update coreboot + merge GM45 hybrid GPU patches

Also add power_on_after_fail to X200 and others (prevents the bug
where the system would boot when connecting the AC adapter)
(option in menuconfig to use CMOS/nvram settings is now enabled)

Also NetDCDC is now the default USB debug dongle used (compatible
with the BBB rev C).

Add two new methods for managing coreboot configs:
./build config corebootreplace
./build config corebootmodify

4 files changed, 128 insertions, 8 deletions

diff --git a/resources/scripts/helpers/build/config/corebootmodify b/resources/scripts/helpers/build/config/corebootmodify
new file mode 100755
index 00000000..cb22008b
--- /dev/null
+++ b/resources/scripts/helpers/build/config/corebootmodify
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+#
+#  helper script: run "make menuconfig" on config(s) to modify them
+#
+#	Copyright (C) 2014, 2015 Francis Rowe <info@gluglug.org.uk>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+# This script assumes that the working directory is the root
+# of libreboot_src or git
+
+[ "x${DEBUG+set}" = 'xset' ] && set -v
+set -u -e
+
+cd resources/libreboot/config/
+
+if [ $# -lt 1 ]; then
+	configs=$(ls)
+else
+	configs=$@
+fi
+
+cd ../../../coreboot/
+for config in $configs; do
+	printf "Updating config for $config\n"
+	sleep 5
+	
+	mv ../resources/libreboot/config/$config/config .config
+	make menuconfig
+	mv .config ../resources/libreboot/config/$config/config
+done
+
+cd ../
diff --git a/resources/scripts/helpers/build/config/corebootreplace b/resources/scripts/helpers/build/config/corebootreplace
new file mode 100755
index 00000000..9be5c9a5
--- /dev/null
+++ b/resources/scripts/helpers/build/config/corebootreplace
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+#
+#  helper script: run "make menuconfig" on config(s) to replace them
+#
+#	Copyright (C) 2014, 2015 Francis Rowe <info@gluglug.org.uk>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+# This script assumes that the working directory is the root
+# of libreboot_src or git
+
+[ "x${DEBUG+set}" = 'xset' ] && set -v
+set -u -e
+
+cd resources/libreboot/config/
+
+if [ $# -lt 1 ]; then
+	configs=$(ls)
+else
+	configs=$@
+fi
+
+cd ../../../coreboot/
+for config in $configs; do
+	printf "Updating config for $config\n"
+	sleep 5
+	
+	make menuconfig
+	mv .config ../resources/libreboot/config/$config/config
+done
+
+cd ../
diff --git a/resources/scripts/helpers/build/config/corebootupdate b/resources/scripts/helpers/build/config/corebootupdate
index 22611485..4e4db748 100755
--- a/resources/scripts/helpers/build/config/corebootupdate
+++ b/resources/scripts/helpers/build/config/corebootupdate
@@ -26,12 +26,17 @@
 set -u -e
 
 cd resources/libreboot/config/
-configs=$(ls)
+
+if [ $# -lt 1 ]; then
+	configs=$(ls)
+else
+	configs=$@
+fi
 
 cd ../../../coreboot/
 for config in $configs; do
 	printf "Updating config for $config\n"
-	sleep 2
+	sleep 5
 	
 	mv ../resources/libreboot/config/$config/config .config
 	make oldconfig
diff --git a/resources/scripts/helpers/download/coreboot b/resources/scripts/helpers/download/coreboot
index 54ada0e3..01ae142d 100755
--- a/resources/scripts/helpers/download/coreboot
+++ b/resources/scripts/helpers/download/coreboot
@@ -44,11 +44,37 @@ git clone http://review.coreboot.org/coreboot
 cd coreboot/
 
 # reset to previously tested revision
-git reset --hard 8e3da749ed912834ddf9b78bff956a2b7d269945
+# git reset --hard e19c8b0091022ae3f490601aed0c290cd5171b79
+# ^ currently, the first patch is downloaded using "checkout" so this automatically
+# branches from the git revision that it was uploaded for. that would be 
+# e19c8b0091022ae3f490601aed0c290cd5171b79
 
 # Get patches from review.coreboot.org
 # ------------------------------------------------------------------------------
 
+# ----
+
+printf "Downloading patches for T400 (hybrid graphics and other fixes)"
+git fetch http://review.coreboot.org/coreboot refs/changes/31/9331/7 && git checkout FETCH_HEAD
+
+# Downloads these patches:
+# http://review.coreboot.org/#/c/9318/
+# http://review.coreboot.org/#/c/9330/
+# http://review.coreboot.org/#/c/9329/
+# http://review.coreboot.org/#/c/9370/
+# http://review.coreboot.org/#/c/9321/
+# http://review.coreboot.org/#/c/9332/
+# http://review.coreboot.org/#/c/9316
+# http://review.coreboot.org/#/c/9317/
+# http://review.coreboot.org/#/c/9319
+# http://review.coreboot.org/#/c/9320/
+# http://review.coreboot.org/#/c/9331/
+
+# Related - hard-code enable integrated-only GPU (GM45):
+git fetch http://review.coreboot.org/coreboot refs/changes/90/10090/2 && git cherry-pick FETCH_HEAD
+
+# ----
+
 printf "Text mode patch for X60 native graphics (main patch already merged in coreboot. See 6723 on coreboot gerrit)\n"
 git fetch http://review.coreboot.org/coreboot refs/changes/25/6725/3 && git cherry-pick FETCH_HEAD
 
@@ -76,12 +102,10 @@ git fetch http://review.coreboot.org/coreboot refs/changes/86/7786/1 && git cher
 printf "fix uneven backlight on X200 (when setting brightness low)\n"
 git fetch http://review.coreboot.org/coreboot refs/changes/79/7979/1 && git cherry-pick FETCH_HEAD
 
-printf "ThinkPad R400 support\n"
-git fetch http://review.coreboot.org/coreboot refs/changes/93/8393/2 && git cherry-pick FETCH_HEAD
-printf "ThinkPad T400 (depends on R400 patch)\n"
-git fetch http://review.coreboot.org/coreboot refs/changes/14/8714/4 && git cherry-pick FETCH_HEAD
+printf "ThinkPad R400 support (clone of the T400)\n"
+git fetch http://review.coreboot.org/coreboot refs/changes/93/8393/3 && git cherry-pick FETCH_HEAD
 printf "ThinkPad T500 (depends on T400 patch)\n"
-git fetch http://review.coreboot.org/coreboot refs/changes/81/9181/1 && git cherry-pick FETCH_HEAD
+git fetch http://review.coreboot.org/coreboot refs/changes/81/9181/2 && git cherry-pick FETCH_HEAD
 
 # Run coreboot-libre deblob scripts
 # ------------------------------------------------------------------------------