From 1a59ef004801a0ef266b49b078a6f8379351d8cc Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Sun, 09 Nov 2014 05:03:59 -0500
Subject: flashing scripts: Remove obnoxious warnings.

These are already mentioned in the documentation.
They should not show in the output of these scripts.

Scripts:
flash, lenovobios_firstflash, lenovobios_secondflash,
macbook21_firstflash
---
diff --git a/flash b/flash
index 9fd2f97..7110635 100755
--- a/flash
+++ b/flash
@@ -39,6 +39,5 @@ fi
 # boardmismatch=force is for people upgrading from libreboot 5th release, where the new ROM's are "ThinkPad X60 / X60s / X60t"
 # and the old ones are "ThinkPad X60 / X60s" and flashrom complains otherwise
 
-echo "MAKE SURE THAT YOU SEE 'VERIFIED' AT THE END (YOU WANT TO SEE THAT. MEANS IT WORKED)."
 ./flashrom/flashrom -p internal -w $1
-echo "MAKE SURE THAT YOU SEE 'VERIFIED' WRITTEN ABOVE (YOU WANT TO SEE THAT. MEANS IT WORKED)."
+
diff --git a/lenovobios_firstflash b/lenovobios_firstflash
index 611abf4..efe377e 100755
--- a/lenovobios_firstflash
+++ b/lenovobios_firstflash
@@ -38,19 +38,10 @@ if [ ! -f $1 ]; then
 	exit
 fi
 
-echo "Don't panic. See docs/index.html for an explanation of what BUC.TS is."
-
-echo "MAKE SURE THAT YOU SEE 'Updated BUC.TS=1' IF NOT CHECK #libreboot ON FREENODE"
+# needed for first flashing, otherwise machine will be bricked
 ./bucts/bucts 1
-echo "READ THE BIG WARNING ABOVE!"
 
-echo "MAKE SURE THAT YOU SEE 'DO NOT SHUT DOWN OR REBOOT' (YOU WANT TO SEE THAT. MEANS IT WORKED). IF NOT CHECK #libreboot ON FREENODE"
-echo "If (when) you see 'DO NOT SHUTDOWN OR REBOOT' do not panic. That is normal, expected and very good. And you will ignore what it says."
+# run both. one will fail (and be harmless), the other will succeed. 
 ./flashrom/flashrom_lenovobios_sst -p internal -w $1
 ./flashrom/flashrom_lenovobios_macronix -p internal -w $1
-echo "READ THE BIG WARNING ABOVE!"
 
-echo "Now you will SHUT DOWN (ignore the flashrom warning) but first keep in mind before you then boot:"
-echo "Use 'Search for GRUB configuration on local storage' if the normal menus don't work, or check docs/index.html or #libreboot on freenode."
-echo "SHUT DOWN NOW!!!! WAIT A FEW SECS!!!! THEN BOOT."
-echo "DON'T PANIC."
diff --git a/lenovobios_secondflash b/lenovobios_secondflash
index 668419c..47b034c 100755
--- a/lenovobios_secondflash
+++ b/lenovobios_secondflash
@@ -38,15 +38,9 @@ if [ ! -f $1 ]; then
 	exit
 fi
 
-echo "Don't panic. See docs/index.html for an explanation of what BUC.TS is."
-
-echo "MAKE SURE THAT YOU SEE 'VERIFIED' AT THE END (YOU WANT TO SEE THAT. MEANS IT WORKED)."
+# Flash it a 2nd time, to write upper 64K block
 ./flashrom/flashrom -p internal -w $1
-echo "READ THE BIG WARNING ABOVE!"
 
-echo "MAKE SURE THAT YOU SEE 'Updated BUC.TS=0' IF NOT CHECK #libreboot ON FREENODE"
+# Advised. Reset back to 0.
 ./bucts/bucts 0
-echo "READ THE BIG WARNING ABOVE!"
 
-echo "If the above 2 conditions are met, then shut down now. If not, then run: sudo ./bucts/bucts 1"
-echo "DON'T PANIC."
diff --git a/macbook21_firstflash b/macbook21_firstflash
index 90d323f..dbbe534 100755
--- a/macbook21_firstflash
+++ b/macbook21_firstflash
@@ -40,4 +40,4 @@ fi
 # after flashing libreboot and booting the machine, flashing normally will just work.
 
 ./flashrom/flashrom -p internal:laptop=force_I_want_a_brick -w $1
-echo "IGNORE THE ERRORS. JUST MAKE SURE THAT IT SAYS 'VERIFIED' ABOVE (if not, goto #libreboot on freenode irc)"
+
--
cgit v0.9.1