From patchwork Mon Apr 1 20:22:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 62439 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 ED76F27BBEA; Mon, 1 Apr 2024 21:24:41 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 0752A27BBE2 for ; Mon, 1 Apr 2024 21:24:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrOCI-0007We-Kn; Mon, 01 Apr 2024 16:24:02 -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 1rrOCG-0007Vk-Ou for guix-patches@gnu.org; Mon, 01 Apr 2024 16:24:00 -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 1rrOCG-0006Lb-Gr for guix-patches@gnu.org; Mon, 01 Apr 2024 16:24:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rrOCJ-0007Bs-Pf; Mon, 01 Apr 2024 16:24:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70131] [PATCH 2/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: Mon, 01 Apr 2024 20:24:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70131 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70131@debbugs.gnu.org Cc: Herman Rimm , Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 70131-submit@debbugs.gnu.org id=B70131.171200300027537 (code B ref 70131); Mon, 01 Apr 2024 20:24:03 +0000 Received: (at 70131) by debbugs.gnu.org; 1 Apr 2024 20:23:20 +0000 Received: from localhost ([127.0.0.1]:51616 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrOBc-0007A4-4e for submit@debbugs.gnu.org; Mon, 01 Apr 2024 16:23:20 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:37241 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrOBX-000796-Bf for 70131@debbugs.gnu.org; Mon, 01 Apr 2024 16:23:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1712002983; h=from:from: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: in-reply-to:in-reply-to:references:references; bh=5jGF+gDwe7IJOFwjqolbEJZfJax0A7tSFpbwXxo6cF8=; b=Pd8KKEeBx5UYnLDPiwFnc/Qs/LeExtmGs4YYwKOXxIZ/EmManz5fg+bI6NQTav+i3nAM5i YhvXeG9tM/w58XocSHNdW1ZuuR7tP1+gCo1yjRz8NeWZEyG2tUqZhEHTp5NI8NRY97kM44 l42DlkoYT4G1KnZSEvWJ0rmgQcLV6X4RtnaantzI1GLKC6LHojL2GH/jqiQaedW07u3ZC5 WaUGbjxJwAA0eNjSPTtv54nxLrAIDCP+HnaFjG9+rZYXQVmEE41Jvm+Z8alOe3S6z6FSX5 vxvjLsLHPj4apMc7zWeMdA8NBJ16dGQDZqQTEmEoyAhSEbzRX0JcSaWP8i8zRA== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id ee94702c (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Mon, 1 Apr 2024 20:23:03 +0000 (UTC) Date: Mon, 1 Apr 2024 22:22:30 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 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-nanopi-r4s-ddr3-patch): Add variable. (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 | 3 ++- gnu/packages/bootloaders.scm | 7 +++++- .../patches/u-boot-nanopi-r4s-ddr3.patch | 25 +++++++++++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/u-boot-nanopi-r4s-ddr3.patch diff --git a/gnu/local.mk b/gnu/local.mk index f2b480bded..3c29b4a2b7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -62,7 +62,7 @@ # Copyright © 2023 B. Wilson # Copyright © 2023 Bruno Victal # Copyright © 2023 gemmaro -# Copyright © 2023 Herman Rimm +# Copyright © 2023-2024 Herman Rimm # Copyright © 2023 Troy Figiel # Copyright © 2024 David Elsing # @@ -2125,6 +2125,7 @@ dist_patch_DATA = \ %D%/packages/patches/u-boot-build-without-libcrypto.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 d1bf0fcd98..9443de0a1d 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -720,6 +720,10 @@ (define %u-boot-build-without-libcrypto-patch ;; Upstream commit to fix Amlogic builds in u-boot 2024.01. (search-patch "u-boot-build-without-libcrypto.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") @@ -728,7 +732,8 @@ (define u-boot (patches (list %u-boot-rockchip-inno-usb-patch %u-boot-build-without-libcrypto-patch - %u-boot-allow-disabling-openssl-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/" 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..3c4f5efaf4 --- /dev/null +++ b/gnu/packages/patches/u-boot-nanopi-r4s-ddr3.patch @@ -0,0 +1,25 @@ +diff --git a/arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi b/arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi +index 69800cc368..a3054849f8 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 4f4363cb0f..bfa7ee628d 100644 +--- a/configs/nanopi-r4s-rk3399_defconfig ++++ b/configs/nanopi-r4s-rk3399_defconfig +@@ -54,7 +54,6 @@ CONFIG_PMIC_RK8XX=y + CONFIG_REGULATOR_PWM=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