test reuse workflow subdir

Author: SalimTerryLi

.github/workflows/sophgo-sg204x.yml

@@ -8,56 +8,24 @@ on:
 
 jobs:
 
-  build-zsbl:
-    name: Build ZSBL
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        include:
-          - target_name: sophgo-sg2044-srd3-10
-            zsbl_defconfig: sg2044_defconfig
-          - target_name: sophgo-sg2042-milkv-pioneer
-            zsbl_defconfig: sg2042_defconfig
-    env:
-      ZSBL_COMMIT_ID: 45054e711d81fbfa1c2167829402d26795199ae7
-    steps:
-      - name: Cache ZSBL Build
-        id: cache-zsbl-build
-        uses: actions/cache@v5
-        with:
-          path: dist
-          key: cache-zsbl-build-${{ matrix.target_name }}-${{ env.ZSBL_COMMIT_ID }}
-      - uses: actions/checkout@v5
-        if: ${{ steps.cache-zsbl-build.outputs.cache-hit != 'true' }}
-      - name: Setup Toolchains
-        if: ${{ steps.cache-zsbl-build.outputs.cache-hit != 'true' }}
-        id: setup-gcc-toolchain
-        uses: ./.github/actions/riscv64-gcc-toolchain
-      - name: Checkout ZSBL
-        if: ${{ steps.cache-zsbl-build.outputs.cache-hit != 'true' }}
-        uses: actions/checkout@v6
-        with:
-          repository: revyos/zsbl
-          path: zsbl
-          # Branch sg204x as of 20260224
-          ref: ${{ env.ZSBL_COMMIT_ID }}
-          fetch-depth: 1
-      - name: Build ZSBL
-        if: ${{ steps.cache-zsbl-build.outputs.cache-hit != 'true' }}
-        working-directory: zsbl
-        run: |
-          make -j"$(nproc)" CROSS_COMPILE=${{ steps.setup-gcc-toolchain.outputs.full-prefix }} "${{ matrix.zsbl_defconfig }}"
-          make -j"$(nproc)" CROSS_COMPILE=${{ steps.setup-gcc-toolchain.outputs.full-prefix }} USE_LINUX_BOOT=1 zsbl.bin
-      - name: Collect ZSBL Binary
-        if: ${{ steps.cache-zsbl-build.outputs.cache-hit != 'true' }}
-        run: |
-          mkdir dist
-          cp zsbl/zsbl.bin dist/zsbl.bin
-      - name: Upload Artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: "zsbl-${{ matrix.target_name }}"
-          path: dist
+  build-zsbl-sg2042:
+    name: Build ZSBL for SG2042
+    uses: ./.github/workflows/sophgo-sg204x/zsbl-build.yml
+    with:
+      target_name: sophgo-sg2042
+      zsbl_repo: revyos/zsbl
+      # Branch sg204x as of 20260227
+      zsbl_ref: 45054e711d81fbfa1c2167829402d26795199ae7
+      zsbl_defconfig: sg2042_defconfig
+  build-zsbl-sg2044:
+    name: Build ZSBL for SG2044
+    uses: ./.github/workflows/sophgo-sg204x/zsbl-build.yml
+    with:
+      target_name: sophgo-sg2044
+      zsbl_repo: revyos/zsbl
+      # Branch sg204x as of 20260227
+      zsbl_ref: 45054e711d81fbfa1c2167829402d26795199ae7
+      zsbl_defconfig: sg2044_defconfig
 
   build-opensbi:
     name: Build OpenSBI
@@ -216,7 +184,7 @@ jobs:
   pack-sdimage-sg2042:
     name: Pack SD Card Boot Image for SG2042
     needs:
-      - build-zsbl
+      - build-zsbl-sg2042
       - build-opensbi
       - build-u-root
       - build-kernel

.github/workflows/sophgo-sg204x/zsbl-build.yml

@@ -0,0 +1,58 @@
+name: Build ZSBL
+
+on:
+  workflow_call:
+    inputs:
+      target_name:
+        required: true
+        type: string
+      zsbl_repo:
+        required: true
+        type: string
+      zsbl_ref:
+        required: true
+        type: string
+      zsbl_defconfig:
+        required: true
+        type: string
+
+jobs:
+  build-zsbl:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cache ZSBL Build
+        id: cache-zsbl-build
+        uses: actions/cache@v5
+        with:
+          path: dist
+          key: cache-zsbl-build-${{ inputs.target_name }}-${{ inputs.zsbl_ref }}
+      - uses: actions/checkout@v5
+        if: ${{ steps.cache-zsbl-build.outputs.cache-hit != 'true' }}
+      - name: Setup Toolchains
+        if: ${{ steps.cache-zsbl-build.outputs.cache-hit != 'true' }}
+        id: setup-gcc-toolchain
+        uses: ./.github/actions/riscv64-gcc-toolchain
+      - name: Checkout ZSBL
+        if: ${{ steps.cache-zsbl-build.outputs.cache-hit != 'true' }}
+        uses: actions/checkout@v6
+        with:
+          repository: ${{ inputs.zsbl_repo }}
+          path: zsbl
+          ref: ${{ inputs.zsbl_ref }}
+          fetch-depth: 1
+      - name: Build ZSBL
+        if: ${{ steps.cache-zsbl-build.outputs.cache-hit != 'true' }}
+        working-directory: zsbl
+        run: |
+          make -j"$(nproc)" CROSS_COMPILE=${{ steps.setup-gcc-toolchain.outputs.full-prefix }} "${{ inputs.zsbl_defconfig }}"
+          make -j"$(nproc)" CROSS_COMPILE=${{ steps.setup-gcc-toolchain.outputs.full-prefix }} USE_LINUX_BOOT=1 zsbl.bin
+      - name: Collect ZSBL Binary
+        if: ${{ steps.cache-zsbl-build.outputs.cache-hit != 'true' }}
+        run: |
+          mkdir dist
+          cp zsbl/zsbl.bin dist/zsbl.bin
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: "zsbl-${{ inputs.target_name }}"
+          path: dist