Check if flashrom supports logging, noverify before using param

Signed-off-by: Matt DeVillier <[email protected]>

Author: MrChromebox

firmware.sh

@@ -457,11 +457,30 @@ fi
 
 #flash Full ROM firmware
 
-#flash without verify, to avoid IFD mismatch upon verification 
+# ensure no issues overwriting log file
+rm -f /tmp/flashrom.log
+
 echo_yellow "Installing Full ROM firmware (may take up to 90s)"
-${flashromcmd} ${flashrom_params} --noverify-all -w "${coreboot_file}" -o /tmp/flashrom.log > /dev/null 2>&1
+#check if flashrom supports --noverify-all
+if ${flashromcmd} -h | grep -q "noverify-all" ; then
+    noverify="--noverify-all"
+else
+    noverify="--noverify"
+fi
+#check if flashrom supports logging to file
+if ${flashromcmd} -L -o /dev/null >/dev/null 2>&1 ; then
+    output_params=">/dev/null 2>&1 -o /tmp/flashrom.log"
+	${flashromcmd} ${flashrom_params} ${noverify} -w ${coreboot_file} >/dev/null 2>&1 -o /tmp/flashrom.log
+else
+    output_params=">/tmp/flashrom.log 2>&1"
+	${flashromcmd} ${flashrom_params} ${noverify} -w ${coreboot_file} >/tmp/flashrom.log 2>&1
+fi
 if [ $? -ne 0 ]; then
-    cat /tmp/flashrom.log
+	echo_red "Error running cmd: ${flashromcmd} ${flashrom_params} ${noverify} -w ${coreboot_file} ${output_params}"
+	if [ -f /tmp/flashrom.log ]; then
+	    read -rp "Press enter to view the flashrom log file, then space for next page, q to quit"
+        more /tmp/flashrom.log
+	fi
     exit_red "An error occurred flashing the Full ROM firmware. DO NOT REBOOT!"; return 1
 else
     echo_green "Full ROM firmware successfully installed/updated."

functions.sh

@@ -431,7 +431,7 @@ fi
 #get device firmware info
 echo -e "\nGetting device/system info..."
 #try reading only BIOS region
-[[ "$isChromeoS" = "false" ]] && test_params=":ich_spi_mode=hwseq" || test_params=""
+[[ "$isChromeOS" = "false" ]] && test_params=":ich_spi_mode=hwseq" || test_params=""
 if ${flashromcmd}${test_params} --ifd -i bios -r /tmp/bios.bin > /dev/null 2>&1; then
         flashromcmd="${flashromcmd}${test_params}"
         flashrom_params="--ifd -i bios"