meta-dts-distro/recipes-dts/dts: Add option to override flashrom update parameters

Signed-off-by: Michał Żygowski <[email protected]>

Author: miczyg1

meta-dts-distro/recipes-dts/dts/dasharo-deploy/dasharo-deploy

@@ -527,13 +527,21 @@ update() {
 
   echo "Updating Dasharo firmware..."
   print_warning "This may take several minutes. Please be patient and do not reset your computer, or touch the keyboard!"
-  flashrom -p "$PROGRAMMER_BIOS" ${FLASH_CHIP_SELECT} ${FLASHROM_ADD_OPT_UPDATE} -w "$BIOS_UPDATE_FILE"  >> $FLASHROM_LOG_FILE 2>> $ERR_LOG_FILE
-  error_check "Failed to update Dasharo firmware"
 
-  if [ $BINARY_HAS_RW_B -eq 0 ]; then
-    echo "Updating second firmware partition..."
-    flashrom -p "$PROGRAMMER_BIOS" ${FLASH_CHIP_SELECT} --fmap -N -i RW_SECTION_B -w "$BIOS_UPDATE_FILE"  >> $FLASHROM_LOG_FILE 2>> $ERR_LOG_FILE
-    error_check "Failed to update second firmware partition"
+  # FLASHROM_ADD_OPT_UPDATE_OVERRIDE takes priority over auto-detected udpate params.
+  # It set only by platform-specific and firmware version-specific conditions
+  if [ -v FLASHROM_ADD_OPT_UPDATE_OVERRIDE ]; then
+    flashrom -p "$PROGRAMMER_BIOS" ${FLASH_CHIP_SELECT} ${FLASHROM_ADD_OPT_UPDATE_OVERRIDE} -w "$BIOS_UPDATE_FILE"  >> $FLASHROM_LOG_FILE 2>> $ERR_LOG_FILE
+    error_check "Failed to update Dasharo firmware"
+  else
+    flashrom -p "$PROGRAMMER_BIOS" ${FLASH_CHIP_SELECT} ${FLASHROM_ADD_OPT_UPDATE} -w "$BIOS_UPDATE_FILE"  >> $FLASHROM_LOG_FILE 2>> $ERR_LOG_FILE
+    error_check "Failed to update Dasharo firmware"
+
+    if [ $BINARY_HAS_RW_B -eq 0 ]; then
+      echo "Updating second firmware partition..."
+      flashrom -p "$PROGRAMMER_BIOS" ${FLASH_CHIP_SELECT} --fmap -N -i RW_SECTION_B -w "$BIOS_UPDATE_FILE"  >> $FLASHROM_LOG_FILE 2>> $ERR_LOG_FILE
+      error_check "Failed to update second firmware partition"
+    fi
   fi
 
   # We use FLASHROM_ADD_OPT_REGIONS for updating ME and IFD.

meta-dts-distro/recipes-dts/dts/dts/dts-functions.sh

@@ -184,10 +184,7 @@ board_config() {
             if [ $? -eq 1 ]; then
               # For Dasharo version lesser than 1.5.2
               NEED_BOOTSPLASH_MIGRATION="true"
-              FLASHROM_ADD_OPT_UPDATE="--ifd -i bios"
-            else
-              # For Dasharo version greater or equal 1.5.2
-              FLASHROM_ADD_OPT_UPDATE="--fmap -i RW_SECTION_A"
+              FLASHROM_ADD_OPT_UPDATE_OVERRIDE="--ifd -i bios"
             fi
           fi
           ;;
@@ -216,10 +213,7 @@ board_config() {
             if [ $? -eq 1 ]; then
               # For Dasharo version lesser than 1.5.1
               NEED_BOOTSPLASH_MIGRATION="true"
-              FLASHROM_ADD_OPT_UPDATE="--ifd -i bios"
-            else
-              # For Dasharo version greater or equal 1.5.1
-              FLASHROM_ADD_OPT_UPDATE="--fmap -i RW_SECTION_A"
+              FLASHROM_ADD_OPT_UPDATE_OVERRIDE="--ifd -i bios"
             fi
           fi
           ;;
@@ -242,15 +236,12 @@ board_config() {
           PROGRAMMER_BIOS="internal"
           PROGRAMMER_EC="ite_ec"
           if check_if_dasharo; then
-          # if v1.7.1 or older, flash the whole bios region
+          # if v1.7.2 or older, flash the whole bios region
             compare_versions $DASHARO_VERSION 1.7.2
             if [ $? -eq 1 ]; then
               # For Dasharo version lesser than 1.7.2
               NEED_BOOTSPLASH_MIGRATION="true"
-              FLASHROM_ADD_OPT_UPDATE="--ifd -i bios"
-            else
-              # For Dasharo version greater or equal 1.7.2
-              FLASHROM_ADD_OPT_UPDATE="--fmap -i RW_SECTION_A"
+              FLASHROM_ADD_OPT_UPDATE_OVERRIDE="--ifd -i bios"
             fi
           fi
           ;;
@@ -274,16 +265,12 @@ board_config() {
           PROGRAMMER_BIOS="internal"
           PROGRAMMER_EC="ite_ec"
           if check_if_dasharo; then
-          # if v1.7.1 or older, flash the whole bios region
+          # if v1.7.2 or older, flash the whole bios region
             compare_versions $DASHARO_VERSION 1.7.2
             if [ $? -eq 1 ]; then
               # For Dasharo version lesser than 1.7.2
               NEED_BOOTSPLASH_MIGRATION="true"
-              FLASHROM_ADD_OPT_UPDATE="--ifd -i bios"
-            else
-              # For Dasharo version greater or equal 1.7.2
-              FLASHROM_ADD_OPT_UPDATE="--fmap -i RW_SECTION_A"
-            fi
+              FLASHROM_ADD_OPT_UPDATE_OVERRIDE="--ifd -i bios"
           fi
           ;;
         *)