Update flashrom binary, rework param usage

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} -n -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."
@@ -530,7 +549,7 @@ the touchpad firmware, otherwise the touchpad will not work."
         if [[ $? -eq 0 ]]; then
             # flash TP firmware
             echo_green "Flashing touchpad firmware -- do not touch the touchpad while updating!"
-            ${flashromcmd#${flashrom_params}} -p ec:type=tp -i EC_RW -w ${touchpad_eve_fw} -o /tmp/flashrom.log >/dev/null 2>&1
+            ${flashromcmd#${flashrom_programmer}} -p ec:type=tp -i EC_RW -w ${touchpad_eve_fw} -o /tmp/flashrom.log >/dev/null 2>&1
             if [ $? -eq 0 ]; then
                 echo_green "Touchpad firmware successfully downgraded."
                 echo_yellow "Please reboot your Pixelbook now."
@@ -732,7 +751,7 @@ fi
 echo_yellow "Restoring stock firmware"
 # we won't verify here, since we need to flash the entire BIOS region
 # but don't want to get a mismatch from the IFD or ME 
-${flashromcmd}  ${flashrom_params} -n -w "${firmware_file}" -o /tmp/flashrom.log > /dev/null 2>&1
+${flashromcmd} ${flashrom_params} --noverify-all -w "${firmware_file}" -o /tmp/flashrom.log > /dev/null 2>&1
 if [ $? -ne 0 ]; then
     cat /tmp/flashrom.log
     exit_red "An error occurred restoring the stock firmware. DO NOT REBOOT!"; return 1

functions.sh

@@ -10,7 +10,8 @@ isChromeOS=true
 isChromiumOS=false
 isCloudready=false
 flashromcmd=""
-flashrom_params="-p host"
+flashrom_params=""
+flashrom_programmer="-p internal"
 cbfstoolcmd=""
 gbbutilitycmd=""
 preferUSB=false
@@ -37,6 +38,7 @@ isCmlBox=false
 isZen2=false
 isJsl=false
 isTgl=false
+isAdl=false
 isUnsupported=false
 firmwareType=""
 isStock=true
@@ -53,7 +55,6 @@ hasLAN=false
 hasCR50=false
 kbl_use_rwl18=false
 useAltfwStd=false
-runsWindows=false
 
 hsw_boxes=('mccloud' 'panther' 'tricky' 'zako')
 hsw_books=('falco' 'leon' 'monroe' 'peppy' 'wolf')
@@ -247,7 +248,7 @@ if [ ! -f ${flashromcmd} ]; then
     else
         #have to use partition 12 (27 for cloudready) on rootdev due to noexec restrictions
         rootdev=$(rootdev -d -s)
-		[[ "${rootdev}" =~ "mmcblk" || "${rootdev}" =~ "nvme" ]] && part_pfx="p" || part_pfx=""
+        [[ "${rootdev}" =~ "mmcblk" || "${rootdev}" =~ "nvme" ]] && part_pfx="p" || part_pfx=""
         [[ "$isCloudready" = "true" && -b ${rootdev}${part_pfx}27 ]] \
 				&& part_num="${part_pfx}27" || part_num="${part_pfx}12"
         boot_mounted=$(mount | grep "${rootdev}""${part_num}")
@@ -271,15 +272,15 @@ if [ ! -f ${flashromcmd} ]; then
         #needed to avoid dependencies not found on older ChromeOS
         $CURL -sLo "flashrom.tar.gz" "${util_source}flashrom_old.tar.gz"
     else
-        $CURL -sLO "${util_source}flashrom.tar.gz"
+        $CURL -sLO "${util_source}flashrom_20230202.tar.gz"
     fi
     if [ $? -ne 0 ]; then
         echo_red "Error downloading flashrom; cannot proceed."
         #restore working dir
         cd ${working_dir}
         return 1
     fi
-    tar -zxf flashrom.tar.gz --no-same-owner
+    tar -zxf flashrom_20230202.tar.gz --no-same-owner
     if [ $? -ne 0 ]; then
         echo_red "Error extracting flashrom; cannot proceed."
         #restore working dir
@@ -288,8 +289,6 @@ if [ ! -f ${flashromcmd} ]; then
     fi
     #set +x
     chmod +x flashrom
-    #add params
-    flashromcmd="${flashromcmd} ${flashrom_params}"
     #restore working dir
     cd ${working_dir}
 fi
@@ -414,11 +413,15 @@ if [ $? -ne 0 ]; then
     echo_red "Unable to download flashrom utility; cannot continue"
     return 1
 fi
+# append programmer type
+flashromcmd="${flashromcmd} ${flashrom_programmer}"
+
 get_cbfstool
 if [ $? -ne 0 ]; then
     echo_red "Unable to download cbfstool utility; cannot continue"
     return 1
 fi
+
 get_gbb_utility
 if [ $? -ne 0 ]; then
     echo_red "Unable to download gbb_utility utility; cannot continue"
@@ -427,13 +430,15 @@ fi
 
 #get device firmware info
 echo -e "\nGetting device/system info..."
-#try reading only flash descriptor
-if ${flashromcmd} --ifd -i fd -r /tmp/bios.bin > /dev/null 2>&1; then
-    #we can flash only BIOS region later
-    flashrom_params="--ifd -i bios"
+#try reading only BIOS region
+[[ "$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"
+else
+    #read entire firmware
+    ${flashromcmd} -r /tmp/bios.bin > /dev/null 2>&1
 fi
-#read entire firmware
-${flashromcmd} -r /tmp/bios.bin > /dev/null 2>&1
 if [ $? -ne 0 ]; then
     echo_red "\nUnable to read current firmware; cannot continue."
     echo_red "Either add 'iomem=relaxed' to your kernel parameters,\nor trying running from a Live USB with a more permissive kernel (eg, Ubuntu)."