diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-01-10 07:13:44 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-01-12 14:07:16 +0000 |
commit | e2698550456abba83c6dcd5d5e5a9990a0b96f8a (patch) | |
tree | 79a56f0df3fa55e470d84b4dff6059fbf487ec18 /nixpkgs/pkgs/misc/uboot | |
parent | 1cdc42df888dc98c347e03bd942ed9825a55bcb3 (diff) | |
parent | 84d74ae9c9cbed73274b8e4e00be14688ffc93fe (diff) | |
download | nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.gz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.bz2 nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.lz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.xz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.zst nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.zip |
Merge commit '84d74ae9c9cbed73274b8e4e00be14688ffc93fe'
Diffstat (limited to 'nixpkgs/pkgs/misc/uboot')
-rw-r--r-- | nixpkgs/pkgs/misc/uboot/default.nix | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/misc/uboot/default.nix b/nixpkgs/pkgs/misc/uboot/default.nix index 1bd4dfffd8e1..59f73b42439a 100644 --- a/nixpkgs/pkgs/misc/uboot/default.nix +++ b/nixpkgs/pkgs/misc/uboot/default.nix @@ -18,10 +18,10 @@ }: let - defaultVersion = "2020.04"; + defaultVersion = "2020.07"; defaultSrc = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2"; - sha256 = "0wjkasnz87q86hx93inspdjfjsinmxi87bcvj30c773x0fpjlwzy"; + sha256 = "0sjzy262x93aaqd6z24ziaq19xjjjk5f577ivf768vmvwsgbzxf1"; }; buildUBoot = { version ? null @@ -176,7 +176,7 @@ in { ubootNovena = buildUBoot { defconfig = "novena_defconfig"; extraMeta.platforms = ["armv7l-linux"]; - filesToInstall = ["u-boot.bin" "SPL"]; + filesToInstall = ["u-boot-dtb.img" "SPL"]; }; # Flashing instructions: @@ -271,6 +271,13 @@ in { filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; + ubootPinebookPro = buildUBoot { + defconfig = "pinebook-pro-rk3399_defconfig"; + extraMeta.platforms = ["aarch64-linux"]; + BL31 = "${armTrustedFirmwareRK3399}/bl31.elf"; + filesToInstall = [ "u-boot.itb" "idbloader.img"]; + }; + ubootQemuAarch64 = buildUBoot { defconfig = "qemu_arm64_defconfig"; extraMeta.platforms = ["aarch64-linux"]; |