Merge pull request #639 from balena-os/alexgg/partconf

Guarantee to boot from the boot0 mmc partition

Author: flowzone-app[bot]

.github/workflows/iot-gate-imx8-sb.yml

@@ -50,6 +50,7 @@ jobs:
     secrets: inherit
     with:
       machine: iot-gate-imx8
+      slug: iot-gate-imx8-sb
       build-args: '--templates-path layers/meta-balena-hab'
       # worker_type defaults to testbot
       # worker_fleets defaults to balena/testbot-rig,balena/testbot-rig-partners,balena/testbot-rig-x86,balena/testbot-rig-partners-x86

layers/meta-balena-imx8mm/recipes-support/hostapp-update-hooks/files/99-flash-bootloader

@@ -33,9 +33,11 @@ for i in $update_files; do
 
         if [ ! "$existing_md5sum" = "$update_md5sum" ]; then
                 echo "Flashing $current_update_file to $device"
-		echo 0 > /sys/block/mmcblk2boot0/force_ro
+                echo 0 > /sys/block/mmcblk2boot0/force_ro
                 dd if=/resin-boot/$current_update_file of=$device conv=fdatasync seek=$seek_blocks bs=$block_size
-		echo 1 > /sys/block/mmcblk2boot0/force_ro
+                echo 1 > /sys/block/mmcblk2boot0/force_ro
+                # Make sure to configure the eMMC to boot from the boot0 partition
+                mmc bootpart enable 1 0 ${device%boot0}
         fi
 done
 

layers/meta-balena-imx8mm/recipes-support/resin-init/resin-init-flasher-board.bbappend

@@ -1 +1,3 @@
 FILESEXTRAPATHS:append := "${THISDIR}/${PN}"
+
+RDEPENDS:${PN} += "mmc-utils"

layers/meta-balena-imx8mm/recipes-support/resin-init/resin-init-flasher-board/resin-init-flasher-board

@@ -15,3 +15,5 @@ uboot_device="/dev/mmcblk2boot0"
 echo 0 > /sys/block/mmcblk2boot0/force_ro
 dd if=/mnt/boot/$uboot_file of=$uboot_device conv=fdatasync seek=$uboot_seek_blocks bs=$uboot_block_size
 echo 1 > /sys/block/mmcblk2boot0/force_ro
+# Make sure to configure the eMMC to boot from the boot0 partition
+mmc bootpart enable 1 0 ${uboot_device%boot0}