uboot: 2024.07 -> 2024.10 (#347188)

NixOS · Oct 12, 2024 · 15f8bd8 · 15f8bd8
2 parents fe17be0 + b8d9a0e
commit 15f8bd8
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
@@ -28,10 +28,10 @@
 }:
 
 let
-  defaultVersion = "2024.07";
+  defaultVersion = "2024.10";
   defaultSrc = fetchurl {
     url = "https://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2";
-    hash = "sha256-9ZHamrkO89az0XN2bQ3f+QxO1zMGgIl0hhF985DYPI8=";
+    hash = "sha256-so2vSsF+QxVjYweL9RApdYQTf231D87ZsS3zT2GpL7A=";
   };
 
   # Dependencies for the tools need to be included as either native or cross,
@@ -212,6 +212,14 @@ in {
     filesToInstall = ["u-boot-with-spl.kwb"];
   };
 
+  ubootCM3588NAS = buildUBoot {
+    defconfig = "cm3588-nas-rk3588_defconfig";
+    extraMeta.platforms = [ "aarch64-linux" ];
+    BL31 = "${armTrustedFirmwareRK3588}/bl31.elf";
+    ROCKCHIP_TPL = rkbin.TPL_RK3588;
+    filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" ];
+  };
+
   ubootCubieboard2 = buildUBoot {
     defconfig = "Cubieboard2_defconfig";
     extraMeta.platforms = ["armv7l-linux"];
@@ -442,6 +450,14 @@ in {
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
+  ubootOrangePi3B = buildUBoot {
+    defconfig = "orangepi-3b-rk3566_defconfig";
+    extraMeta.platforms = ["aarch64-linux"];
+    ROCKCHIP_TPL = rkbin.TPL_RK3568;
+    BL31 = rkbin.BL31_RK3568;
+    filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" "u-boot-rockchip-spi.bin" ];
+  };
+
   ubootPcduino3Nano = buildUBoot {
     defconfig = "Linksprite_pcDuino3_Nano_defconfig";
     extraMeta.platforms = ["armv7l-linux"];

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -26563,6 +26563,7 @@ with pkgs;
     ubootBananaPim64
     ubootAmx335xEVM
     ubootClearfog
+    ubootCM3588NAS
     ubootCubieboard2
     ubootGuruplug
     ubootJetsonTK1
@@ -26575,6 +26576,7 @@ with pkgs;
     ubootOlimexA64Olinuxino
     ubootOlimexA64Teres1
     ubootOrangePi3
+    ubootOrangePi3B
     ubootOrangePi5
     ubootOrangePi5Plus
     ubootOrangePiPc