git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #78216 from samueldr/u-boot/update/2020.01

uboot: 2019.10 -> 2020.01

commit90441b4b47fc7280de6a5bd1a228017caaa0f97f authorSamuel Dionne-Riel <samuel@dionne-riel.com> dateWed 22 Jan 2020, 00:49 (7 years ago) parentdeb67707943c33
3 files changed+12−23
pkgs/misc/uboot/default.nix+10−22 pkgs/top-level/aliases.nix+1 pkgs/top-level/all-packages.nix+1−1
pkgs/misc/uboot/default.nix+10−22
@@ -6,10 +6,10 @@
66}:
77
88let
9− defaultVersion = "2019.10";
9+ defaultVersion = "2020.01";
1010 defaultSrc = fetchurl {
1111 url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2";
12− sha256 = "053hcrwwlacqh2niisn0zas95zkbffw5aw5sdhixs8lmfdq60vcd";
12+ sha256 = "1w9ml4jl15q6ixpdqzspxjnl7d3rgxd7f99ms1xv5c8869h3qida";
1313 };
1414 buildUBoot = {
1515 version ? null
@@ -28,19 +28,7 @@ let
2828
2929 src = if src == null then defaultSrc else src;
3030
31− patches = [
32− # Submitted upstream: https://patchwork.ozlabs.org/patch/1203693/
33− (fetchpatch {
34− url = https://github.com/dezgeg/u-boot/commit/extlinux-path-length-2018-03.patch;
35− sha256 = "07jafdnxvqv8lz256qy29agjc2k1zj5ad4k28r1w5qkhwj4ixmf8";
36− })
37− # Submitted upstream: https://patchwork.ozlabs.org/patch/1203678/
38− (fetchpatch {
39− name = "rockchip-allow-loading-larger-kernels.patch";
40− url = "https://marc.info/?l=u-boot&m=157537843004298&q=raw";
41− sha256 = "0l3l88cc9xkxkraql82pfgpx6nqn4dj7cvfaagh5pzfwkxyw0n3p";
42− })
43− ] ++ extraPatches;
31+ patches = extraPatches;
4432
4533 postPatch = ''
4634 patchShebangs tools
@@ -53,7 +41,7 @@ let
5341 dtc
5442 flex
5543 openssl
56− (buildPackages.python2.withPackages (p: [ p.libfdt ]))
44+ (buildPackages.python3.withPackages (p: [ p.libfdt ]))
5745 swig
5846 ];
5947 depsBuildBuild = [ buildPackages.stdenv.cc ];
@@ -124,6 +112,12 @@ in {
124112 filesToInstall = ["u-boot-sunxi-with-spl.bin"];
125113 };
126114
115+ ubootAmx335xEVM = buildUBoot {
116+ defconfig = "am335x_evm_defconfig";
117+ extraMeta.platforms = ["armv7l-linux"];
118+ filesToInstall = ["MLO" "u-boot.img"];
119+ };
120+
127121 ubootBananaPi = buildUBoot {
128122 defconfig = "Bananapi_defconfig";
129123 extraMeta.platforms = ["armv7l-linux"];
@@ -143,12 +137,6 @@ in {
143137 filesToInstall = ["u-boot-sunxi-with-spl.bin"];
144138 };
145139
146− ubootBeagleboneBlack = buildUBoot {
147− defconfig = "am335x_boneblack_defconfig";
148− extraMeta.platforms = ["armv7l-linux"];
149− filesToInstall = ["MLO" "u-boot.img"];
150− };
151−
152140 # http://git.denx.de/?p=u-boot.git;a=blob;f=board/solidrun/clearfog/README;hb=refs/heads/master
153141 ubootClearfog = buildUBoot {
154142 defconfig = "clearfog_defconfig";
pkgs/top-level/aliases.nix+1
@@ -442,6 +442,7 @@ mapAliases ({
442442 transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06
443443 truecrypt = veracrypt; # added 2018-10-24
444444 tshark = wireshark-cli; # added 2018-04-25
445+ ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21
445446 ucsFonts = ucs-fonts; # added 2016-07-15
446447 ultrastardx-beta = ultrastardx; # added 2017-08-12
447448 usb_modeswitch = usb-modeswitch; # added 2016-05-10
pkgs/top-level/all-packages.nix+1−1
@@ -17145,7 +17145,7 @@ in
1714517145 ubootBananaPi
1714617146 ubootBananaPim3
1714717147 ubootBananaPim64
17148− ubootBeagleboneBlack
17148+ ubootAmx335xEVM
1714917149 ubootClearfog
1715017150 ubootGuruplug
1715117151 ubootJetsonTK1