colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #302138 from thefossguy/uboot-2024.01

Browse Source 
uboot: 2024.01 -> 2024.04
This commit is contained in:
Florian Klink 2024-04-12 00:56:25 +03:00 committed by GitHub
commit ce5d96dde7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/misc/uboot/default.nix
View File

@ -28,10 +28,10 @@
}: }:
let let
defaultVersion = "2024.01"; defaultVersion = "2024.04";
defaultSrc = fetchurl { defaultSrc = fetchurl {
url = "https://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2"; url = "https://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2";
hash = "sha256-uZYR8e0je/NUG9yENLaMlqbgWWcGH5kkQ8swqr6+9bM="; hash = "sha256-GKhT/jn6160DqQzC1Cda6u1tppc13vrDSSuAUIhD3Uo=";
}; };
# Dependencies for the tools need to be included as either native or cross, # Dependencies for the tools need to be included as either native or cross,
@ -386,12 +386,6 @@ in {
extraMeta.platforms = ["aarch64-linux"]; extraMeta.platforms = ["aarch64-linux"];
BL31 = "${armTrustedFirmwareRK3588}/bl31.elf"; BL31 = "${armTrustedFirmwareRK3588}/bl31.elf";
ROCKCHIP_TPL = rkbin.TPL_RK3588; ROCKCHIP_TPL = rkbin.TPL_RK3588;
# FIXME: applied upstream, remove in 2024.04
extraConfig = ''
CONFIG_ROCKCHIP_SPI_IMAGE=y
'';
filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" "u-boot-rockchip-spi.bin" ]; filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" "u-boot-rockchip-spi.bin" ];
}; };
@ -613,6 +607,14 @@ in {
filesToInstall = ["u-boot-sunxi-with-spl.bin"]; filesToInstall = ["u-boot-sunxi-with-spl.bin"];
}; };
ubootTuringRK1 = buildUBoot {
defconfig = "turing-rk1-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" ];
};
ubootUtilite = buildUBoot { ubootUtilite = buildUBoot {
defconfig = "cm_fx6_defconfig"; defconfig = "cm_fx6_defconfig";
extraMeta.platforms = ["armv7l-linux"]; extraMeta.platforms = ["armv7l-linux"];

1
pkgs/top-level/all-packages.nix
View File

@ -28330,6 +28330,7 @@ with pkgs;
ubootROCPCRK3399 ubootROCPCRK3399
ubootSheevaplug ubootSheevaplug
ubootSopine ubootSopine
ubootTuringRK1
ubootUtilite ubootUtilite
ubootWandboard ubootWandboard
; ;