diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-04-27 06:01:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-27 06:01:04 +0000 |
| commit | 2ac5c4af82c8b8aad8592e7a3881f0bafdf19cd9 (patch) | |
| tree | 9548df06f5d7bfc232e2969635ba24fa288c4df3 /pkgs/misc | |
| parent | 786dfea2c7352fd1849473c1035f3ed7d586e1a5 (diff) | |
| parent | 85919894405c54467e978a7e580f85f48f939ef7 (diff) | |
| download | nixpkgs-2ac5c4af82c8b8aad8592e7a3881f0bafdf19cd9.tar nixpkgs-2ac5c4af82c8b8aad8592e7a3881f0bafdf19cd9.tar.gz nixpkgs-2ac5c4af82c8b8aad8592e7a3881f0bafdf19cd9.tar.bz2 nixpkgs-2ac5c4af82c8b8aad8592e7a3881f0bafdf19cd9.tar.lz nixpkgs-2ac5c4af82c8b8aad8592e7a3881f0bafdf19cd9.tar.xz nixpkgs-2ac5c4af82c8b8aad8592e7a3881f0bafdf19cd9.tar.zst nixpkgs-2ac5c4af82c8b8aad8592e7a3881f0bafdf19cd9.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/uboot/default.nix | 35 |
1 files changed, 6 insertions, 29 deletions
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 986494e599d..d6e5e8a7bcb 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -10,6 +10,7 @@ , openssl , swig , meson-tools +, which , armTrustedFirmwareAllwinner , armTrustedFirmwareAllwinnerH616 , armTrustedFirmwareRK3328 @@ -19,10 +20,10 @@ }: let - defaultVersion = "2021.10"; + defaultVersion = "2022.01"; defaultSrc = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2"; - sha256 = "1m0bvwv8r62s4wk4w3cmvs888dhv9gnfa98dczr4drk2jbhj7ryd"; + hash = "sha256-gbRUMifbIowD+KG/XdvIE7C7j2VVzkYGTvchpvxoBBM="; }; buildUBoot = { version ? null @@ -66,11 +67,14 @@ let p.setuptools # for pkg_resources ])) swig + which # for scripts/dtc-version.sh ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; hardeningDisable = [ "all" ]; + enableParallelBuilding = true; + makeFlags = [ "DTC=dtc" "CROSS_COMPILE=${stdenv.cc.targetPrefix}" @@ -102,9 +106,6 @@ let runHook postInstall ''; - # make[2]: *** No rule to make target 'lib/efi_loader/helloworld.efi', needed by '__build'. Stop. - enableParallelBuilding = false; - dontStrip = true; meta = with lib; { @@ -373,14 +374,6 @@ in { CONFIG_USB_EHCI_GENERIC=y CONFIG_USB_XHCI_HCD=y ''; - extraPatches = [ - # https://patchwork.ozlabs.org/project/uboot/list/?series=268007&state=%2A&archive=both - # Remove when upgrading to 2022.01 - (fetchpatch { - url = "https://patchwork.ozlabs.org/series/268007/mbox/"; - sha256 = "sha256-xn4Q959dgoB63zlmJepI41AXAf1kCycIGcmu4IIVjmE="; - }) - ]; extraMeta.platforms = [ "i686-linux" "x86_64-linux" ]; filesToInstall = [ "u-boot.rom" ]; }; @@ -401,28 +394,12 @@ in { defconfig = "rpi_3_32b_defconfig"; extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["u-boot.bin"]; - extraPatches = [ - # Remove when updating to 2022.01 - # https://patchwork.ozlabs.org/project/uboot/list/?series=273129&archive=both&state=* - (fetchpatch { - url = "https://patchwork.ozlabs.org/series/273129/mbox/"; - sha256 = "sha256-/Gu7RNvBNYCGqdFRzQ11qPDDxgGVpwKYYw1CpumIGfU="; - }) - ]; }; ubootRaspberryPi3_64bit = buildUBoot { defconfig = "rpi_3_defconfig"; extraMeta.platforms = ["aarch64-linux"]; filesToInstall = ["u-boot.bin"]; - extraPatches = [ - # Remove when updating to 2022.01 - # https://patchwork.ozlabs.org/project/uboot/list/?series=273129&archive=both&state=* - (fetchpatch { - url = "https://patchwork.ozlabs.org/series/273129/mbox/"; - sha256 = "sha256-/Gu7RNvBNYCGqdFRzQ11qPDDxgGVpwKYYw1CpumIGfU="; - }) - ]; }; ubootRaspberryPi4_32bit = buildUBoot { |