mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 22:50:49 +00:00
Code Issues Wiki Activity

U-Boot: 2018.05 -> 2018.07

Browse source 
- We get to drop a bunch of patches. Yay!
- bison and flex are now needed
This commit is contained in:
Tuomas Tynkkynen 2018-07-12 02:36:04 +03:00
parent 7c763118b4
commit d0195f0e1d
1 changed files with 6 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,16 +1,9 @@
{ stdenv, fetchurl, fetchpatch, bc, dtc, openssl, python2, swig { stdenv, fetchurl, fetchpatch, bc, bison, dtc, flex, openssl, python2, swig
, armTrustedFirmwareAllwinner , armTrustedFirmwareAllwinner
, hostPlatform, buildPackages , hostPlatform, buildPackages
}: }:
let let
# Various changes for 64-bit sunxi boards, (hopefully) destined for 2018.05
sunxiPatch = fetchpatch {
name = "sunxi.patch";
url = "https://github.com/u-boot/u-boot/compare/v2018.05...dezgeg:2018-05-sunxi.patch";
sha256 = "1dfv4s1f71iv80vjxgyghv4pcwjv4mjphk75a8hfl3jdbpd66d36";
};
buildUBoot = { filesToInstall buildUBoot = { filesToInstall
, installDir ? "$out" , installDir ? "$out"
, defconfig , defconfig
@ -21,25 +14,17 @@ let
stdenv.mkDerivation (rec { stdenv.mkDerivation (rec {
name = "uboot-${defconfig}-${version}"; name = "uboot-${defconfig}-${version}";
version = "2018.05"; version = "2018.07";
src = fetchurl { src = fetchurl {
url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"; url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2";
sha256 = "0j60p4iskzb4hamxgykc6gd7xchxfka1zwh8hv08r9rrc4m3r8ad"; sha256 = "1m7nw64mxflpc6sqvnz2kb5fxfkb4mrpy8b1wi15dcwipj4dy44z";
}; };
patches = [ patches = [
(fetchpatch { (fetchpatch {
url = https://github.com/dezgeg/u-boot/commit/rpi-2018-05-patch1.patch; url = https://github.com/dezgeg/u-boot/commit/pythonpath-2018-07.patch;
sha256 = "0xvw16mp6mm36987rd5yb8bw0n5b3p1gq35wch2gbj15wx55450p"; sha256 = "096zqrlr8m9lxjma0iv7y6x78qswfs3q1w2irjkbmcvniz1azbs8";
})
(fetchpatch {
url = https://github.com/dezgeg/u-boot/commit/rpi-2018-05-patch2.patch;
sha256 = "0q1a5l5rfgddncxrjk59qr1f5587dwbvcf6z15bsfl2invs19m2b";
})
(fetchpatch {
url = https://github.com/dezgeg/u-boot/commit/pythonpath-2018-03.patch;
sha256 = "1rhhlhrwhv7ic1n5i720jfh2cxwrkssrkvinllyjy3j9k9bpzcqd";
}) })
(fetchpatch { (fetchpatch {
url = https://github.com/dezgeg/u-boot/commit/extlinux-path-length-2018-03.patch; url = https://github.com/dezgeg/u-boot/commit/extlinux-path-length-2018-03.patch;
@ -51,7 +36,7 @@ let
patchShebangs tools patchShebangs tools
''; '';
nativeBuildInputs = [ bc dtc openssl python2 swig ]; nativeBuildInputs = [ bc bison dtc flex openssl python2 swig ];
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];
hardeningDisable = [ "all" ]; hardeningDisable = [ "all" ];
@ -180,7 +165,6 @@ in rec {
}; };
ubootPine64 = buildUBoot rec { ubootPine64 = buildUBoot rec {
extraPatches = [sunxiPatch];
defconfig = "pine64_plus_defconfig"; defconfig = "pine64_plus_defconfig";
extraMeta.platforms = ["aarch64-linux"]; extraMeta.platforms = ["aarch64-linux"];
BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
@ -236,7 +220,6 @@ in rec {
}; };
ubootSopine = buildUBoot rec { ubootSopine = buildUBoot rec {
extraPatches = [sunxiPatch];
defconfig = "sopine_baseboard_defconfig"; defconfig = "sopine_baseboard_defconfig";
extraMeta.platforms = ["aarch64-linux"]; extraMeta.platforms = ["aarch64-linux"];
BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";