Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: deb6770eb3ea
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 90441b4b47fc
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Jan 21, 2020

  1. uboot: 2019.10 -> 2020.01 

    In addition, removes the python2 dependency. Anyway, it was required for
the updated revision to build.
    @samueldr
    samueldr committed Jan 21, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    aykevl Ayke
    GPG key ID: E97FF5335DFDFDED
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ca931ca View commit details

  2. uboot: ubootBeagleboneBlack -> ubootAmx335xEVM 

    See u-boot@8fa7f65dd02c176ee6021eaf40114560b8954ba2

>    configs: Remove am335x_boneblack_defconfig
>
>    The am335x_evm_defconfig supports all am335x_boneblack variants. Remove
>    the redundant am335x_boneblack_defconfig.
    @samueldr
    samueldr committed Jan 21, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    aykevl Ayke
    GPG key ID: E97FF5335DFDFDED
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7943c33 View commit details

Commits on Jan 22, 2020

  1. Merge pull request #78216 from samueldr/u-boot/update/2020.01 

    uboot: 2019.10 -> 2020.01
    @samueldr
    samueldr authored Jan 22, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    aykevl Ayke
    GPG key ID: E97FF5335DFDFDED
    Verified
    Learn about vigilant mode
    Copy the full SHA
    90441b4 View commit details
Showing with 12 additions and 23 deletions.
  1. +10 −22 pkgs/misc/uboot/default.nix
  2. +1 −0 pkgs/top-level/aliases.nix
  3. +1 −1 pkgs/top-level/all-packages.nix
32 changes: 10 additions & 22 deletions pkgs/misc/uboot/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,10 +6,10 @@
}:

let
defaultVersion = "2019.10";
defaultVersion = "2020.01";
defaultSrc = fetchurl {
url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2";
sha256 = "053hcrwwlacqh2niisn0zas95zkbffw5aw5sdhixs8lmfdq60vcd";
sha256 = "1w9ml4jl15q6ixpdqzspxjnl7d3rgxd7f99ms1xv5c8869h3qida";
};
buildUBoot = {
version ? null
@@ -28,19 +28,7 @@ let

src = if src == null then defaultSrc else src;

patches = [
# 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;
patches = extraPatches;

postPatch = ''
patchShebangs tools
@@ -53,7 +41,7 @@ let
dtc
flex
openssl
(buildPackages.python2.withPackages (p: [ p.libfdt ]))
(buildPackages.python3.withPackages (p: [ p.libfdt ]))
swig
];
depsBuildBuild = [ buildPackages.stdenv.cc ];
@@ -124,6 +112,12 @@ in {
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};

ubootAmx335xEVM = buildUBoot {
defconfig = "am335x_evm_defconfig";
extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["MLO" "u-boot.img"];
};

ubootBananaPi = buildUBoot {
defconfig = "Bananapi_defconfig";
extraMeta.platforms = ["armv7l-linux"];
@@ -143,12 +137,6 @@ in {
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
ubootClearfog = buildUBoot {
defconfig = "clearfog_defconfig";
1 change: 1 addition & 0 deletions pkgs/top-level/aliases.nix
View file
Original file line number Diff line number Diff line change
@@ -442,6 +442,7 @@ mapAliases ({
transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06
truecrypt = veracrypt; # added 2018-10-24
tshark = wireshark-cli; # added 2018-04-25
ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21
ucsFonts = ucs-fonts; # added 2016-07-15
ultrastardx-beta = ultrastardx; # added 2017-08-12
usb_modeswitch = usb-modeswitch; # added 2016-05-10
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -17145,7 +17145,7 @@ in
ubootBananaPi
ubootBananaPim3
ubootBananaPim64
ubootBeagleboneBlack
ubootAmx335xEVM
ubootClearfog
ubootGuruplug
ubootJetsonTK1