MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #61652 from samueldr/update/u-boot/2019.04

Browse source 
u-boot: 2018.09 -> 2019.04 (+ ATF update and boards)
This commit is contained in:
Samuel Dionne-Riel 2019-05-28 23:19:24 -04:00 committed by GitHub
commit 61f0936d1c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/misc/arm-trusted-firmware/default.nix
View file

@ -6,7 +6,7 @@ let
, platform
, extraMakeFlags ? []
, extraMeta ? {}
, version ? "2.0"
, version ? "2.1"
, ... } @ args:
stdenv.mkDerivation (rec {
@ -17,7 +17,7 @@ let
owner = "ARM-software";
repo = "arm-trusted-firmware";
rev = "refs/tags/v${version}";
sha256 = "087pkwa6slxff0aiz3v42gww007nww97bl1p96fvvs7rr1y14gjx";
sha256 = "1gy5qskrjy8n3kxdcm1dx8b45l5b75n0pm8pq80wl6xic1ycy24r";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];
@ -57,15 +57,7 @@ in rec {
inherit buildArmTrustedFirmware;
armTrustedFirmwareAllwinner = buildArmTrustedFirmware rec {
version = "1.0";
src = fetchFromGitHub {
owner = "apritzel";
repo = "arm-trusted-firmware";
# Branch: `allwinner`
rev = "91f2402d941036a0db092d5375d0535c270b9121";
sha256 = "0lbipkxb01w97r6ah8wdbwxir3013rp249fcqhlzh2gjwhp5l1ys";
};
platform = "sun50iw1p1";
platform = "sun50i_a64";
extraMeta.platforms = ["aarch64-linux"];
filesToInstall = ["build/${platform}/release/bl31.bin"];
};

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

@ -4,7 +4,7 @@
}:
let
buildUBoot = { version ? "2018.09"
buildUBoot = { version ? "2019.04"
, filesToInstall
, installDir ? "$out"
, defconfig
@ -20,7 +20,7 @@ let
src = fetchurl {
url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2";
sha256 = "0s122kyz1svvs2yjzj4j9qravl3ra4vn0fjqgski7rlczqyg56w3";
sha256 = "1vwv4bgbl7fjcm073zrphn17hnz5h5h778f88ivdsgbb2lnpgdvn";
};
patches = [
@ -195,6 +195,20 @@ in rec {
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};
ubootPine64LTS = buildUBoot rec {
defconfig = "pine64-lts_defconfig";
extraMeta.platforms = ["aarch64-linux"];
BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};
ubootPinebook = buildUBoot rec {
defconfig = "pinebook_defconfig";
extraMeta.platforms = ["aarch64-linux"];
BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};
ubootQemuAarch64 = buildUBoot rec {
defconfig = "qemu_arm64_defconfig";
extraMeta.platforms = ["aarch64-linux"];

2
pkgs/top-level/all-packages.nix
View file

@ -15955,6 +15955,8 @@ in
ubootOrangePiZeroPlus2H5
ubootPcduino3Nano
ubootPine64
ubootPine64LTS
ubootPinebook
ubootQemuAarch64
ubootQemuArm
ubootRaspberryPi