Board refactor, sensors and NanoPi R2S, RPi 3B + CM4 support

.github/workflows/build-boot.yml

@@ -20,7 +20,7 @@ jobs:
           - cn9130_crb_boot
           - aarch64_qemu_boot
           - rpi4_boot
-          - mt7986_sd_boot
+          - bpi_r3_boot
     env:
       MAKEFLAGS: -j5
     steps:

.github/workflows/build-image.yml

@@ -8,9 +8,10 @@ on:
         type: choice
         required: true
         options:
-          - raspberry-pi-4
-          - banana-pi-r3
-        default: 'raspberry-pi-4'
+          - 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,12 +53,16 @@ jobs:
       - name: Set bootloader and target based on board
         run: |
           case "${{ inputs.board }}" in
-            raspberry-pi-4)
+            raspberrypi-rpi64)
               echo "BOOTLOADER=rpi4_boot" >> $GITHUB_ENV
               echo "TARGET=aarch64" >> $GITHUB_ENV
               ;;
-            banana-pi-r3)
-              echo "BOOTLOADER=mt7986_sd_boot" >> $GITHUB_ENV
+            bananapi-bpi-r3)
+              echo "BOOTLOADER=bpi_r3_boot" >> $GITHUB_ENV
+              echo "TARGET=aarch64" >> $GITHUB_ENV
+              ;;
+            friendlyarm-nanopi-r2s)
+              echo "BOOTLOADER=nanopi_r2s_boot" >> $GITHUB_ENV
               echo "TARGET=aarch64" >> $GITHUB_ENV
               ;;
             *)
@@ -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.

.github/workflows/build-release.yml

@@ -14,12 +14,22 @@ on:
 jobs:
   build:
     name: Build Infix ${{ inputs.version }} [${{ matrix.target }}]
-    runs-on: [ self-hosted, release ]
+    runs-on: [self-hosted, release]
     strategy:
       matrix:
         target: [aarch64, x86_64]
       fail-fast: false
     steps:
+      - name: Cleanup podman state
+        run: |
+          set -x
+          podman ps -a              || true
+          podman stop -a            || true
+          podman rm -a -f           || true
+          podman volume prune -f    || true
+          podman system prune -a -f || true
+          podman system migrate     || true
+
       - uses: actions/checkout@v4
         with:
           clean: true

.github/workflows/build.yml

@@ -59,6 +59,15 @@ jobs:
           rm -rf ./* || true
           rm -rf ./.??* || true
           ls -la ./
+      - name: Cleanup podman state
+        run: |
+          set -x
+          podman ps -a              || true
+          podman stop -a            || true
+          podman rm -a -f           || true
+          podman volume prune -f    || true
+          podman system prune -a -f || true
+          podman system migrate     || true
 
       - name: Checkout infix repo
         uses: actions/checkout@v4

.github/workflows/release.yml

@@ -43,11 +43,21 @@ jobs:
   release:
     name: Release Infix ${{ github.ref_name }}
     needs: build
-    runs-on: [ self-hosted, release ]
+    runs-on: [self-hosted, release]
     permissions:
       contents: write
       discussions: write
     steps:
+      - name: Cleanup podman state
+        run: |
+          set -x
+          podman ps -a              || true
+          podman stop -a            || true
+          podman rm -a -f           || true
+          podman volume prune -f    || true
+          podman system prune -a -f || true
+          podman system migrate     || true
+
       - uses: actions/checkout@v4
         with:
           submodules: 'true'

.github/workflows/test.yml

@@ -41,6 +41,16 @@ jobs:
     name: Regression Test ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.name || inputs.name }} ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.target || inputs.target }}
     runs-on: [self-hosted, regression]
     steps:
+      - name: Cleanup podman state
+        run: |
+          set -x
+          podman ps -a              || true
+          podman stop -a            || true
+          podman rm -a -f           || true
+          podman volume prune -f    || true
+          podman system prune -a -f || true
+          podman system migrate     || true
+
       - name: Checkout infix repo
         uses: actions/checkout@v4
         with:

Config.in

@@ -1,3 +1,5 @@
+source "$BR2_EXTERNAL_INFIX_PATH/board/Config.in"
+
 menu "Branding"
 
 config INFIX_VENDOR

board/Config.in

@@ -0,0 +1,7 @@
+menu "Board Support"
+
+source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/Config.in"
+source "$BR2_EXTERNAL_INFIX_PATH/board/riscv64/Config.in"
+source "$BR2_EXTERNAL_INFIX_PATH/board/x86_64/Config.in"
+
+endmenu

board/aarch64/Config.in

@@ -0,0 +1,13 @@
+if BR2_aarch64
+
+source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/alder-alder/Config.in"
+source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/bananapi-bpi-r3/Config.in"
+source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/freescale-imx8mp-evk/Config.in"
+source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/friendlyarm-nanopi-r2s/Config.in"
+source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/marvell-cn9130-crb/Config.in"
+source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/marvell-espressobin/Config.in"
+source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/microchip-sparx5-pcb135/Config.in"
+source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/raspberrypi-rpi64/Config.in"
+source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/styx-dcp-sc-28p/Config.in"
+
+endif

board/aarch64/README.md

@@ -8,4 +8,4 @@ Board Specific Documentation
 - [Marvell CN9130-CRB](cn9130-crb/)
 - [Microchip SparX-5i PCB135 (eMMC)](sparx5-pcb135/)
 - [NanoPi R2S](r2s/)
-- [Raspberry Pi 4 b](raspberry-pi-4/)
+- [Raspberry Pi 64-bit](raspberry-pi64/)

package/board/banana-pi-r3/Config.in → board/aarch64/bananapi-bpi-r3/Config.in

@@ -1,4 +1,4 @@
-config BR2_PACKAGE_BANANA_PI_R3
+config BR2_PACKAGE_BANANAPI_BPI_R3
 	bool "Banana Pi R3"
 	depends on BR2_aarch64
 	select BR2_PACKAGE_FEATURE_WIFI

package/board/banana-pi-r3/banana-pi-r3.mk → board/aarch64/bananapi-bpi-r3/bananapi-bpi-r3.mk

@@ -1,8 +1,4 @@
-GENIMAGE_CFG="$(BUILD_DIR)/genimage.cfg"
-GENIMAGE_TMP="$(BUILD_DIR)/genimage.tmp"
-BOARD_DIR="$(BR2_EXTERNAL_INFIX_PATH)/src/board/banana-pi-r3"
-
-define BANANA_PI_R3_LINUX_CONFIG_FIXUPS
+define BANANAPI_BPI_R3_LINUX_CONFIG_FIXUPS
 	$(call KCONFIG_ENABLE_OPT,CONFIG_ARCH_MEDIATEK)
 	$(call KCONFIG_ENABLE_OPT,CONFIG_MACH_MT7986)
 	$(call KCONFIG_ENABLE_OPT,CONFIG_PINCTRL_MT7986)