From a315a1503ab94caf281c3f584fd621109ba2cbb4 Mon Sep 17 00:00:00 2001
From: Milan <me@pbb.lc>
Date: Mon, 11 Jan 2021 02:41:26 +0100
Subject: [PATCH] uboot: allow bigger kernels to boot on raspberry pi (#108975)

Fixes #97064
---
 ...configs-rpi-allow-for-bigger-kernels.patch | 30 +++++++++++++++++++
 pkgs/misc/uboot/default.nix                   |  4 ++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/misc/uboot/0001-configs-rpi-allow-for-bigger-kernels.patch

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
new file mode 100644
index 000000000000..ca82e82123b8
--- /dev/null
+++ b/pkgs/misc/uboot/0001-configs-rpi-allow-for-bigger-kernels.patch
@@ -0,0 +1,30 @@
+From 3c6b7c0922370e9d0c1705706e7c47dcd234e6c8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <milan@petabyte.dev>
+Date: Wed, 30 Dec 2020 11:49:16 +0100
+Subject: [PATCH] configs/rpi: allow for bigger kernels
+
+---
+ include/configs/rpi.h | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/include/configs/rpi.h b/include/configs/rpi.h
+index 834f1cd2..b63ee96f 100644
+--- a/include/configs/rpi.h
++++ b/include/configs/rpi.h
+@@ -163,10 +163,10 @@
+    "fdt_high=" FDT_HIGH "\0" \
+    "initrd_high=" INITRD_HIGH "\0" \
+    "kernel_addr_r=0x00080000\0" \
+-   "scriptaddr=0x02400000\0" \
+-   "pxefile_addr_r=0x02500000\0" \
+-   "fdt_addr_r=0x02600000\0" \
+-   "ramdisk_addr_r=0x02700000\0"
++   "scriptaddr=0x02c00000\0" \
++   "pxefile_addr_r=0x02d00000\0" \
++   "fdt_addr_r=0x02e00000\0" \
++   "ramdisk_addr_r=0x02f00000\0"
+
+ #if CONFIG_IS_ENABLED(CMD_MMC)
+    #define BOOT_TARGET_MMC(func) \
+--
+2.29.2
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index c841c69446fc..b1e8e7f2b240 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -40,7 +40,9 @@ let
 
     src = if src == null then defaultSrc else src;
 
-    patches = extraPatches;
+    patches = [
+      ./0001-configs-rpi-allow-for-bigger-kernels.patch
+    ] ++ extraPatches;
 
     postPatch = ''
       patchShebangs tools