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: dce4e72999a6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d4b8789bcb67
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 24, 2019

  1. ubootTools: use tools-only_defconfig instead of allnoconfig 

    Includes more features in the tools, like support for Flat Device Tree
files in mkimage.
    @thefloweringash
    thefloweringash committed Nov 24, 2019
    Copy the full SHA
    2db8c23 View commit details

  2. Merge pull request #74054 from thefloweringash/uboot-tools-config 

    ubootTools: use tools-only_defconfig instead of allnoconfig
    @samueldr
    samueldr authored Nov 24, 2019
    Copy the full SHA
    d4b8789 View commit details
Showing with 1 addition and 4 deletions.
  1. +1 −4 pkgs/misc/uboot/default.nix
5 changes: 1 addition & 4 deletions pkgs/misc/uboot/default.nix
View file
Original file line number Diff line number Diff line change
@@ -90,15 +90,12 @@ in {
inherit buildUBoot;

ubootTools = buildUBoot {
defconfig = "allnoconfig";
defconfig = "tools-only_defconfig";
installDir = "$out/bin";
hardeningDisable = [];
dontStrip = false;
extraMeta.platforms = lib.platforms.linux;
extraMakeFlags = [ "HOST_TOOLS_ALL=y" "CROSS_BUILD_TOOLS=1" "NO_SDL=1" "tools" ];
postConfigure = ''
sed -i '/CONFIG_SYS_TEXT_BASE/c\CONFIG_SYS_TEXT_BASE=0x00000000' .config
'';
filesToInstall = [
"tools/dumpimage"
"tools/fdtgrep"