Unverified Commit 32ea236e authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #265411 from K900/fix-all-the-uboots 

uboot: a whole bunch of build fixes
parents 105676cb 6a62bacc

pkgs/misc/uboot/default.nix

+26 −11
Original line number Diff line number Diff line
@@ -30,6 +30,16 @@ let 
    url = "https://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2";

    hash = "sha256-a2pIWBwUq7D5W9h8GvTXQJIkBte4AQAqn5Ryf93gIdU=";

  };



  # Dependencies for the tools need to be included as either native or cross,

  # depending on which we're building

  toolsDeps = [

    ncurses # tools/kwboot

    libuuid # tools/mkeficapsule

    gnutls # tools/mkeficapsule

    openssl # tools/mkimage

  ];



  buildUBoot = lib.makeOverridable ({

    version ? null

  , src ? null
@@ -40,6 +50,7 @@ let 
  , extraPatches ? []

  , extraMakeFlags ? []

  , extraMeta ? {}

  , crossTools ? false

  , ... } @ args: stdenv.mkDerivation ({

    pname = "uboot-${defconfig}";
@@ -53,7 +64,7 @@ let 


    postPatch = ''

      patchShebangs tools

      patchShebangs arch/arm/mach-rockchip

      patchShebangs scripts

    '';



    nativeBuildInputs = [
@@ -70,15 +81,9 @@ let 
      ]))

      swig

      which # for scripts/dtc-version.sh

    ];

    ] ++ lib.optionals (!crossTools) toolsDeps;

    depsBuildBuild = [ buildPackages.stdenv.cc ];



    buildInputs = [

      ncurses # tools/kwboot

      libuuid # tools/mkeficapsule

      gnutls # tools/mkeficapsule

      openssl # tools

    ];

    buildInputs = lib.optionals crossTools toolsDeps;



    hardeningDisable = [ "all" ];
@@ -133,7 +138,9 @@ in { 
    hardeningDisable = [];

    dontStrip = false;

    extraMeta.platforms = lib.platforms.linux;

    extraMakeFlags = [ "HOST_TOOLS_ALL=y" "CROSS_BUILD_TOOLS=1" "NO_SDL=1" "tools" ];



    crossTools = true;

    extraMakeFlags = [ "HOST_TOOLS_ALL=y" "NO_SDL=1" "cross_tools" ];



    outputs = [ "out" "man" ];
@@ -183,6 +190,7 @@ in { 
    defconfig = "bananapi_m64_defconfig";

    extraMeta.platforms = ["aarch64-linux"];

    BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";

    SCP = "/dev/null";

    filesToInstall = ["u-boot-sunxi-with-spl.bin"];

  };
@@ -190,7 +198,7 @@ in { 
  ubootClearfog = buildUBoot {

    defconfig = "clearfog_defconfig";

    extraMeta.platforms = ["armv7l-linux"];

    filesToInstall = ["u-boot-spl.kwb"];

    filesToInstall = ["u-boot-with-spl.kwb"];

  };



  ubootCubieboard2 = buildUBoot {
@@ -341,6 +349,7 @@ in { 
    defconfig = "a64-olinuxino-emmc_defconfig";

    extraMeta.platforms = ["aarch64-linux"];

    BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";

    SCP = "/dev/null";

    filesToInstall = ["u-boot-sunxi-with-spl.bin"];

  };
@@ -354,6 +363,7 @@ in { 
    defconfig = "orangepi_zero_plus2_defconfig";

    extraMeta.platforms = ["aarch64-linux"];

    BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";

    SCP = "/dev/null";

    filesToInstall = ["u-boot-sunxi-with-spl.bin"];

  };
@@ -374,6 +384,7 @@ in { 
    defconfig = "orangepi_3_defconfig";

    extraMeta.platforms = ["aarch64-linux"];

    BL31 = "${armTrustedFirmwareAllwinnerH6}/bl31.bin";

    SCP = "/dev/null";

    filesToInstall = ["u-boot-sunxi-with-spl.bin"];

  };
@@ -387,6 +398,7 @@ in { 
    defconfig = "pine64_plus_defconfig";

    extraMeta.platforms = ["aarch64-linux"];

    BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";

    SCP = "/dev/null";

    filesToInstall = ["u-boot-sunxi-with-spl.bin"];

  };
@@ -394,6 +406,7 @@ in { 
    defconfig = "pine64-lts_defconfig";

    extraMeta.platforms = ["aarch64-linux"];

    BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";

    SCP = "/dev/null";

    filesToInstall = ["u-boot-sunxi-with-spl.bin"];

  };
@@ -401,6 +414,7 @@ in { 
    defconfig = "pinebook_defconfig";

    extraMeta.platforms = ["aarch64-linux"];

    BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";

    SCP = "/dev/null";

    filesToInstall = ["u-boot-sunxi-with-spl.bin"];

  };
@@ -542,6 +556,7 @@ in { 
    defconfig = "sopine_baseboard_defconfig";

    extraMeta.platforms = ["aarch64-linux"];

    BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";

    SCP = "/dev/null";

    filesToInstall = ["u-boot-sunxi-with-spl.bin"];

  };