From patchwork Mon Mar 31 18:19:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 41089 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DBE8627BBE2; Mon, 31 Mar 2025 19:21:54 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 57B6B27BBE9 for ; Mon, 31 Mar 2025 19:21:54 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tzJl8-0002mv-CH; Mon, 31 Mar 2025 14:21:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tzJkv-0002lF-RF for guix-patches@gnu.org; Mon, 31 Mar 2025 14:21:08 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tzJkt-0006os-Vb for guix-patches@gnu.org; Mon, 31 Mar 2025 14:21:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=nrBRneos38qKL/jLuQjGiqLK5fSePngHOiuO4nNh4V4=; b=K9C5U/9Ov5/k/Z37ogIiZmzcd9JPT4W73/EBVwMFoq68skro7+EhwoL/99Jf3G63jQmPDTB2+FEssPp+K0NgRPyYoz8KlTGYDPyCQ7w1Buen1Y1COsVyP+dE724w+4C7TEgIS2S8H6Bi9e7l0ZKZ6tztihPNIKshp6mcsjwrFfaitHKD4U42FKSFVTjfGtUV44yDrhyHhHBrfWLSDGHO86YWykONmUVnAZdqUTRQO0t5PP/Jri6jAlsD9jjfJINzvx+OfG1+FLvyu7NVN6YZLAW59D34T1gevSPydPD2jXKLIDJfdeOlPxJMT5SFe9RKq0wiZGZVOviK33+QkBsrsg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tzJkt-0003JP-QK for guix-patches@gnu.org; Mon, 31 Mar 2025 14:21:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72987] [PATCH v4 3/3] gnu: u-boot: Enlarge space available for kernel. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 31 Mar 2025 18:21:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72987 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72987@debbugs.gnu.org Received: via spool by 72987-submit@debbugs.gnu.org id=B72987.174344524812574 (code B ref 72987); Mon, 31 Mar 2025 18:21:03 +0000 Received: (at 72987) by debbugs.gnu.org; 31 Mar 2025 18:20:48 +0000 Received: from localhost ([127.0.0.1]:42802 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tzJkd-0003Gf-I8 for submit@debbugs.gnu.org; Mon, 31 Mar 2025 14:20:48 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:42135 helo=email.rimm.ee) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tzJkP-0003DN-UY for 72987@debbugs.gnu.org; Mon, 31 Mar 2025 14:20:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1743445219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nrBRneos38qKL/jLuQjGiqLK5fSePngHOiuO4nNh4V4=; b=Se9Fh/Wp0Wmp6JJ/bZYL5jEuYidtnWMbDLjfMpHsz+dY/bDcbUd4AHrEcbM+Y7WJzde/Nw g6jPL3d2ujsT7wVooivvOPCziXFZ0yrf3v9iDXlD5gTaeW8ocQFWEi8AhQP490jgCymkjU A/c1CH42zyuXwMFk9AnNKhq7UFhjr49nBxuzivX9S9+nQmVWIggpNMCjfjCl1maDsiqmk9 f1IUVbHu34qz80OYHZ/F89V+oeYxVCJw39Qbafazxt/QFLU3x3rIzRwCfXGHQfO+fr02YT 97q4lLVr0m/xcPYbo/zovX4VLeG1wHKsFh+dzRgb6dw5z2oLMKooTtRD4KZD9A== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 4318c8bd (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <72987@debbugs.gnu.org>; Mon, 31 Mar 2025 18:20:19 +0000 (UTC) Date: Mon, 31 Mar 2025 20:19:27 +0200 Message-ID: <486beae8e4ae3b081d1c970257fe4c47a27e40b5.1743444294.git.herman@rimm.ee> X-Mailer: git-send-email 2.47.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bootloaders.scm (u-boot)[source]: Add 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 | 1 + gnu/packages/patches/u-boot-50M-kernel.patch | 55 ++++++++++++++++++++ 3 files changed, 57 insertions(+) create mode 100644 gnu/packages/patches/u-boot-50M-kernel.patch diff --git a/gnu/local.mk b/gnu/local.mk index 955b8fb1ddf..3bb421b49e7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2339,6 +2339,7 @@ dist_patch_DATA = \ %D%/packages/patches/tuxpaint-stamps-path.patch \ %D%/packages/patches/tvm_fix_cpptest_build.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 5a030360226..8a2ca8cfda3 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -769,6 +769,7 @@ (define u-boot (sha256 (base32 "1i1v86bnixh8hyqbwwr5iwdnnadmg2fqxw9g526fvclsbvl8lz0v")) (patches (search-patches "u-boot-allow-disabling-openssl.patch" + "u-boot-50M-kernel.patch" "u-boot-rockchip-inno-usb.patch")))) (build-system gnu-build-system) (native-inputs 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 00000000000..c4d054dd42d --- /dev/null +++ b/gnu/packages/patches/u-boot-50M-kernel.patch @@ -0,0 +1,55 @@ +From: Herman Rimm +Date: Mon, Sep 16 2024 19:24:02 +0200 +Subject: [PATCH] Configure Raspberry Pis to reserve 50 MB for linux kernels. + +--- +The 6.9 and newer linux-libre-arm64-generic kernels for Guix can be +larger than the allocated 36 MB. This patch is not submitted upstream. + +diff --git a/board/raspberrypi/rpi/rpi.env b/board/raspberrypi/rpi/rpi.env +index 30228285edd..666883e9212 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