feat: add Turing RK1 support

U-Boot has a patch for generating SPI images, which is required for eMMC when booting from NVMe. U-Boot also includes a KASLR patch that enables passing a seed to EFI so the kernel has sufficient entropy at boot to enable KASLR. DTB is compiled externally (not via `siderolabs/pkgs`) as they still require DTS patches. The RKBIN for RK3588 DDR initialization is patched to support a different baud rate for the internal UART on the Turing Pi. Without this patch, the `tpi uart` command will not work (i.e., reading the console from the Turing Pi channel with the RK1). The UART ID is changed to 9 to prevent device name conflicts. Patching the RKBIN for the RK3588 involves running a closed-source utility, ddrbin_tool, from the rkbin repository. Signed-off-by: Nico Berlee <[email protected]> Signed-off-by: Noel Georgi <[email protected]>
siderolabs · Dec 2, 2024 · 2087643 · 2087643
1 parent c31f3e9
commit 2087643
Show file tree

Hide file tree

Showing 22 changed files with 1,850 additions and 11 deletions.
diff --git a/Pkgfile b/Pkgfile
@@ -8,18 +8,24 @@ vars:
   arm_trusted_firmware_sha256: ba215404fe9db26e5f2cef3fdce17b7c8ed344a2a1d592dd01a5f1c5e72cfdbd
   arm_trusted_firmware_sha512: 0b0e634ba7b1bf3d2a0ef429391f9a6c350abe373b0563e3932f0347246b773238593036674cbb958fffce36c7449f9ebb3ee340650a3184c3e052487fae656b
 
-  arm_trusted_firmware_unstable_commit: fe4df8bdae0a5d1d87c67c24fdd03595cd90dd08
-  arm_trusted_firmware_unstable_sha256: decae910116538333937b698d5f39ef9c77a0e56c4e6bfaed1b8e8801a07fe6a
-  arm_trusted_firmware_unstable_sha512: 49b6bf88810f52febf7ac224ec03b24694e52242ab37c0bb84a2527aa347b9a379131dcce8e157ac73db018a3b9761eed1ad756f34185ae725ac56c1452fd544
+  arm_trusted_firmware_nonlts_version: v2.12.0
+  arm_trusted_firmware_nonlts_sha256: 30abf4da07418ad0f840369c3e64dc6a0bc6a936d53a213ce10783f3d1a3430f
+  arm_trusted_firmware_nonlts_sha512: 947336e5a9b2504ebea696980c09e2b99a49ec4f84b6dfb25f9ba33d09095cf32ac518c165fcf51db8b3896842bdd954c73d6e887afc5da48803914eae82bc45
 
   # renovate: datasource=github-tags extractVersion=^v(?<version>.*)$ depName=u-boot/u-boot
   uboot_version: 2024.07
   uboot_sha256: f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f
   uboot_sha512: 678f44e2b9132140f0bf05c637e57e638c73c278611037a41824b3ebff2131af4dec0163da4664bb2e5c4fd8034ba8c95b93b57f7aa9f4c045da322d87c3b5e9
 
   # renovate: datasource=git-refs versioning=git depName=https://github.com/rockchip-linux/rkbin.git
-  rkbin_ref: a2a0b89b6c8c612dca5ed9ed8a68db8a07f68bc0
-  rkbin_sha256: 9df375316869daadbf874410f4097591c32cc2dca5a30fd328ea7a1cd8f8b6a8
-  rkbin_sha512: 715253b5ef5c7fbcbce8478d4dea5ad3d1b4b738da437b5f0e9b31eed20f9bcb86cab082e4c04c69b42b6ffcc2cbb1a31079b33b968bb76826ff0dd4f83043e1
+  rkbin_ref: 7c35e21a8529b3758d1f051d1a5dc62aae934b2b
+  rkbin_sha256: 18bde6ce71df308197db0e1d95fd73a19b6a32f4f0b6f5567333ef3c5b617452
+  rkbin_sha512: f414b26f944e2119d6be93c1675d1bbbd2770141e229a3ffe0a176e6dc25d9cea506e7456344d714ac563af64ad708fe93cca9e184353a1b60d8881285d81822
+
+  # renovate: datasource=git-tags extractVersion=^v(?<version>.*)$ depName=git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
+  linux_version: 6.12.1
+  linux_sha256: 0193b1d86dd372ec891bae799f6da20deef16fc199f30080a4ea9de8cef0c619
+  linux_sha512: c7523dc5b012367301ab43a685b766dce025c4993041acd3dacd085b052b3fccc7f50c892357acf481e24ccad512770ef46a13d2da16c2a178c44a27f7022932
+
 labels:
   org.opencontainers.image.source: https://github.com/siderolabs/sbc-rockchip
