diff --git a/pkgs/misc/uboot/0001-configs-rpi-allow-for-bigger-kernels.patch b/pkgs/misc/uboot/0001-configs-rpi-allow-for-bigger-kernels.patch deleted file mode 100644 index 65497a6d4f06..000000000000 --- a/pkgs/misc/uboot/0001-configs-rpi-allow-for-bigger-kernels.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/board/raspberrypi/rpi/rpi.env b/board/raspberrypi/rpi/rpi.env -index 30228285ed..0327ef74fa 100644 ---- a/board/raspberrypi/rpi/rpi.env -+++ b/board/raspberrypi/rpi/rpi.env -@@ -69,9 +69,9 @@ fdt_high=ffffffff - initrd_high=ffffffff - #endif - kernel_addr_r=0x00080000 --scriptaddr=0x02400000 --pxefile_addr_r=0x02500000 --fdt_addr_r=0x02600000 --ramdisk_addr_r=0x02700000 -+scriptaddr=0x05500000 -+pxefile_addr_r=0x05600000 -+fdt_addr_r=0x05700000 -+ramdisk_addr_r=0x05800000 - - boot_targets=mmc usb pxe dhcp - diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 693e7424a4c2..e5d9b16eb354 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -32,10 +32,10 @@ }@pkgs: let - defaultVersion = "2025.01"; + defaultVersion = "2025.07"; defaultSrc = fetchurl { url = "https://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2"; - hash = "sha256-ze99UHyT8bvZ8BXqm8IfoHQmhIFAVQGUWrxvhU1baG8="; + hash = "sha256-D5M/bFpCaJW/MG6T5qxTxghw5LVM2lbZUhG+yZ5jvsc="; }; # Dependencies for the tools need to be included as either native or cross, @@ -71,9 +71,7 @@ let src = if src == null then defaultSrc else src; - patches = [ - ./0001-configs-rpi-allow-for-bigger-kernels.patch - ] ++ extraPatches; + patches = extraPatches; postPatch = '' ${lib.concatMapStrings (script: ''