uttls/mkimage.sh: consolidate sdcard.img generation

This commit consolidates mkimage.sh scripts into a unified SD card image
creation tool that works for all boards.  It needs a bootloader an $ARCH
rootfs.squashfs image and a genimage.cfg.in template.

- Detects build directories from `O=` environment variable or `output/`
- Sources `.config` to discover Buildroot paths
- Uses Buildroot's `support/scripts/genimage.sh` when available
- Automatically generates `.bmap` files if `bmaptool` is available
- Fallback to direct `genimage` invocation if wrapper not found

See the online instructions for usage.

Signed-off-by: Joachim Wiberg <[email protected]>

Author: troglobit

.github/workflows/build-image.yml

@@ -8,9 +8,10 @@ on:
         type: choice
         required: true
         options:
-          - raspberry-pi64
-          - banana-pi-r3
-        default: 'raspberry-pi64'
+          - raspberrypi-rpi64
+          - bananapi-bpi-r3
+          - friendlyarm-nanopi-r2s
+        default: 'raspberrypi-rpi64'
       use_latest_release:
         description: 'Use latest release artifacts instead of workflow artifacts'
         type: boolean
@@ -52,14 +53,18 @@ jobs:
       - name: Set bootloader and target based on board
         run: |
           case "${{ inputs.board }}" in
-            raspberry-pi64)
+            raspberrypi-rpi64)
               echo "BOOTLOADER=rpi4_boot" >> $GITHUB_ENV
               echo "TARGET=aarch64" >> $GITHUB_ENV
               ;;
-            banana-pi-r3)
+            bananapi-bpi-r3)
               echo "BOOTLOADER=mt7986_sd_boot" >> $GITHUB_ENV
               echo "TARGET=aarch64" >> $GITHUB_ENV
               ;;
+            friendlyarm-nanopi-r2s)
+              echo "BOOTLOADER=nanopi_r2s_boot" >> $GITHUB_ENV
+              echo "TARGET=aarch64" >> $GITHUB_ENV
+              ;;
             *)
               echo "Error: Unknown board ${{ inputs.board }}"
               exit 1
@@ -144,19 +149,7 @@ jobs:
           export BR2_EXTERNAL_INFIX_PATH=$PWD
           export RELEASE=""
           export INFIX_ID="infix"
-
-          # Use the standardized mkimage.sh path for the selected board
-          #          BOARD_SCRIPT="src/board/${{ inputs.board }}/mkimage.sh"
-          BOARD_SCRIPT="src/board/${{ inputs.board }}/mkimage.sh"
-
-          if [ -f "$BOARD_SCRIPT" ]; then
-            echo "Using board-specific image creation script: $BOARD_SCRIPT"
-            chmod +x "$BOARD_SCRIPT"
-            "$BOARD_SCRIPT"
-          else
-            echo "Error: Board script $BOARD_SCRIPT not found!"
-            exit 1
-          fi
+          ./utils/mkimage.sh ${{ inputs.board }}
 
       - name: Verify created image
         run: |
@@ -183,7 +176,7 @@ jobs:
         with:
           name: sdcard-image-${{ inputs.board }}-${{ env.BOOTLOADER }}
           path: |
-            output/images/*-sdcard.img
+            output/images/*-sdcard.img*
           retention-days: 30
 
       - name: Create checksums
@@ -218,7 +211,7 @@ jobs:
           **Artifact Source:** ${{ inputs.use_latest_release && 'Latest Release' || 'Latest Workflow Run' }}
 
           ## Created Images
-          $(find output/images/ -name "*.img" -o -name "*.qcow2" -o -name "*.raw" | xargs ls -lh 2>/dev/null | sed 's/^/- /' || echo "- No images found")
+          $(find output/images/ -name "*.img*" -o -name "*.qcow2" -o -name "*.raw" | xargs ls -lh 2>/dev/null | sed 's/^/- /' || echo "- No images found")
 
           ## Download
           The SD card image is available as a workflow artifact above.

board/aarch64/bananapi-bpi-r3/mkimage.sh

@@ -19,7 +19,7 @@ image var.ext4 {
 	}
 }
 
-image sdcard.img {
+image #INFIX_ID##VERSION#-nanopi-r2s-sdcard.img {
 	hdimage {
 		partition-table-type = "gpt"
 	}

…ch64/friendlyarm-nanopi-r2s/genimage.cfg …4/friendlyarm-nanopi-r2s/genimage.cfg.inboard/aarch64/friendlyarm-nanopi-r2s/genimage.cfg renamed to board/aarch64/friendlyarm-nanopi-r2s/genimage.cfg.in board/aarch64/friendlyarm-nanopi-r2s/genimage.cfg renamed to board/aarch64/friendlyarm-nanopi-r2s/genimage.cfg.in

@@ -31,6 +31,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="${BR2_EXTERNAL_INFIX_PATH}/board/common/
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_FORMAT_DTB=y
 BR2_TARGET_UBOOT_CUSTOM_DTS_PATH="${BR2_EXTERNAL_INFIX_PATH}/src/board/banana-pi-r3/uboot/*.dtsi"
+BR2_PACKAGE_HOST_BMAP_TOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y

board/aarch64/raspberrypi-rpi64/mkimage.sh

@@ -37,6 +37,7 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb"
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="idbloader.img"
 BR2_TARGET_UBOOT_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_INFIX_PATH)/board/aarch64/friendlyarm-nanopi-r2s/uboot/r2s-env.dtsi"
+BR2_PACKAGE_HOST_BMAP_TOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y

configs/mt7986_sd_boot_defconfig

@@ -33,6 +33,7 @@ BR2_TARGET_UBOOT_FORMAT_DTB=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="arch/arm/dts/infix-key.dtbo arch/arm/dts/rpi-env.dtbo"
 BR2_TARGET_UBOOT_CUSTOM_DTS_PATH="${BR2_EXTERNAL_INFIX_PATH}/src/board/raspberry-pi64/uboot/rpi-env.dtso"
+BR2_PACKAGE_HOST_BMAP_TOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y