meta-dts-distro/recipes-dts/dts: Handle all migration and update operations automatically

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

Author: miczyg1

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

@@ -197,11 +197,20 @@ backup() {
 }
 
 romhole_migration() {
+    cbfstool $BIOS_UPDATE_FILE layout -w | grep -q "ROMHOLE" || return
+
     echo "Beginning ROM hole migration process..."
     flashrom -p "$PROGRAMMER_BIOS" ${FLASH_CHIP_SELECT} -r /tmp/rom.bin --ifd -i bios >> $FLASHROM_LOG_FILE 2>> $ERR_LOG_FILE
-    dd if=/tmp/rom.bin of=/tmp/romhole.bin skip=$((0x17C0000)) bs=128K count=1 iflag=skip_bytes
+    error_check "Failed to read current firmware"
+    if check_if_dasharo; then
+      cbfstool /tmp/rom.bin layout -w | grep -q "ROMHOLE" || return
+      cbfstool /tmp/rom.bin read -r ROMHOLE -f /tmp/romhole.bin || return
+    else
+      dd if=/tmp/rom.bin of=/tmp/romhole.bin skip=$((0x17C0000)) bs=128K count=1 iflag=skip_bytes
+    fi
+
     echo "Migrate to ROMHOLE section."
-    cbfstool "$BIOS_UPDATE_FILE" write -r ROMHOLE -f /tmp/romhole.bin -u
+    cbfstool "$BIOS_UPDATE_FILE" write -r ROMHOLE -f /tmp/romhole.bin -u 2> /dev/null
 }
 
 smbios_migration() {

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

@@ -298,19 +298,7 @@ board_config() {
               NEED_BLOB_TRANSMISSION="false"
               PROGRAMMER_BIOS="internal"
               PROGRAMMER_EC=""
-              if check_if_dasharo; then
-                # if v1.1.1 or older, flash the whole bios region, as per:
-                # https://docs.dasharo.com/variants/msi_z690/firmware-update/#version-older-than-v110
-                compare_versions $DASHARO_VERSION 1.1.2
-                if [ $? -eq 1 ]; then
-                # For Dasharo version lesser than 1.1.2
-                    NEED_BOOTSPLASH_MIGRATION="true"
-                    FLASHROM_ADD_OPT_UPDATE="--ifd -i bios"
-                else
-                # For Dasharo version greater or equal 1.1.2
-                    FLASHROM_ADD_OPT_UPDATE="--fmap -i RW_SECTION_A -i RW_SECTION_B"
-                fi
-              fi
+              NEED_ROMHOLE_MIGRATION="true"
               ;;
             "PRO Z690-A WIFI (MS-7D25)" | "PRO Z690-A (MS-7D25)")
               DASHARO_REL_NAME="msi_ms7d25"
@@ -331,19 +319,7 @@ board_config() {
               NEED_BLOB_TRANSMISSION="false"
               PROGRAMMER_BIOS="internal"
               PROGRAMMER_EC=""
-              if check_if_dasharo; then
-                # if v1.1.1 or older, flash the whole bios region, as per:
-                # https://docs.dasharo.com/variants/msi_z690/firmware-update/#version-older-than-v110
-                compare_versions $DASHARO_VERSION 1.1.2
-                if [ $? -eq 1 ]; then
-                # For Dasharo version lesser than 1.1.2
-                    NEED_BOOTSPLASH_MIGRATION="true"
-                    FLASHROM_ADD_OPT_UPDATE="--ifd -i bios"
-                else
-                # For Dasharo version greater or equal 1.1.2
-                    FLASHROM_ADD_OPT_UPDATE="--fmap -i RW_SECTION_A -i RW_SECTION_B"
-                fi
-              fi
+              NEED_ROMHOLE_MIGRATION="true"
               ;;
             *)
               error_exit "Board model $BOARD_MODEL is currently not supported"
@@ -371,9 +347,7 @@ board_config() {
               NEED_BLOB_TRANSMISSION="false"
               PROGRAMMER_BIOS="internal"
               PROGRAMMER_EC=""
-              if ! check_if_dasharo; then
-                NEED_ROMHOLE_MIGRATION="true"
-              fi
+              NEED_ROMHOLE_MIGRATION="true"
               ;;
             "PRO Z790-P WIFI (MS-7E06)" | "PRO Z790-P (MS-7E06)")
               DASHARO_REL_NAME="msi_ms7e06"
@@ -394,9 +368,7 @@ board_config() {
               NEED_BLOB_TRANSMISSION="false"
               PROGRAMMER_BIOS="internal"
               PROGRAMMER_EC=""
-              if ! check_if_dasharo; then
-                NEED_ROMHOLE_MIGRATION="true"
-              fi
+              NEED_ROMHOLE_MIGRATION="true"
               ;;
             *)
               error_exit "Board model $BOARD_MODEL is currently not supported"