diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-07-12 02:36:04 +0300 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-07-12 17:03:40 +0300 |
commit | d0195f0e1da7c5ee74e18352199c1a161124bd65 (patch) | |
tree | 9ae7fa2e384ca62040ac51f4967ea1c95507e20e /pkgs/misc/uboot | |
parent | 7c763118b4ff79fe74085309a0ae0c6b53fb7c93 (diff) |
U-Boot: 2018.05 -> 2018.07
- We get to drop a bunch of patches. Yay!
- bison and flex are now needed
Diffstat (limited to 'pkgs/misc/uboot')
-rw-r--r-- | pkgs/misc/uboot/default.nix | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index bac766c7b722..2a628e0cdf49 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -1,16 +1,9 @@ -{ stdenv, fetchurl, fetchpatch, bc, dtc, openssl, python2, swig +{ stdenv, fetchurl, fetchpatch, bc, bison, dtc, flex, openssl, python2, swig , armTrustedFirmwareAllwinner , hostPlatform, buildPackages }: 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 , installDir ? "$out" , defconfig @@ -21,25 +14,17 @@ let stdenv.mkDerivation (rec { name = "uboot-${defconfig}-${version}"; - version = "2018.05"; + version = "2018.07"; src = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"; - sha256 = "0j60p4iskzb4hamxgykc6gd7xchxfka1zwh8hv08r9rrc4m3r8ad"; + sha256 = "1m7nw64mxflpc6sqvnz2kb5fxfkb4mrpy8b1wi15dcwipj4dy44z"; }; patches = [ (fetchpatch { - url = https://github.com/dezgeg/u-boot/commit/rpi-2018-05-patch1.patch; - sha256 = "0xvw16mp6mm36987rd5yb8bw0n5b3p1gq35wch2gbj15wx55450p"; - }) - (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"; + url = https://github.com/dezgeg/u-boot/commit/pythonpath-2018-07.patch; + sha256 = "096zqrlr8m9lxjma0iv7y6x78qswfs3q1w2irjkbmcvniz1azbs8"; }) (fetchpatch { url = https://github.com/dezgeg/u-boot/commit/extlinux-path-length-2018-03.patch; @@ -51,7 +36,7 @@ let patchShebangs tools ''; - nativeBuildInputs = [ bc dtc openssl python2 swig ]; + nativeBuildInputs = [ bc bison dtc flex openssl python2 swig ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; hardeningDisable = [ "all" ]; @@ -180,7 +165,6 @@ in rec { }; ubootPine64 = buildUBoot rec { - extraPatches = [sunxiPatch]; defconfig = "pine64_plus_defconfig"; extraMeta.platforms = ["aarch64-linux"]; BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; @@ -236,7 +220,6 @@ in rec { }; ubootSopine = buildUBoot rec { - extraPatches = [sunxiPatch]; defconfig = "sopine_baseboard_defconfig"; extraMeta.platforms = ["aarch64-linux"]; BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; |