git.iko.soy/typeable/nixpkgs
on master help sign in
uboot: fix rpi kernel size patch for 2020.10

Fixes #109008

commit3d3f22e7bee920b8b3f0e67b3619e932b37fe986 authorMilan Pässler <milan@petabyte.dev> dateMon 11 Jan 2021, 15:08 (6 years ago) parent5ac7aa5
1 file changed+35−20
pkgs/misc/uboot/0001-configs-rpi-allow-for-bigger-kernels.patch+35−20
pkgs/misc/uboot/0001-configs-rpi-allow-for-bigger-kernels.patch+35−20
@@ -1,30 +1,45 @@
1−From 3c6b7c0922370e9d0c1705706e7c47dcd234e6c8 Mon Sep 17 00:00:00 2001
1+From 3d0ce353cf62efea11aa88f814aa23bf8c04acc9 Mon Sep 17 00:00:00 2001
22From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <milan@petabyte.dev>
3−Date: Wed, 30 Dec 2020 11:49:16 +0100
3+Date: Mon, 11 Jan 2021 15:13:10 +0100
44Subject: [PATCH] configs/rpi: allow for bigger kernels
55
66---
7− include/configs/rpi.h | 8 ++++----
8− 1 file changed, 4 insertions(+), 4 deletions(-)
7+ include/configs/rpi.h | 16 ++++++++--------
8+ 1 file changed, 8 insertions(+), 8 deletions(-)
99
1010diff --git a/include/configs/rpi.h b/include/configs/rpi.h
11−index 834f1cd2..b63ee96f 100644
11+index 834f1cd..10ab1e7 100644
1212--- a/include/configs/rpi.h
1313+++ b/include/configs/rpi.h
14−@@ -163,10 +163,10 @@
15− "fdt_high=" FDT_HIGH "\0" \
16− "initrd_high=" INITRD_HIGH "\0" \
17− "kernel_addr_r=0x00080000\0" \
18−- "scriptaddr=0x02400000\0" \
19−- "pxefile_addr_r=0x02500000\0" \
20−- "fdt_addr_r=0x02600000\0" \
21−- "ramdisk_addr_r=0x02700000\0"
22−+ "scriptaddr=0x02c00000\0" \
23−+ "pxefile_addr_r=0x02d00000\0" \
24−+ "fdt_addr_r=0x02e00000\0" \
25−+ "ramdisk_addr_r=0x02f00000\0"
26−
14+@@ -153,20 +153,20 @@
15+ * more than ~700M away from the start of the kernel image but this number can
16+ * be larger OR smaller depending on e.g. the 'vmalloc=xxxM' command line
17+ * parameter given to the kernel. So reserving memory from low to high
18+- * satisfies this constraint again. Reserving 1M at 0x02600000-0x02700000 for
19+- * the DTB leaves rest of the free RAM to the initrd starting at 0x02700000.
20++ * satisfies this constraint again. Reserving 1M at 0x02e00000-0x02f00000 for
21++ * the DTB leaves rest of the free RAM to the initrd starting at 0x02f00000.
22+ * Even with the smallest possible CPU-GPU memory split of the CPU getting
23+- * only 64M, the remaining 25M starting at 0x02700000 should allow quite
24+- * large initrds before they start colliding with U-Boot.
25++ * only 64M, the remaining 17M starting at 0x02f00000 should allow reasonably
26++ * sized initrds before they start colliding with U-Boot.
27+ */
28+ #define ENV_MEM_LAYOUT_SETTINGS \
29+ "fdt_high=" FDT_HIGH "\0" \
30+ "initrd_high=" INITRD_HIGH "\0" \
31+ "kernel_addr_r=0x00080000\0" \
32+- "scriptaddr=0x02400000\0" \
33+- "pxefile_addr_r=0x02500000\0" \
34+- "fdt_addr_r=0x02600000\0" \
35+- "ramdisk_addr_r=0x02700000\0"
36++ "scriptaddr=0x02c00000\0" \
37++ "pxefile_addr_r=0x02d00000\0" \
38++ "fdt_addr_r=0x02e00000\0" \
39++ "ramdisk_addr_r=0x02f00000\0"
40+
2741 #if CONFIG_IS_ENABLED(CMD_MMC)
28− #define BOOT_TARGET_MMC(func) \
29−--
42+ #define BOOT_TARGET_MMC(func) \
43+--
30442.29.2
45+