GNU bug report logs

#72987 [PATCH] gnu: u-boot: Enlarge space available for kernel.

PackageSource(s)Maintainer(s)
guix-patches PTS Buildd Popcon
Reply or subscribe to this bug. View this bug as an mbox, status mbox, or maintainer mbox

Report forwarded to guix-patches@gnu.org:
bug#72987; Package guix-patches. (Mon, 02 Sep 2024 19:09:02 GMT) (full text, mbox, link).


Acknowledgement sent to Herman Rimm <herman@rimm.ee>:
New bug report received and forwarded. Copy sent to guix-patches@gnu.org. (Mon, 02 Sep 2024 19:09:02 GMT) (full text, mbox, link).


Message #5 received at submit@debbugs.gnu.org (full text, mbox, reply):

From: Herman Rimm <herman@rimm.ee>
To: guix-patches@gnu.org
Subject: [PATCH] gnu: u-boot: Enlarge space available for kernel.
Date: Mon, 2 Sep 2024 21:04:59 +0200
* gnu/packages/bootloaders.scm (u-boot): Use patch.
* gnu/packages/patches/u-boot-50M-kernel.patch: Add file.
* gnu/local.mk (dist_patch_DATA): Register patch.
---
Based on [bug#70131].

 gnu/local.mk                                 |  1 +
 gnu/packages/bootloaders.scm                 |  7 ++-
 gnu/packages/patches/u-boot-50M-kernel.patch | 47 ++++++++++++++++++++
 3 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/u-boot-50M-kernel.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 2ce910ad28..d674acd7ca 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2165,6 +2165,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/turbovnc-find-system-packages.patch	\
   %D%/packages/patches/tuxpaint-stamps-path.patch		\
   %D%/packages/patches/twinkle-bcg729.patch			\
+  %D%/packages/patches/u-boot-50M-kernel.patch			\
   %D%/packages/patches/u-boot-allow-disabling-openssl.patch	\
   %D%/packages/patches/u-boot-nintendo-nes-serial.patch		\
   %D%/packages/patches/u-boot-rockchip-inno-usb.patch		\
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 162eef6859..9980521a5f 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -841,6 +841,10 @@ (define %u-boot-nanopi-r4s-ddr3-patch
   ;; Use DDR3 instead of LPDDR4 for the Nano Pi R4S U-boot.
   (search-patch "u-boot-nanopi-r4s-ddr3.patch"))
 
+(define %u-boot-50M-kernel-patch
+  ;; Make space for 6.9+ linux-libre kernel.
+  (search-patch "u-boot-50M-kernel.patch"))
+
 (define u-boot
   (package
     (name "u-boot")
@@ -849,7 +853,8 @@ (define u-boot
               (patches
                (list %u-boot-rockchip-inno-usb-patch
                      %u-boot-allow-disabling-openssl-patch
-                     %u-boot-nanopi-r4s-ddr3-patch))
+                     %u-boot-nanopi-r4s-ddr3-patch
+                     %u-boot-50M-kernel-patch))
               (method url-fetch)
               (uri (string-append
                     "https://ftp.denx.de/pub/u-boot/"
diff --git a/gnu/packages/patches/u-boot-50M-kernel.patch b/gnu/packages/patches/u-boot-50M-kernel.patch
new file mode 100644
index 0000000000..d31501400e
--- /dev/null
+++ b/gnu/packages/patches/u-boot-50M-kernel.patch
@@ -0,0 +1,47 @@
+diff --git a/board/raspberrypi/rpi/rpi.env b/board/raspberrypi/rpi/rpi.env
+index 30228285ed..54a8e9e5ae 100644
+--- a/board/raspberrypi/rpi/rpi.env
++++ b/board/raspberrypi/rpi/rpi.env
+@@ -43,22 +43,22 @@ dfu_alt_info+=zImage fat 0 1
+  *   text_offset bytes (specified in the header of the Image) into a 2MB
+  *   boundary. The 'booti' command relocates the image if necessary. Linux uses
+  *   a default text_offset of 0x80000.  In summary, loading at 0x80000
+- *   satisfies all these constraints and reserving memory up to 0x02400000
+- *   permits fairly large (roughly 36M) kernels.
++ *   satisfies all these constraints and reserving memory up to 0x03400000
++ *   permits fairly large (roughly 50M) kernels.
+  *
+  * scriptaddr and pxefile_addr_r can be pretty much anywhere that doesn't
+  * conflict with something else. Reserving 1M for each of them at
+- * 0x02400000-0x02500000 and 0x02500000-0x02600000 should be plenty.
++ * 0x03200000-0x03300000 and 0x03300000-0x03400000 should be plenty.
+  *
+  * On ARM, both the DTB and any possible initrd must be loaded such that they
+  * fit inside the lowmem mapping in Linux. In practice, this usually means not
+  * more than ~700M away from the start of the kernel image but this number can
+  * be larger OR smaller depending on e.g. the 'vmalloc=xxxM' command line
+  * parameter given to the kernel. So reserving memory from low to high
+- * satisfies this constraint again. Reserving 1M at 0x02600000-0x02700000 for
+- * the DTB leaves rest of the free RAM to the initrd starting at 0x02700000.
++ * satisfies this constraint again. Reserving 1M at 0x03400000-0x03500000 for
++ * the DTB leaves rest of the free RAM to the initrd starting at 0x03500000.
+  * Even with the smallest possible CPU-GPU memory split of the CPU getting
+- * only 64M, the remaining 25M starting at 0x02700000 should allow quite
++ * only 64M, the remaining 11M starting at 0x03500000 should allow quite
+  * large initrds before they start colliding with U-Boot.
+  */
+ #ifdef CONFIG_ARM64
+@@ -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=0x03200000
++pxefile_addr_r=0x03300000
++fdt_addr_r=0x03400000
++ramdisk_addr_r=0x03500000
+ 
+ boot_targets=mmc usb pxe dhcp
-- 
2.45.2





Information forwarded to guix-patches@gnu.org:
bug#72987; Package guix-patches. (Sun, 15 Sep 2024 22:13:02 GMT) (full text, mbox, link).


Message #8 received at 72987@debbugs.gnu.org (full text, mbox, reply):

From: Ludovic Courtès <ludo@gnu.org>
To: Herman Rimm <herman@rimm.ee>
Cc: Vagrant Cascadian <vagrant@debian.org>, 72987@debbugs.gnu.org, Efraim Flashner <efraim@flashner.co.il>
Subject: Re: [bug#72987] [PATCH] gnu: u-boot: Enlarge space available for kernel.
Date: Mon, 16 Sep 2024 00:12:07 +0200
Hi,

Cc’ing members of the ‘embedded’ team (normally the ‘git send-email’
hook that gets installed should do that when you compose the message,
no?).

Herman Rimm <herman@rimm.ee> skribis:

> * gnu/packages/bootloaders.scm (u-boot): Use patch.
> * gnu/packages/patches/u-boot-50M-kernel.patch: Add file.
> * gnu/local.mk (dist_patch_DATA): Register patch.
> ---
> Based on [bug#70131].

Vagrant, Efraim: could you review and possibly apply #70131?

Some superficial comments:

> +++ b/gnu/packages/bootloaders.scm
> @@ -841,6 +841,10 @@ (define %u-boot-nanopi-r4s-ddr3-patch
>    ;; Use DDR3 instead of LPDDR4 for the Nano Pi R4S U-boot.
>    (search-patch "u-boot-nanopi-r4s-ddr3.patch"))
>  
> +(define %u-boot-50M-kernel-patch
> +  ;; Make space for 6.9+ linux-libre kernel.
> +  (search-patch "u-boot-50M-kernel.patch"))

‘search-patch’ must not be called from the top level: it incurs extra
‘stat’ calls and it could throw an exception.  Thus, arrange to have it
called from the ‘patches’ field (which is thunked) or something similar.

> +++ b/gnu/packages/patches/u-boot-50M-kernel.patch
> @@ -0,0 +1,47 @@
> +diff --git a/board/raspberrypi/rpi/rpi.env b/board/raspberrypi/rpi/rpi.env
> +index 30228285ed..54a8e9e5ae 100644
> +--- a/board/raspberrypi/rpi/rpi.env

Please add a line or two at the top explaining what the patch does and
where it comes from.

I’ll let Vagrant and Efraim comment on the actual change.

Thanks,
Ludo’.




Information forwarded to efraim@flashner.co.il, vagrant@debian.org, guix-patches@gnu.org:
bug#72987; Package guix-patches. (Mon, 16 Sep 2024 17:26:02 GMT) (full text, mbox, link).


Message #11 received at 72987@debbugs.gnu.org (full text, mbox, reply):

From: Herman Rimm <herman@rimm.ee>
To: 72987@debbugs.gnu.org
Subject: [PATCH v2] gnu: u-boot: Enlarge space available for kernel.
Date: Mon, 16 Sep 2024 19:24:02 +0200
* gnu/packages/bootloaders.scm (%u-boot-rockchip-inno-usb-patch,
%u-boot-allow-disabling-openssl-patch, %u-boot-nanopi-r4s-ddr3-patch):
Remove variables.
(u-boot)[source]: Use search-patches and add new patch.
* gnu/packages/patches/u-boot-50M-kernel.patch: Add file.
* gnu/local.mk (dist_patch_DATA): Register patch.

Change-Id: Ib0074d888a3553543b491e9198f9b9a1162722f3
---
 gnu/local.mk                                 |  1 +
 gnu/packages/bootloaders.scm                 | 49 +++++++++----------
 gnu/packages/patches/u-boot-50M-kernel.patch | 51 ++++++++++++++++++++
 3 files changed, 74 insertions(+), 27 deletions(-)
 create mode 100644 gnu/packages/patches/u-boot-50M-kernel.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index ce58d5bfb4..b763991d63 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2216,6 +2216,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/turbovnc-find-system-packages.patch	\
   %D%/packages/patches/tuxpaint-stamps-path.patch		\
   %D%/packages/patches/twinkle-bcg729.patch			\
+  %D%/packages/patches/u-boot-50M-kernel.patch			\
   %D%/packages/patches/u-boot-allow-disabling-openssl.patch	\
   %D%/packages/patches/u-boot-nintendo-nes-serial.patch		\
   %D%/packages/patches/u-boot-rockchip-inno-usb.patch		\
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 50e7bb8bbc..b38b407d38 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -826,37 +826,32 @@ (define-public dtc
 tree binary files.  These are board description files used by Linux and BSD.")
     (license license:gpl2+)))
 
-(define %u-boot-rockchip-inno-usb-patch
-  ;; Fix regression in 2020.10 causing freezes on boot with USB boot enabled.
-  ;; See https://gitlab.manjaro.org/manjaro-arm/packages/core/uboot-rockpro64/-/issues/4
-  ;; and https://patchwork.ozlabs.org/project/uboot/patch/20210406151059.1187379-1-icenowy@aosc.io
-  (search-patch "u-boot-rockchip-inno-usb.patch"))
-
-(define %u-boot-allow-disabling-openssl-patch
-  ;; Fixes build of u-boot 2021.10 without openssl
-  ;; https://lists.denx.de/pipermail/u-boot/2021-October/462728.html
-  (search-patch "u-boot-allow-disabling-openssl.patch"))
-
-(define %u-boot-nanopi-r4s-ddr3-patch
-  ;; Use DDR3 instead of LPDDR4 for the Nano Pi R4S U-boot.
-  (search-patch "u-boot-nanopi-r4s-ddr3.patch"))
-
 (define u-boot
   (package
     (name "u-boot")
     (version "2024.07")
-    (source (origin
-              (patches
-               (list %u-boot-rockchip-inno-usb-patch
-                     %u-boot-allow-disabling-openssl-patch
-                     %u-boot-nanopi-r4s-ddr3-patch))
-              (method url-fetch)
-              (uri (string-append
-                    "https://ftp.denx.de/pub/u-boot/"
-                    "u-boot-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "13rwv28g6z8ihrs8k0066gblw37rvw6nsxkks6rxdwqfp6ddm4gm"))))
+    (source
+      (origin
+        (patches
+          (search-patches
+            ;; Fix regression in 2020.10 causing freezes on boot with
+            ;; USB boot enabled.  See:
+            ;; https://gitlab.manjaro.org/manjaro-arm/packages/core/uboot-rockpro64/-/issues/4
+            ;; https://patchwork.ozlabs.org/project/uboot/patch/20210406151059.1187379-1-icenowy@aosc.io
+            "u-boot-rockchip-inno-usb.patch"
+            ;; Fixes build of u-boot 2021.10 without openssl.  See:
+            ;; https://lists.denx.de/pipermail/u-boot/2021-October/462728.html
+            "u-boot-allow-disabling-openssl.patch"
+            ;; Use DDR3 instead of LPDDR4 for the Nano Pi R4S.
+            "u-boot-nanopi-r4s-ddr3.patch"
+            ;; Reserve more than 36 MB for linux-libre 6.9+ kernels.
+            "u-boot-50M-kernel.patch"))
+        (method url-fetch)
+        (uri (string-append "https://ftp.denx.de/pub/u-boot/"
+                            "u-boot-" version ".tar.bz2"))
+        (sha256
+          (base32
+            "13rwv28g6z8ihrs8k0066gblw37rvw6nsxkks6rxdwqfp6ddm4gm"))))
     (build-system gnu-build-system)
     (native-inputs
      (list bison
diff --git a/gnu/packages/patches/u-boot-50M-kernel.patch b/gnu/packages/patches/u-boot-50M-kernel.patch
new file mode 100644
index 0000000000..4566894087
--- /dev/null
+++ b/gnu/packages/patches/u-boot-50M-kernel.patch
@@ -0,0 +1,51 @@
+This patch configures the U-Boot for Raspberry Pis to reserve 50 MB for
+linux kernels, because the 6.9 and newer linux-libre-arm64-generic
+kernels can be larger than 36 MB.  It was created by Herman Rimm
+<herman@rimm.ee> in August 2024 and is not submitted upstream yet.
+diff --git a/board/raspberrypi/rpi/rpi.env b/board/raspberrypi/rpi/rpi.env
+index 30228285ed..54a8e9e5ae 100644
+--- a/board/raspberrypi/rpi/rpi.env
++++ b/board/raspberrypi/rpi/rpi.env
+@@ -43,22 +43,22 @@ dfu_alt_info+=zImage fat 0 1
+  *   text_offset bytes (specified in the header of the Image) into a 2MB
+  *   boundary. The 'booti' command relocates the image if necessary. Linux uses
+  *   a default text_offset of 0x80000.  In summary, loading at 0x80000
+- *   satisfies all these constraints and reserving memory up to 0x02400000
+- *   permits fairly large (roughly 36M) kernels.
++ *   satisfies all these constraints and reserving memory up to 0x03400000
++ *   permits fairly large (roughly 50M) kernels.
+  *
+  * scriptaddr and pxefile_addr_r can be pretty much anywhere that doesn't
+  * conflict with something else. Reserving 1M for each of them at
+- * 0x02400000-0x02500000 and 0x02500000-0x02600000 should be plenty.
++ * 0x03200000-0x03300000 and 0x03300000-0x03400000 should be plenty.
+  *
+  * On ARM, both the DTB and any possible initrd must be loaded such that they
+  * fit inside the lowmem mapping in Linux. In practice, this usually means not
+  * more than ~700M away from the start of the kernel image but this number can
+  * be larger OR smaller depending on e.g. the 'vmalloc=xxxM' command line
+  * parameter given to the kernel. So reserving memory from low to high
+- * satisfies this constraint again. Reserving 1M at 0x02600000-0x02700000 for
+- * the DTB leaves rest of the free RAM to the initrd starting at 0x02700000.
++ * satisfies this constraint again. Reserving 1M at 0x03400000-0x03500000 for
++ * the DTB leaves rest of the free RAM to the initrd starting at 0x03500000.
+  * Even with the smallest possible CPU-GPU memory split of the CPU getting
+- * only 64M, the remaining 25M starting at 0x02700000 should allow quite
++ * only 64M, the remaining 11M starting at 0x03500000 should allow quite
+  * large initrds before they start colliding with U-Boot.
+  */
+ #ifdef CONFIG_ARM64
+@@ -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=0x03200000
++pxefile_addr_r=0x03300000
++fdt_addr_r=0x03400000
++ramdisk_addr_r=0x03500000
+ 
+ boot_targets=mmc usb pxe dhcp

base-commit: a493d65d04deafb763710bb1cb0425185750327d
-- 
2.45.2





Information forwarded to guix-patches@gnu.org:
bug#72987; Package guix-patches. (Mon, 16 Sep 2024 21:07:01 GMT) (full text, mbox, link).


Message #14 received at 72987@debbugs.gnu.org (full text, mbox, reply):

From: Vagrant Cascadian <vagrant@debian.org>
To: Herman Rimm <herman@rimm.ee>, 72987@debbugs.gnu.org
Cc: u-boot@lists.denx.de, Matthias Brugger <mbrugger@suse.com>, Efraim Flashner <efraim@flashner.co.il>, Peter Robinson <pbrobinson@gmail.com>
Subject: u-boot: rpi: Enlarge space available for kernel.
Date: Mon, 16 Sep 2024 14:05:22 -0700
[Message part 1 (text/plain, inline)]
On 2024-09-16, Herman Rimm wrote:
> --- /dev/null
> +++ b/gnu/packages/patches/u-boot-50M-kernel.patch
> @@ -0,0 +1,51 @@
> +This patch configures the U-Boot for Raspberry Pis to reserve 50 MB for
> +linux kernels, because the 6.9 and newer linux-libre-arm64-generic
> +kernels can be larger than 36 MB.  It was created by Herman Rimm
> +<herman@rimm.ee> in August 2024 and is not submitted upstream yet.
> +diff --git a/board/raspberrypi/rpi/rpi.env b/board/raspberrypi/rpi/rpi.env
> +index 30228285ed..54a8e9e5ae 100644
> +--- a/board/raspberrypi/rpi/rpi.env
> ++++ b/board/raspberrypi/rpi/rpi.env
> +@@ -43,22 +43,22 @@ dfu_alt_info+=zImage fat 0 1
> +  *   text_offset bytes (specified in the header of the Image) into a 2MB
> +  *   boundary. The 'booti' command relocates the image if necessary. Linux uses
> +  *   a default text_offset of 0x80000.  In summary, loading at 0x80000
> +- *   satisfies all these constraints and reserving memory up to 0x02400000
> +- *   permits fairly large (roughly 36M) kernels.
> ++ *   satisfies all these constraints and reserving memory up to 0x03400000
> ++ *   permits fairly large (roughly 50M) kernels.
> +  *
> +  * scriptaddr and pxefile_addr_r can be pretty much anywhere that doesn't
> +  * conflict with something else. Reserving 1M for each of them at
> +- * 0x02400000-0x02500000 and 0x02500000-0x02600000 should be plenty.
> ++ * 0x03200000-0x03300000 and 0x03300000-0x03400000 should be plenty.
> +  *
> +  * On ARM, both the DTB and any possible initrd must be loaded such that they
> +  * fit inside the lowmem mapping in Linux. In practice, this usually means not
> +  * more than ~700M away from the start of the kernel image but this number can
> +  * be larger OR smaller depending on e.g. the 'vmalloc=xxxM' command line
> +  * parameter given to the kernel. So reserving memory from low to high
> +- * satisfies this constraint again. Reserving 1M at 0x02600000-0x02700000 for
> +- * the DTB leaves rest of the free RAM to the initrd starting at 0x02700000.
> ++ * satisfies this constraint again. Reserving 1M at 0x03400000-0x03500000 for
> ++ * the DTB leaves rest of the free RAM to the initrd starting at 0x03500000.
> +  * Even with the smallest possible CPU-GPU memory split of the CPU getting
> +- * only 64M, the remaining 25M starting at 0x02700000 should allow quite
> ++ * only 64M, the remaining 11M starting at 0x03500000 should allow quite
> +  * large initrds before they start colliding with U-Boot.
> +  */
> + #ifdef CONFIG_ARM64
> +@@ -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=0x03200000
> ++pxefile_addr_r=0x03300000
> ++fdt_addr_r=0x03400000
> ++ramdisk_addr_r=0x03500000
> + 
> + boot_targets=mmc usb pxe dhcp

I would really like to hear comments from the upstream u-boot
maintainers on adjusting these values...

live well,
  vagrant
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches@gnu.org:
bug#72987; Package guix-patches. (Mon, 16 Sep 2024 21:12:02 GMT) (full text, mbox, link).


Message #17 received at 72987@debbugs.gnu.org (full text, mbox, reply):

From: Vagrant Cascadian <vagrant@debian.org>
To: Herman Rimm <herman@rimm.ee>, 72987@debbugs.gnu.org
Cc: Efraim Flashner <efraim@flashner.co.il>
Subject: Re: [bug#72987] [PATCH v2] gnu: u-boot: Enlarge space available for kernel.
Date: Mon, 16 Sep 2024 14:10:40 -0700
[Message part 1 (text/plain, inline)]
On 2024-09-16, Herman Rimm wrote:
>  (define u-boot
>    (package
>      (name "u-boot")
>      (version "2024.07")

u-boot is still only version 2024.01 in guix ... sorry I have lagged at
u-boot updates.


> base-commit: a493d65d04deafb763710bb1cb0425185750327d

This appears to be from some branch not present in guix....

live well,
  vagrant
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches@gnu.org:
bug#72987; Package guix-patches. (Thu, 19 Sep 2024 14:14:01 GMT) (full text, mbox, link).


Message #20 received at 72987@debbugs.gnu.org (full text, mbox, reply):

From: Simon Glass <sjg@chromium.org>
To: Vagrant Cascadian <vagrant@debian.org>
Cc: Matthias Brugger <mbrugger@suse.com>, 72987@debbugs.gnu.org, Efraim Flashner <efraim@flashner.co.il>, u-boot@lists.denx.de, Herman Rimm <herman@rimm.ee>, Peter Robinson <pbrobinson@gmail.com>
Subject: Re: u-boot: rpi: Enlarge space available for kernel.
Date: Thu, 19 Sep 2024 16:11:43 +0200
Hi,

On Mon, 16 Sept 2024 at 23:06, Vagrant Cascadian <vagrant@debian.org> wrote:
>
> On 2024-09-16, Herman Rimm wrote:
> > --- /dev/null
> > +++ b/gnu/packages/patches/u-boot-50M-kernel.patch
> > @@ -0,0 +1,51 @@
> > +This patch configures the U-Boot for Raspberry Pis to reserve 50 MB for
> > +linux kernels, because the 6.9 and newer linux-libre-arm64-generic
> > +kernels can be larger than 36 MB.  It was created by Herman Rimm
> > +<herman@rimm.ee> in August 2024 and is not submitted upstream yet.
> > +diff --git a/board/raspberrypi/rpi/rpi.env b/board/raspberrypi/rpi/rpi.env
> > +index 30228285ed..54a8e9e5ae 100644
> > +--- a/board/raspberrypi/rpi/rpi.env
> > ++++ b/board/raspberrypi/rpi/rpi.env
> > +@@ -43,22 +43,22 @@ dfu_alt_info+=zImage fat 0 1
> > +  *   text_offset bytes (specified in the header of the Image) into a 2MB
> > +  *   boundary. The 'booti' command relocates the image if necessary. Linux uses
> > +  *   a default text_offset of 0x80000.  In summary, loading at 0x80000
> > +- *   satisfies all these constraints and reserving memory up to 0x02400000
> > +- *   permits fairly large (roughly 36M) kernels.
> > ++ *   satisfies all these constraints and reserving memory up to 0x03400000
> > ++ *   permits fairly large (roughly 50M) kernels.
> > +  *
> > +  * scriptaddr and pxefile_addr_r can be pretty much anywhere that doesn't
> > +  * conflict with something else. Reserving 1M for each of them at
> > +- * 0x02400000-0x02500000 and 0x02500000-0x02600000 should be plenty.
> > ++ * 0x03200000-0x03300000 and 0x03300000-0x03400000 should be plenty.
> > +  *
> > +  * On ARM, both the DTB and any possible initrd must be loaded such that they
> > +  * fit inside the lowmem mapping in Linux. In practice, this usually means not
> > +  * more than ~700M away from the start of the kernel image but this number can
> > +  * be larger OR smaller depending on e.g. the 'vmalloc=xxxM' command line
> > +  * parameter given to the kernel. So reserving memory from low to high
> > +- * satisfies this constraint again. Reserving 1M at 0x02600000-0x02700000 for
> > +- * the DTB leaves rest of the free RAM to the initrd starting at 0x02700000.
> > ++ * satisfies this constraint again. Reserving 1M at 0x03400000-0x03500000 for
> > ++ * the DTB leaves rest of the free RAM to the initrd starting at 0x03500000.
> > +  * Even with the smallest possible CPU-GPU memory split of the CPU getting
> > +- * only 64M, the remaining 25M starting at 0x02700000 should allow quite
> > ++ * only 64M, the remaining 11M starting at 0x03500000 should allow quite
> > +  * large initrds before they start colliding with U-Boot.
> > +  */
> > + #ifdef CONFIG_ARM64
> > +@@ -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=0x03200000
> > ++pxefile_addr_r=0x03300000
> > ++fdt_addr_r=0x03400000
> > ++ramdisk_addr_r=0x03500000
> > +
> > + boot_targets=mmc usb pxe dhcp
>
> I would really like to hear comments from the upstream u-boot
> maintainers on adjusting these values...

It is fine to adjust them, so long as the memory is actually there. I
don't know of anything special about the current values.

Regards,
Simon




Information forwarded to guix-patches@gnu.org:
bug#72987; Package guix-patches. (Fri, 20 Sep 2024 21:54:02 GMT) (full text, mbox, link).


Message #23 received at 72987@debbugs.gnu.org (full text, mbox, reply):

From: Vagrant Cascadian <vagrant@debian.org>
To: Herman Rimm <herman@rimm.ee>, 70131@debbugs.gnu.org
Cc: 72987@debbugs.gnu.org
Subject: Re: [bug#70131] [bug#72987] [PATCH v2] gnu: u-boot: Enlarge space available for kernel.
Date: Fri, 20 Sep 2024 14:52:56 -0700
[Message part 1 (text/plain, inline)]
On 2024-09-19, Herman Rimm wrote:
> On Mon, Sep 16, 2024 at 02:10:40PM -0700, Vagrant Cascadian wrote:
>> u-boot is still only version 2024.01 in guix ... sorry I have lagged at
>> u-boot updates.
>> 
>> 
>> > base-commit: a493d65d04deafb763710bb1cb0425185750327d
>> 
>> This appears to be from some branch not present in guix....
>
> This patch can be applied on top of the v2 revision of issue 70131, I
> must not have CC'ed you that either.

Or the bug you were replying to, done so now, so people know what is
up. :)

live well,
  vagrant
[signature.asc (application/pgp-signature, inline)]

Send a report that this bug log contains spam.


debbugs.gnu.org maintainers <help-debbugs@gnu.org>. Last modified: Mon Nov 4 22:21:31 2024; Machine Name: wallace-server

GNU bug tracking system

Debbugs is free software and licensed under the terms of the GNU Public License version 2. The current version can be obtained from https://bugs.debian.org/debbugs-source/.

Copyright © 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson, 2005-2017 Don Armstrong, and many other contributors.