Merge pull request #78216 from samueldr/u-boot/update/2020.01
uboot: 2019.10 -> 2020.01
This commit is contained in:
commit
90441b4b47
|
@ -6,10 +6,10 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
defaultVersion = "2019.10";
|
defaultVersion = "2020.01";
|
||||||
defaultSrc = fetchurl {
|
defaultSrc = fetchurl {
|
||||||
url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2";
|
url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2";
|
||||||
sha256 = "053hcrwwlacqh2niisn0zas95zkbffw5aw5sdhixs8lmfdq60vcd";
|
sha256 = "1w9ml4jl15q6ixpdqzspxjnl7d3rgxd7f99ms1xv5c8869h3qida";
|
||||||
};
|
};
|
||||||
buildUBoot = {
|
buildUBoot = {
|
||||||
version ? null
|
version ? null
|
||||||
|
@ -28,19 +28,7 @@ let
|
||||||
|
|
||||||
src = if src == null then defaultSrc else src;
|
src = if src == null then defaultSrc else src;
|
||||||
|
|
||||||
patches = [
|
patches = extraPatches;
|
||||||
# Submitted upstream: https://patchwork.ozlabs.org/patch/1203693/
|
|
||||||
(fetchpatch {
|
|
||||||
url = https://github.com/dezgeg/u-boot/commit/extlinux-path-length-2018-03.patch;
|
|
||||||
sha256 = "07jafdnxvqv8lz256qy29agjc2k1zj5ad4k28r1w5qkhwj4ixmf8";
|
|
||||||
})
|
|
||||||
# Submitted upstream: https://patchwork.ozlabs.org/patch/1203678/
|
|
||||||
(fetchpatch {
|
|
||||||
name = "rockchip-allow-loading-larger-kernels.patch";
|
|
||||||
url = "https://marc.info/?l=u-boot&m=157537843004298&q=raw";
|
|
||||||
sha256 = "0l3l88cc9xkxkraql82pfgpx6nqn4dj7cvfaagh5pzfwkxyw0n3p";
|
|
||||||
})
|
|
||||||
] ++ extraPatches;
|
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
patchShebangs tools
|
patchShebangs tools
|
||||||
|
@ -53,7 +41,7 @@ let
|
||||||
dtc
|
dtc
|
||||||
flex
|
flex
|
||||||
openssl
|
openssl
|
||||||
(buildPackages.python2.withPackages (p: [ p.libfdt ]))
|
(buildPackages.python3.withPackages (p: [ p.libfdt ]))
|
||||||
swig
|
swig
|
||||||
];
|
];
|
||||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||||
|
@ -124,6 +112,12 @@ in {
|
||||||
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
|
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
ubootAmx335xEVM = buildUBoot {
|
||||||
|
defconfig = "am335x_evm_defconfig";
|
||||||
|
extraMeta.platforms = ["armv7l-linux"];
|
||||||
|
filesToInstall = ["MLO" "u-boot.img"];
|
||||||
|
};
|
||||||
|
|
||||||
ubootBananaPi = buildUBoot {
|
ubootBananaPi = buildUBoot {
|
||||||
defconfig = "Bananapi_defconfig";
|
defconfig = "Bananapi_defconfig";
|
||||||
extraMeta.platforms = ["armv7l-linux"];
|
extraMeta.platforms = ["armv7l-linux"];
|
||||||
|
@ -143,12 +137,6 @@ in {
|
||||||
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
|
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
|
||||||
};
|
};
|
||||||
|
|
||||||
ubootBeagleboneBlack = buildUBoot {
|
|
||||||
defconfig = "am335x_boneblack_defconfig";
|
|
||||||
extraMeta.platforms = ["armv7l-linux"];
|
|
||||||
filesToInstall = ["MLO" "u-boot.img"];
|
|
||||||
};
|
|
||||||
|
|
||||||
# http://git.denx.de/?p=u-boot.git;a=blob;f=board/solidrun/clearfog/README;hb=refs/heads/master
|
# http://git.denx.de/?p=u-boot.git;a=blob;f=board/solidrun/clearfog/README;hb=refs/heads/master
|
||||||
ubootClearfog = buildUBoot {
|
ubootClearfog = buildUBoot {
|
||||||
defconfig = "clearfog_defconfig";
|
defconfig = "clearfog_defconfig";
|
||||||
|
|
|
@ -442,6 +442,7 @@ mapAliases ({
|
||||||
transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06
|
transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06
|
||||||
truecrypt = veracrypt; # added 2018-10-24
|
truecrypt = veracrypt; # added 2018-10-24
|
||||||
tshark = wireshark-cli; # added 2018-04-25
|
tshark = wireshark-cli; # added 2018-04-25
|
||||||
|
ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21
|
||||||
ucsFonts = ucs-fonts; # added 2016-07-15
|
ucsFonts = ucs-fonts; # added 2016-07-15
|
||||||
ultrastardx-beta = ultrastardx; # added 2017-08-12
|
ultrastardx-beta = ultrastardx; # added 2017-08-12
|
||||||
usb_modeswitch = usb-modeswitch; # added 2016-05-10
|
usb_modeswitch = usb-modeswitch; # added 2016-05-10
|
||||||
|
|
|
@ -17145,7 +17145,7 @@ in
|
||||||
ubootBananaPi
|
ubootBananaPi
|
||||||
ubootBananaPim3
|
ubootBananaPim3
|
||||||
ubootBananaPim64
|
ubootBananaPim64
|
||||||
ubootBeagleboneBlack
|
ubootAmx335xEVM
|
||||||
ubootClearfog
|
ubootClearfog
|
||||||
ubootGuruplug
|
ubootGuruplug
|
||||||
ubootJetsonTK1
|
ubootJetsonTK1
|
||||||
|
|
Loading…
Reference in a new issue