From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id wDu8LpuiXGdw6QAAe85BDQ:P1 (envelope-from ) for ; Fri, 13 Dec 2024 21:09:48 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id wDu8LpuiXGdw6QAAe85BDQ (envelope-from ) for ; Fri, 13 Dec 2024 22:09:47 +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=RLxFsnEj; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=kah4i1sY; 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=1734124187; a=rsa-sha256; cv=none; b=XzlrIj1wD+5XMeaR0iyQpav3ppD6fhZgaMXgUygLjuvFtYCeGwEyJG2AQa3/q+meNHDoMu +ZMVDbvDQo+6aYAUnaiFiurQ/6CL3qWnN7A6qDG9l6dNyihDAyB1QFhEv3S7lWdRBHkMDH atci2nu+0oJhlbx9QriysnU4MT9cVw+7j50RQ6cnzolpk3MBk2pajVJwfQfhYOZJLKj8qm tKtS+NRA53KSBuFe95qivNOXt/MtaPveXjXBUf2t+m2lltmlej95ydDKcB8Wyg3DhGLV7u OJTjRJn7N4PYHyCFLEwJtQVo5XuBAT2CUFaGkp0gk5MlyyDleCEwX4pz09TqMg== 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=RLxFsnEj; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=kah4i1sY; 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=1734124187; 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-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=09PSKGun4VscWhD7LwcyVRPr2V4cldvtu3v9aJDHigA=; b=QZv0tNBz0c2JiPC5ukdmSKyMem8Cx+YLySfFapqB2P96sDu5e4AcvVySzdiOgRHNQLZCxY y1EghyP2CapxP8S+AwUu6nBtFlZiN9W/N7QRwmh7lBUNzPQ4bH8DMm739ebkLmfnc9XvuH YFqHVN6oGrmaoXoYz58e3GciyBMYeCzEfo/Rq+tb61P+z8gyXej9lnOmjypw6vfzEYXb/b EKH6cH6vUkzSidZxHrVaYDG8VuTMu9rJrNp2Exk/FnqXHmgBGUxicRv90d88ixa/cHl/+f MBevFilQQbrn8c72amk/F6vnSYqHUXAuddH7fhnIOHgv2AXR7MSAYMO0bvEHhA== 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 8A4CF7A151 for ; Fri, 13 Dec 2024 22:09:47 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tMCuW-0007sn-Ut; Fri, 13 Dec 2024 16:09:25 -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 1tMCuF-0007rs-UC for guix-patches@gnu.org; Fri, 13 Dec 2024 16:09:04 -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 1tMCuF-00056p-Fi for guix-patches@gnu.org; Fri, 13 Dec 2024 16:09:03 -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=09PSKGun4VscWhD7LwcyVRPr2V4cldvtu3v9aJDHigA=; b=RLxFsnEjzRrEAdDKlhOr2fjQK8zPs33BReNC5AASa28uOBdzpSzC9tjLAJRE59wc4dTY32ZmYIVrwr9oGJr1Y2wgQbEsBOzirFWRBBNh8n8q7L9KzQcmqAWm6SuNGQHTTtKwycHqaDQQdHy/b6ygwIHE3Q9x5SKkbUjp8w5IP1zAiBlx9boJgEDHVA+/8NyXBHq+J7NLMbG+i6KxEv+K0lEA89pjhSnmsg7Up9c9spaki0fWS+pGaJr+GRO12YZ7HR1xBLXpFGsRAF5mwAt5QeSVG9Rv1gWbdi+nhVORTePNGzeEM7NVhYm59b6aqCKe5dZBnGxPoMhYw6PvgJLcOg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tMCuF-0004D5-66; Fri, 13 Dec 2024 16:09:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#72987] [PATCH v3 3/5] gnu: u-boot: Use DDR3 patch for Nano Pi R4S. 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.173412413616132 (code B ref 72987); Fri, 13 Dec 2024 21:09:03 +0000 Received: (at 72987) by debbugs.gnu.org; 13 Dec 2024 21:08:56 +0000 Received: from localhost ([127.0.0.1]:44349 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMCu8-0004C3-9Z for submit@debbugs.gnu.org; Fri, 13 Dec 2024 16:08:56 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:59747 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMCtk-0004Ae-Qb for 72987@debbugs.gnu.org; Fri, 13 Dec 2024 16:08:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1734124100; 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=09PSKGun4VscWhD7LwcyVRPr2V4cldvtu3v9aJDHigA=; b=kah4i1sY+RFbomaiB3z8wavNgFeHpF8KioN/BjAAhZp/3O0bqHuupVjS4U/rCB+g+RezdD xFH5aRo8LDRsVLmQVW/0Clr1lxMBwZRNXMC/owFtI3773mVPoAyJAg6tetKAEwdw4Dyd2X NgWkylYg/d1Obo0PqDiJRVwCL+n1qTyg0mmaEM8keqCQwCYrmrH3mjpIn64eLVY/IIscH6 6X2FXD85m9/n3Fs0ru9EgvzDIaKUhD5uM6mLrtH6t9pUHV++zw7pZVv7QLJReaYY5m9gW4 bb2kC55EPvohZA+loR0N0rek6YrsGVmR1m/aVCnsw0WVp+dYIR3octWerawaWw== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 910994bb (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <72987@debbugs.gnu.org>; Fri, 13 Dec 2024 21:08:20 +0000 (UTC) Date: Fri, 13 Dec 2024 22:07:34 +0100 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 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-Queue-Id: 8A4CF7A151 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -6.17 X-Spam-Score: -6.17 X-TUID: T5uTg4MI3Pmb * gnu/packages/bootloaders.scm (u-boot)[source]: Use patch. * gnu/packages/patches/u-boot-nanopi-r4s-ddr3.patch: Add file. * gnu/local.mk (dist_patch_DATA): Register patch. Change-Id: Ibbf952f2806c9cac7fc29e1264d427bf6ee67d01 --- gnu/local.mk | 1 + gnu/packages/bootloaders.scm | 1 + .../patches/u-boot-nanopi-r4s-ddr3.patch | 33 +++++++++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 gnu/packages/patches/u-boot-nanopi-r4s-ddr3.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4da94f68e2..4852c427b2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2277,6 +2277,7 @@ dist_patch_DATA = \ %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 \ + %D%/packages/patches/u-boot-nanopi-r4s-ddr3.patch \ %D%/packages/patches/ucx-tcp-iface-ioctl.patch \ %D%/packages/patches/ultrastar-deluxe-no-freesans.patch \ %D%/packages/patches/ungoogled-chromium-extension-search-path.patch \ diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 1a464655b6..d946270317 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -759,6 +759,7 @@ (define u-boot (base32 "0yrhb0izihv47p781dc4cp0znc5g225ayl7anz23c6jdrmfbpz2h")) (patches (search-patches "u-boot-allow-disabling-openssl.patch" "u-boot-50M-kernel.patch" + "u-boot-nanopi-r4s-ddr3.patch" "u-boot-rockchip-inno-usb.patch")))) (build-system gnu-build-system) (native-inputs diff --git a/gnu/packages/patches/u-boot-nanopi-r4s-ddr3.patch b/gnu/packages/patches/u-boot-nanopi-r4s-ddr3.patch new file mode 100644 index 0000000000..435ffd5554 --- /dev/null +++ b/gnu/packages/patches/u-boot-nanopi-r4s-ddr3.patch @@ -0,0 +1,33 @@ +From: Herman Rimm +Date: Sun, 2 Jul 2023 13:43:18 +0200 +Subject: [PATCH] Configure the Nano Pi R4S with DDR3. + +--- +This patch should be removed once something like this is upstream: +https://github.com/anaelorlinski/OpenWrt-NanoPi-R2S-R4S-Builds/commit/9d836044340ddef53f5d9f1946ac48c946a78284 + +diff --git a/arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi b/arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi +index 69800cc368d..a3054849f88 100644 +--- a/arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi ++++ b/arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi +@@ -13,7 +13,7 @@ + */ + + #include "rk3399-nanopi4-u-boot.dtsi" +-#include "rk3399-sdram-lpddr4-100.dtsi" ++#include "rk3399-sdram-ddr3-1866.dtsi" + + / { + smbios { +diff --git a/configs/nanopi-r4s-rk3399_defconfig b/configs/nanopi-r4s-rk3399_defconfig +index ada04b46cb1..b39e350bbed 100644 +--- a/configs/nanopi-r4s-rk3399_defconfig ++++ b/configs/nanopi-r4s-rk3399_defconfig +@@ -48,7 +48,6 @@ CONFIG_PMIC_RK8XX=y + CONFIG_SPL_DM_REGULATOR_FIXED=y + CONFIG_REGULATOR_RK8XX=y + CONFIG_PWM_ROCKCHIP=y +-CONFIG_RAM_ROCKCHIP_LPDDR4=y + CONFIG_BAUDRATE=1500000 + CONFIG_DEBUG_UART_SHIFT=2 + CONFIG_SYS_NS16550_MEM32=y -- 2.45.2