diff options
| author | Bernardo Meurer <bernardo@meurer.org> | 2022-04-25 19:19:21 -0700 |
|---|---|---|
| committer | Bernardo Meurer <bernardo@meurer.org> | 2022-04-26 15:22:27 -0700 |
| commit | f6f41cf740527b804abb8ae30f69a2fb534c35f3 (patch) | |
| tree | 736fe1522c2f19acd2fba3c11e6ef1121d09c09d /pkgs/misc/uboot | |
| parent | faf42ffbd07f0c877258c8b519c7e973949f89c7 (diff) | |
uboot: 2021.10 -> 2022.01
Diffstat (limited to 'pkgs/misc/uboot')
| -rw-r--r-- | pkgs/misc/uboot/default.nix | 30 |
1 files changed, 4 insertions, 26 deletions
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 067d9bbbb5b1..7e2cfbf9ad67 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,6 +67,7 @@ let p.setuptools # for pkg_resources ])) swig + which # for scripts/dtc-version.sh ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -373,14 +375,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 +395,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 { |