From cd68b68a4a79cb2ccd642e49fa4d6e37410d42bc Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Fri, 28 Mar 2025 19:37:41 +0100 Subject: [PATCH 1/3] armTrustedFirmwareRK3568: init Signed-off-by: Felix Singer --- pkgs/misc/arm-trusted-firmware/default.nix | 7 +++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 8 insertions(+) diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix index a959d2c2130a..743e429c0051 100644 --- a/pkgs/misc/arm-trusted-firmware/default.nix +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -179,6 +179,13 @@ in platformCanUseHDCPBlob = true; }; + armTrustedFirmwareRK3568 = buildArmTrustedFirmware rec { + extraMakeFlags = [ "bl31" ]; + platform = "rk3568"; + extraMeta.platforms = [ "aarch64-linux" ]; + filesToInstall = [ "build/${platform}/release/bl31/bl31.elf" ]; + }; + armTrustedFirmwareRK3588 = buildArmTrustedFirmware rec { extraMakeFlags = [ "bl31" ]; platform = "rk3588"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b03ffcc2e61f..4af4aaacc186 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12741,6 +12741,7 @@ with pkgs; armTrustedFirmwareQemu armTrustedFirmwareRK3328 armTrustedFirmwareRK3399 + armTrustedFirmwareRK3568 armTrustedFirmwareRK3588 armTrustedFirmwareS905 ; From 0c23f8cf2d2ddd57d0f94d4058ad6b559c8f1b77 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Fri, 28 Mar 2025 20:34:26 +0100 Subject: [PATCH 2/3] rkbin: add rk3566_ddr_1056MHz_v1.23.bin Signed-off-by: Felix Singer --- pkgs/by-name/rk/rkbin/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/rk/rkbin/package.nix b/pkgs/by-name/rk/rkbin/package.nix index f13113238467..b4481753bee0 100644 --- a/pkgs/by-name/rk/rkbin/package.nix +++ b/pkgs/by-name/rk/rkbin/package.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation { passthru = { BL31_RK3568 = "${rkbin}/bin/rk35/rk3568_bl31_v1.44.elf"; BL31_RK3588 = "${rkbin}/bin/rk35/rk3588_bl31_v1.47.elf"; + TPL_RK3566 = "${rkbin}/bin/rk35/rk3566_ddr_1056MHz_v1.23.bin"; TPL_RK3568 = "${rkbin}/bin/rk35/rk3568_ddr_1056MHz_v1.23.bin"; TPL_RK3588 = "${rkbin}/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.18.bin"; }; From 7f390bd94cab962cc6cbd2c400d505a11d440614 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Fri, 28 Mar 2025 20:24:09 +0100 Subject: [PATCH 3/3] ubootQuartz64B: init Signed-off-by: Felix Singer --- pkgs/misc/uboot/default.nix | 15 +++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 16 insertions(+) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 7d250b0d7bcb..02fd32cee2c9 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -24,6 +24,7 @@ armTrustedFirmwareAllwinnerH616, armTrustedFirmwareRK3328, armTrustedFirmwareRK3399, + armTrustedFirmwareRK3568, armTrustedFirmwareRK3588, armTrustedFirmwareS905, buildPackages, @@ -606,6 +607,20 @@ in filesToInstall = [ "u-boot.rom" ]; }; + ubootQuartz64B = buildUBoot { + defconfig = "quartz64-b-rk3566_defconfig"; + extraMeta.platforms = [ "aarch64-linux" ]; + BL31 = "${armTrustedFirmwareRK3568}/bl31.elf"; + ROCKCHIP_TPL = rkbin.TPL_RK3568; + filesToInstall = [ + "idbloader.img" + "idbloader-spi.img" + "u-boot.itb" + "u-boot-rockchip.bin" + "u-boot-rockchip-spi.bin" + ]; + }; + ubootRaspberryPi = buildUBoot { defconfig = "rpi_defconfig"; extraMeta.platforms = [ "armv6l-linux" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4af4aaacc186..a7a569ad9846 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13316,6 +13316,7 @@ with pkgs; ubootQemuArm ubootQemuRiscv64Smode ubootQemuX86 + ubootQuartz64B ubootRaspberryPi ubootRaspberryPi2 ubootRaspberryPi3_32bit