Skip to content

Commit 4b37474

Browse files
troglobittroglobit
authored
Merge pull request #1214 from kernelkit/rpi-and-more
Board refactor, sensors and NanoPi R2S, RPi 3B + CM4 support Signed-off-by: Joachim Wiberg <[email protected]>
2 parents eb829af + b1e08bd commit 4b37474

File tree

183 files changed

+2760
-1890
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

183 files changed

+2760
-1890
lines changed

‎.github/workflows/build-boot.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- cn9130_crb_boot
2121
- aarch64_qemu_boot
2222
- rpi4_boot
23-
- mt7986_sd_boot
23+
- bpi_r3_boot
2424
env:
2525
MAKEFLAGS: -j5
2626
steps:

‎.github/workflows/build-image.yml‎

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ on:
88
type: choice
99
required: true
1010
options:
11-
- raspberry-pi-4
12-
- banana-pi-r3
13-
default: 'raspberry-pi-4'
11+
- raspberrypi-rpi64
12+
- bananapi-bpi-r3
13+
- friendlyarm-nanopi-r2s
14+
default: 'raspberrypi-rpi64'
1415
use_latest_release:
1516
description: 'Use latest release artifacts instead of workflow artifacts'
1617
type: boolean
@@ -52,12 +53,16 @@ jobs:
5253
- name: Set bootloader and target based on board
5354
run: |
5455
case "${{ inputs.board }}" in
55-
raspberry-pi-4)
56+
raspberrypi-rpi64)
5657
echo "BOOTLOADER=rpi4_boot" >> $GITHUB_ENV
5758
echo "TARGET=aarch64" >> $GITHUB_ENV
5859
;;
59-
banana-pi-r3)
60-
echo "BOOTLOADER=mt7986_sd_boot" >> $GITHUB_ENV
60+
bananapi-bpi-r3)
61+
echo "BOOTLOADER=bpi_r3_boot" >> $GITHUB_ENV
62+
echo "TARGET=aarch64" >> $GITHUB_ENV
63+
;;
64+
friendlyarm-nanopi-r2s)
65+
echo "BOOTLOADER=nanopi_r2s_boot" >> $GITHUB_ENV
6166
echo "TARGET=aarch64" >> $GITHUB_ENV
6267
;;
6368
*)
@@ -144,19 +149,7 @@ jobs:
144149
export BR2_EXTERNAL_INFIX_PATH=$PWD
145150
export RELEASE=""
146151
export INFIX_ID="infix"
147-
148-
# Use the standardized mkimage.sh path for the selected board
149-
# BOARD_SCRIPT="src/board/${{ inputs.board }}/mkimage.sh"
150-
BOARD_SCRIPT="src/board/${{ inputs.board }}/mkimage.sh"
151-
152-
if [ -f "$BOARD_SCRIPT" ]; then
153-
echo "Using board-specific image creation script: $BOARD_SCRIPT"
154-
chmod +x "$BOARD_SCRIPT"
155-
"$BOARD_SCRIPT"
156-
else
157-
echo "Error: Board script $BOARD_SCRIPT not found!"
158-
exit 1
159-
fi
152+
./utils/mkimage.sh ${{ inputs.board }}
160153
161154
- name: Verify created image
162155
run: |
@@ -183,7 +176,7 @@ jobs:
183176
with:
184177
name: sdcard-image-${{ inputs.board }}-${{ env.BOOTLOADER }}
185178
path: |
186-
output/images/*-sdcard.img
179+
output/images/*-sdcard.img*
187180
retention-days: 30
188181

189182
- name: Create checksums
@@ -218,7 +211,7 @@ jobs:
218211
**Artifact Source:** ${{ inputs.use_latest_release && 'Latest Release' || 'Latest Workflow Run' }}
219212
220213
## Created Images
221-
$(find output/images/ -name "*.img" -o -name "*.qcow2" -o -name "*.raw" | xargs ls -lh 2>/dev/null | sed 's/^/- /' || echo "- No images found")
214+
$(find output/images/ -name "*.img*" -o -name "*.qcow2" -o -name "*.raw" | xargs ls -lh 2>/dev/null | sed 's/^/- /' || echo "- No images found")
222215
223216
## Download
224217
The SD card image is available as a workflow artifact above.

‎.github/workflows/build-release.yml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,22 @@ on:
1414
jobs:
1515
build:
1616
name: Build Infix ${{ inputs.version }} [${{ matrix.target }}]
17-
runs-on: [ self-hosted, release ]
17+
runs-on: [self-hosted, release]
1818
strategy:
1919
matrix:
2020
target: [aarch64, x86_64]
2121
fail-fast: false
2222
steps:
23+
- name: Cleanup podman state
24+
run: |
25+
set -x
26+
podman ps -a || true
27+
podman stop -a || true
28+
podman rm -a -f || true
29+
podman volume prune -f || true
30+
podman system prune -a -f || true
31+
podman system migrate || true
32+
2333
- uses: actions/checkout@v4
2434
with:
2535
clean: true

‎.github/workflows/build.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,15 @@ jobs:
5959
rm -rf ./* || true
6060
rm -rf ./.??* || true
6161
ls -la ./
62+
- name: Cleanup podman state
63+
run: |
64+
set -x
65+
podman ps -a || true
66+
podman stop -a || true
67+
podman rm -a -f || true
68+
podman volume prune -f || true
69+
podman system prune -a -f || true
70+
podman system migrate || true
6271
6372
- name: Checkout infix repo
6473
uses: actions/checkout@v4

‎.github/workflows/release.yml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,21 @@ jobs:
4343
release:
4444
name: Release Infix ${{ github.ref_name }}
4545
needs: build
46-
runs-on: [ self-hosted, release ]
46+
runs-on: [self-hosted, release]
4747
permissions:
4848
contents: write
4949
discussions: write
5050
steps:
51+
- name: Cleanup podman state
52+
run: |
53+
set -x
54+
podman ps -a || true
55+
podman stop -a || true
56+
podman rm -a -f || true
57+
podman volume prune -f || true
58+
podman system prune -a -f || true
59+
podman system migrate || true
60+
5161
- uses: actions/checkout@v4
5262
with:
5363
submodules: 'true'

‎.github/workflows/test.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,16 @@ jobs:
4141
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 }}
4242
runs-on: [self-hosted, regression]
4343
steps:
44+
- name: Cleanup podman state
45+
run: |
46+
set -x
47+
podman ps -a || true
48+
podman stop -a || true
49+
podman rm -a -f || true
50+
podman volume prune -f || true
51+
podman system prune -a -f || true
52+
podman system migrate || true
53+
4454
- name: Checkout infix repo
4555
uses: actions/checkout@v4
4656
with:

‎Config.in‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
source "$BR2_EXTERNAL_INFIX_PATH/board/Config.in"
2+
13
menu "Branding"
24

35
config INFIX_VENDOR

‎board/Config.in‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
menu "Board Support"
2+
3+
source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/Config.in"
4+
source "$BR2_EXTERNAL_INFIX_PATH/board/riscv64/Config.in"
5+
source "$BR2_EXTERNAL_INFIX_PATH/board/x86_64/Config.in"
6+
7+
endmenu

‎board/aarch64/Config.in‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
if BR2_aarch64
2+
3+
source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/alder-alder/Config.in"
4+
source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/bananapi-bpi-r3/Config.in"
5+
source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/freescale-imx8mp-evk/Config.in"
6+
source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/friendlyarm-nanopi-r2s/Config.in"
7+
source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/marvell-cn9130-crb/Config.in"
8+
source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/marvell-espressobin/Config.in"
9+
source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/microchip-sparx5-pcb135/Config.in"
10+
source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/raspberrypi-rpi64/Config.in"
11+
source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/styx-dcp-sc-28p/Config.in"
12+
13+
endif

‎board/aarch64/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ Board Specific Documentation
88
- [Marvell CN9130-CRB](cn9130-crb/)
99
- [Microchip SparX-5i PCB135 (eMMC)](sparx5-pcb135/)
1010
- [NanoPi R2S](r2s/)
11-
- [Raspberry Pi 4 b](raspberry-pi-4/)
11+
- [Raspberry Pi 64-bit](raspberry-pi64/)

0 commit comments

Comments
 (0)