diff options
| author | Florian Klink <flokli@flokli.de> | 2024-04-12 00:56:25 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-12 00:56:25 +0300 |
| commit | ce5d96dde7340eaf30af98000122018e175360fc (patch) | |
| tree | 63836fe78345b77fdb7b63527d52086881ab4af3 /pkgs/misc | |
| parent | 274dc1ce96b115033706442d20b8851e4bac5a5a (diff) | |
| parent | 35085ab73009898b5e9d74f1792883773eb2c4b5 (diff) | |
Merge pull request #302138 from thefossguy/uboot-2024.01
uboot: 2024.01 -> 2024.04
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/uboot/default.nix | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index d7a3ad13825c2..837070e656147 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -28,10 +28,10 @@ }: let - defaultVersion = "2024.01"; + defaultVersion = "2024.04"; defaultSrc = fetchurl { 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, @@ -386,12 +386,6 @@ in { extraMeta.platforms = ["aarch64-linux"]; BL31 = "${armTrustedFirmwareRK3588}/bl31.elf"; 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" ]; }; @@ -613,6 +607,14 @@ in { 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 { defconfig = "cm_fx6_defconfig"; extraMeta.platforms = ["armv7l-linux"]; |