From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id AN1CHLeiXGd4VAEA62LTzQ:P1 (envelope-from ) for ; Fri, 13 Dec 2024 21:10:15 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id AN1CHLeiXGd4VAEA62LTzQ (envelope-from ) for ; Fri, 13 Dec 2024 22:10:15 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=feue2Eg5; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=prW9FHbA; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1734124215; a=rsa-sha256; cv=none; b=uNPCKrWz4TXGAGhN5YgOQmIHdMsk5IQydmXX/4KPjJM4GXMpggm4Xnyno/2h0JlTOMu7oO ukVdXkqKtseRwD1JQ5/qZIz8Nbk1ue+08aNwb6UiQk5tzf5/tQrrNEwFNoyh96n6kwwEgt ZZq2OVXscuLgTP17yw8JdWIAC4A/WKvQifBnbT5dEFRfNSwYROaq6aTfOdENmuBDAM7VhD vkE56K02o/WraLU5QVsw9IZiybtCWzFsAlWdo8xROw4pacHrowpFjthS262OswUsNsCT+j rJUCJkXRtPjPGv8xjNFQI/ELWNo75U7UJHCamsVbDBUBQjBlS7DABLhGkdjfVw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=feue2Eg5; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=prW9FHbA; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1734124215; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=FZq0zPLFIm33dmlhRs1BdcZArw8yTf8iNIziSZCcso0=; b=m4C6ENDTXV8svDTuKaaJb+daoKmXPKNnshHl2VVVXOdCxLAsmtglQfGNDvwGVSiygJAP18 bYuhS2dGdBHzGtBJTMKTadz9rpr18aScNQZxLMdH4Yx/p9mJwmkrqcoc26889ZzdAF4ZqQ GH3DTbeYuW60Cal6MhwpFrI19e2IOQ2UYp7VBl8G5jUDslkqeGMYk1bTh9q9dMWzqzFVk5 A5Xn7sdmree6JzTsFal54m7cz4IiNvM3jRajQyxO17ml/VA1UaTYiXzUrI7DagbuUSx10s A3w7MIGC6W0FdXj7AlvHj0hBf+V34Cf0cwpwQWboO9WDt2r9R98UgXfOLFXyjw== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 0C0E576EA for ; Fri, 13 Dec 2024 22:10:15 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tMCul-00088Z-TQ; Fri, 13 Dec 2024 16:09:36 -0500 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 1tMCuH-0007sQ-L0 for guix-patches@gnu.org; Fri, 13 Dec 2024 16:09:05 -0500 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 1tMCuH-00057F-Bg for guix-patches@gnu.org; Fri, 13 Dec 2024 16:09:05 -0500 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=FZq0zPLFIm33dmlhRs1BdcZArw8yTf8iNIziSZCcso0=; b=feue2Eg5JFqc/703ZvVTz11Ac3NMPjNh1/XIKDp39UqhvuFnOBZwzALTWDiLy7d9mzzkhqT8r8T2PAHu1Rp+ojMuYWilkE+MO61qe7srHy6uerhp955BJpWSj0MkwqI9DDMwzNMPHFPDjvlqZH1SCpFPviFLsBDhsUAig8wHD8stm/AnAo847cQ7EwRTvHyyYBlT6JuMOFp2DowI+kCvXldnWrnrQkcGp8oXsKv6pmg6M4lZ2wI1baFaEHBEiPSPQ+WXyZEe3fPej6xHLGGw+uLJmxfsrIsEfFaG9ZS2nP23/6BbdyO71vQhxkFUI017y7gahvtQO4eOJvYdbhbTiw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tMCuF-0004DI-Kw; Fri, 13 Dec 2024 16:09:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#72987] [PATCH v3 1/5] gnu: u-boot: Enlarge space available for kernel. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Fri, 13 Dec 2024 21:09: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 Cc: Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 72987-submit@debbugs.gnu.org id=B72987.173412413816146 (code B ref 72987); Fri, 13 Dec 2024 21:09:03 +0000 Received: (at 72987) by debbugs.gnu.org; 13 Dec 2024 21:08:58 +0000 Received: from localhost ([127.0.0.1]:44351 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMCu8-0004CE-TE for submit@debbugs.gnu.org; Fri, 13 Dec 2024 16:08:57 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:41455 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMCtg-0004AN-IA for 72987@debbugs.gnu.org; Fri, 13 Dec 2024 16:08:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1734124099; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FZq0zPLFIm33dmlhRs1BdcZArw8yTf8iNIziSZCcso0=; b=prW9FHbAoXVttVDJzjkPvXPcDRTOBoLG66b2yWQFlZGNqFvGEpLj8Gkbs8hnC22HHZH15i nJOTDgNoIUQUYfcE15FaIk/T55oWLnty5GHPL8/53z0f8wL2jX71JV2jxTDC7J87UBSWtw +Dwkwk2QtXY3J6qV/hggX+wheLkBA6pDU76c25RnsUlrmLeObCRS+fxMLvNPEf+VlmPPuA H8UHOQOySok7BIUlQU6gzIX5KEwV++UAo1xsI0tIYkAHzrlVibpdbYivHREyZkSJu0CFPe LpVhVvIjR3WuVsqnf2ep40KHDpcucDyYsHXYAe5O8EzuAvQ2AYoTujob2AAvaA== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 9b99ea32 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <72987@debbugs.gnu.org>; Fri, 13 Dec 2024 21:08:19 +0000 (UTC) Date: Fri, 13 Dec 2024 22:07:32 +0100 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 From: Herman Rimm via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -2.67 X-Spam-Score: -2.67 X-Migadu-Queue-Id: 0C0E576EA X-Migadu-Scanner: mx12.migadu.com X-TUID: d/autVH+ogeW * 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 | 3 +- gnu/packages/bootloaders.scm | 1 + gnu/packages/patches/u-boot-50M-kernel.patch | 55 ++++++++++++++++++++ 3 files changed, 58 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 ace19eb8a4..4da94f68e2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -62,7 +62,7 @@ # Copyright © 2023 B. Wilson # Copyright © 2023 Bruno Victal # Copyright © 2023, 2024 gemmaro -# Copyright © 2023 Herman Rimm +# Copyright © 2023, 2024 Herman Rimm # Copyright © 2023 Troy Figiel # Copyright © 2024 David Elsing # Copyright © 2024 Ashish SHUKLA @@ -2273,6 +2273,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 5183b2fc14..478385fb18 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -758,6 +758,7 @@ (define u-boot (sha256 (base32 "0yrhb0izihv47p781dc4cp0znc5g225ayl7anz23c6jdrmfbpz2h")) (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 0000000000..c4d054dd42 --- /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 -- 2.45.2