From b2f966f7f803eed11f7e8fedbbeca89840fb73ce Mon Sep 17 00:00:00 2001
From: Mariappan Ramasamy <1221719+nappairam@users.noreply.github.com>
Date: Fri, 1 May 2026 23:13:33 +0800
Subject: [PATCH 1/2] ubootRock3C: init at 2026.04

Add U-Boot package for Radxa Rock 3C single-board computer (Rockchip RK3566).

Uses the rock-3c-rk3566_defconfig with armTrustedFirmwareRK3568 BL31 and
rkbin RK3566 TPL. Installs idbloader, u-boot.itb, and rockchip combined
images for both eMMC/SD and SPI flash boot.
---
 pkgs/misc/uboot/default.nix     | 16 ++++++++++++++++
 pkgs/top-level/all-packages.nix |  1 +
 2 files changed, 17 insertions(+)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 404191d92372..f4557ab8dd3e 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -791,6 +791,22 @@ in
     filesToInstall = [ "u-boot.bin" ];
   };
 
+  ubootRock3C = buildUBoot {
+    defconfig = "rock-3c-rk3566_defconfig";
+    extraMeta.platforms = [ "aarch64-linux" ];
+    env = {
+      BL31 = "${armTrustedFirmwareRK3568}/bl31.elf";
+      ROCKCHIP_TPL = rkbin.TPL_RK3566;
+    };
+    filesToInstall = [
+      "idbloader.img"
+      "idbloader-spi.img"
+      "u-boot.itb"
+      "u-boot-rockchip.bin"
+      "u-boot-rockchip-spi.bin"
+    ];
+  };
+
   ubootRock4CPlus = buildUBoot {
     defconfig = "rock-4c-plus-rk3399_defconfig";
     extraMeta.platforms = [ "aarch64-linux" ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9b4018f7b1a9..f41be5174b26 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8757,6 +8757,7 @@ with pkgs;
     ubootRaspberryPi4_32bit
     ubootRaspberryPi4_64bit
     ubootRaspberryPiZero
+    ubootRock3C
     ubootRock4CPlus
     ubootRock5ModelB
     ubootRock64

From 7c97a31684befa0cc98672e664ca1a88680d0534 Mon Sep 17 00:00:00 2001
From: Mariappan Ramasamy <1221719+nappairam@users.noreply.github.com>
Date: Mon, 4 May 2026 22:34:16 +0800
Subject: [PATCH 2/2] ubootRock3C: enable strictDeps

Added for fixing failing CI: nixpkgs-vet (NPV-164)

buildUBoot does not enable strictDeps by default and the
existing ubootRock* packages predate the rule, so the new ubootRock3C
attribute trips the lint.

Set strictDeps = true on the ubootRock3C derivation only to keep blast
radius minimal.
---
 pkgs/misc/uboot/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index f4557ab8dd3e..00d3e68107a3 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -794,6 +794,7 @@ in
   ubootRock3C = buildUBoot {
     defconfig = "rock-3c-rk3566_defconfig";
     extraMeta.platforms = [ "aarch64-linux" ];
+    strictDeps = true;
     env = {
       BL31 = "${armTrustedFirmwareRK3568}/bl31.elf";
       ROCKCHIP_TPL = rkbin.TPL_RK3566;