diff --git a/README.md b/README.md
@@ -6,6 +6,7 @@ This repo provides the overlay for RockChip based Talos image.
 
 | Overlay Name         | Board                 | SoC    | Description                                   |
 | -------------------- | --------------------- | ------ | --------------------------------------------- |
+| helios64             | Kobol Helios64        | RK3399 | Overlay for Kobol Helios64                    |
 | nanopi-r5s           | NanoPi R5S            | RK3568 | Overlay for NanoPi R5S (only WAN, no NVMe)    |
 | nanopi-r4s           | NanoPi R4S            | RK3399 | Overlay for NanoPi R4S                        |
 | orangepi-r1-plus-lts | Orange Pi R1 Plus LTS | RK3328 | Overlay for Orange Pi R1 Plus LTS             |
@@ -14,4 +15,4 @@ This repo provides the overlay for RockChip based Talos image.
 | rockpi4c             | Rock Pi 4C            | RK3399 | Overlay for Rock Pi 4C                        |
 | rock4se              | Rock 4 SE             | RK3399 | Overlay for Rock 4 SE                         |
 | rock4cplus           | Radxa ROCK 4C+        | RK3399 | Overlay for Radxa ROCK 4C+                    |
-| helios64             | Kobol Helios64        | RK3399 | Overlay for Kobol Helios64                    |
+| turingrk1            | Turing Machines RK1   | RK3588 | Overlay for Turing Machines RK1               |
diff --git a/artifacts/arm-trusted-firmware/rk3568/pkg.yaml b/artifacts/arm-trusted-firmware/rk3568/pkg.yaml
@@ -5,10 +5,10 @@ dependencies:
   - stage: base
 steps:
   - sources:
-      - url: https://github.com/ARM-software/arm-trusted-firmware/archive/{{ .arm_trusted_firmware_unstable_commit }}.tar.gz
+      - url: https://github.com/ARM-software/arm-trusted-firmware/archive/{{ .arm_trusted_firmware_nonlts_version }}.tar.gz
         destination: arm-trusted-firmware.tar.gz
-        sha256: "{{ .arm_trusted_firmware_unstable_sha256 }}"
-        sha512: "{{ .arm_trusted_firmware_unstable_sha512 }}"
+        sha256: "{{ .arm_trusted_firmware_nonlts_sha256 }}"
+        sha512: "{{ .arm_trusted_firmware_nonlts_sha512 }}"
     env:
       SOURCE_DATE_EPOCH: {{ .BUILD_ARG_SOURCE_DATE_EPOCH }}
     prepare:

diff --git a/artifacts/arm-trusted-firmware/rk3588/pkg.yaml b/artifacts/arm-trusted-firmware/rk3588/pkg.yaml
@@ -0,0 +1,38 @@
+name: arm-trusted-firmware-rk3588
+variant: scratch
+shell: /toolchain/bin/bash
+dependencies:
+  - stage: base
+steps:
+  - sources:
+      - url: https://github.com/ARM-software/arm-trusted-firmware/archive/{{ .arm_trusted_firmware_nonlts_version }}.tar.gz
+        destination: arm-trusted-firmware.tar.gz
+        sha256: "{{ .arm_trusted_firmware_nonlts_sha256 }}"
+        sha512: "{{ .arm_trusted_firmware_nonlts_sha512 }}"
+    env:
+      SOURCE_DATE_EPOCH: {{ .BUILD_ARG_SOURCE_DATE_EPOCH }}
+    prepare:
+      - |
+        mkdir -p /usr/bin \
+          && ln -sf /toolchain/bin/env /usr/bin/env
+
+        tar xzf arm-trusted-firmware.tar.gz --strip-components=1
+    # rk3588
+    build:
+      - |
+        # https://github.com/ARM-software/arm-trusted-firmware/blob/master/docs/getting_started/initial-build.rst
+        export CROSS_COMPILE=/toolchain/bin/aarch64-linux-musl-
+
+        make realclean
+
+        # https://salsa.debian.org/debian/arm-trusted-firmware/-/commit/6424a59e08585af7f8a56f1e16ecc6a6b9e4ad7a
+        # https://salsa.debian.org/debian/arm-trusted-firmware/-/commit/6ed8f61df3b07bb22a68a0fc189ec3b3f7b00dbd
+        CFLAGS=--param=min-pagesize=0 make -j $(nproc) PLAT=rk3588 DEBUG=0 bl31
+    install:
+      - |
+        mkdir -p /rootfs/arm-trusted-firmware/rk3588
+
+        cp build/rk3588/release/bl31/bl31.elf /rootfs/arm-trusted-firmware/rk3588/bl31.elf
+finalize:
+  - from: /rootfs
+    to: /libs