From patchwork Sun Nov 7 14:34:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 34301 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 8CE8827BBE3; Sun, 7 Nov 2021 14:41:14 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F2DC627BBE1 for ; Sun, 7 Nov 2021 14:41:13 +0000 (GMT) Received: from localhost ([::1]:54248 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mjjM9-0002MA-5Y for patchwork@mira.cbaines.net; Sun, 07 Nov 2021 09:41:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33012) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mjjLz-0002J9-3g for guix-patches@gnu.org; Sun, 07 Nov 2021 09:41:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:40673) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mjjLy-0008N4-Nt for guix-patches@gnu.org; Sun, 07 Nov 2021 09:41:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mjjLy-0007TP-Io for guix-patches@gnu.org; Sun, 07 Nov 2021 09:41:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51663] [PATCH] gnu: u-boot: Fix rk3399 boot from emmc. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 Nov 2021 14:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 51663 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51663@debbugs.gnu.org Cc: Vagrant Cascadian X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163629601528657 (code B ref -1); Sun, 07 Nov 2021 14:41:02 +0000 Received: (at submit) by debbugs.gnu.org; 7 Nov 2021 14:40:15 +0000 Received: from localhost ([127.0.0.1]:52219 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mjjL8-0007S2-Vj for submit@debbugs.gnu.org; Sun, 07 Nov 2021 09:40:15 -0500 Received: from lists.gnu.org ([209.51.188.17]:55298) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mjjL4-0007Ro-MU for submit@debbugs.gnu.org; Sun, 07 Nov 2021 09:40:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:32812) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mjjL1-0001uF-NO for guix-patches@gnu.org; Sun, 07 Nov 2021 09:40:04 -0500 Received: from mout.gmx.net ([212.227.17.21]:52455) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mjjKv-00089d-Ks for guix-patches@gnu.org; Sun, 07 Nov 2021 09:40:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1636295988; bh=NfnN2TEGs1LasGe2D96wxZmlyYMiMdzEW25HuXWHSRA=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=kwlVoLVKmt9x3/UOx6QYeVOXFLLO2ZQ4BzzuQkmq2kzKqps182df8yYbF5v1tfFSk S04o1XppQtKFpG2daQL9Vqws373t5FxTnxLvsP03tIibyfcb8ac+zvwBg1sDeBrpC3 rWmxtrSRDBAoJZ56YKMzDVFgePl+5k3wNtslQZHY= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1Mt79F-1mTrHJ1EN7-00tTPB; Sun, 07 Nov 2021 15:39:48 +0100 User-agent: mu4e 1.6.9; emacs 27.2 From: Pierre Langlois Date: Sun, 07 Nov 2021 14:34:09 +0000 Message-ID: <87a6igav2l.fsf@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:9HJZEQ3OmJryLQZfeV8l7/t7pPOCm4/Jj7+8/9B1e8R4D6HxiDG 1+3OmuATXwCTf5Eb/yoWjwi+OwoflerYcGA8gAJfd+e8J4FEZzLkh07z4rrWDT7FMeGdcY7 GVDvchTiCayQINy1tW9iZdnIn/iEkfBhzonUetoFS2q4XYCvFJdRXAv/h393sruIn1+Xv8l QRYCwnA1bjH0jKlW/B2CQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:Og5GUBFUeBU=:/+EjLXBqLYiPWS6Kkq6kum a7xwgkhItmeGEwyDmDw0HMhNPJZw9NqcoA2LBsCuRIaaveU7AjrNWr8RZutDWtfQCmBQv9zUW cmWNF0Q2dtmrEOs4xYeGmGVDhe8pleMlhoWoXvqw9nT2AY2Ve/zpUdKaQ1gA5MyakV869rFj4 vH1PUrsLuu7EpoA0g9YRWNIx9KM0U7dCg8seMM6AbVSNmcTtZf+c2NAHL29qUsTXRc5Kp17xD PSk6UqeZH3fbrcqwONVcuJUM1zs8GO0i49cGS4qXuWKv6HM+71r6spXOenpsMq0TM+bB/AXdw atl+VUvLvPIIvDWDBr8YCcO7LHgBE5cdoA0qxEJ59W1AKUl049nlZ+PACx+bYXY7r6v9AnTgP r7CD2rTzlVh5kmoo6R/dePF0pS8zSn3F5rqUZ95chJS2eQPMEZ8YWRlQzGPP/wWedf4WWfnph suVuHYzPQoED3tPullqwVhd+9ptnG9gLv9kSPrij6LfkMhVs8YnXUf2NxG22ZlW7BWAreL9Xf /oHnHloit4/D50IG3IHtvJwLQobYMsQ1NLdc3MakN6j+txCqI+bo5O3b4jq7c4ZxK1wIfb5uW io9HcgSsV2Lzy/GHmp39af8MhzEkcVori4mKjliWGCpN1npSZ/I7D63KH+DvLbvNem3xubjfZ FLMKQ+13k/Kng+XKkpm9AZP3h5VJpdKneJsx6TbSdWx16oop3mzkkuvo/tKeohHQoRJTDGYE2 Qv65Yijj5DFRiVTEYyJTS08eAGxk9p6iyc2/MiJXGHBN9o37S19lG+YxugscvIn/A8GueYylm dFlIqNQH43HP3wY9aRncAaA9P79v7jbg0BWhc29WZBCtqc7ohQubC8UMT4fnhEbaezPQlNtKt Uwsb48T2Qqz9Ff0XuMqijja/fs6Af4g8av2QD7FJv6YIsnfHXnUIXEXo+ydF3rBYiWg5eeGu1 0yBsmjQaa+aTS2UTUpg29cKDnF9ql3H3YBrFYv4fSXUrkbsIQ2oKkOMaGaY2gRzJ256SsKrcs F4QbiEBSdvl9KPUOYHe1pras4uu6BCtvGvSinqc4BWvBaOhvDFnBbS9a/EGxhP2ZWC6elN3Zx HfCAVPho57MYso= Received-SPF: pass client-ip=212.227.17.21; envelope-from=pierre.langlois@gmx.com; helo=mout.gmx.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi Guix! I'm afraid the last u-boot update broke booting the rockpro64 and pinebook-pro from the eMMC card :-/. Going through the u-boot ML, I saw that it was reported [0], and this fix [1] should be applied. So here's a patch! I tested it on on both the pinebook-pro and rockpro64. OK to apply? Thanks, Pierre [0]: https://lists.denx.de/pipermail/u-boot/2021-November/466329.html [1]: https://patchwork.ozlabs.org/project/uboot/patch/20211101044347.17822-1-yifeng.zhao@rock-chips.com/ From 4dea90a439f749f9f54407603c01eabf9900a75e Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Fri, 5 Nov 2021 20:38:45 +0000 Subject: [PATCH] gnu: u-boot: Fix rk3399 boot from emmc. * gnu/packages/bootloaders.scm (%u-boot-rk3399-enable-emmc-phy-patch): New variable. (u-boot)[origin]: Register it. * gnu/packages/patches/u-boot-rk3399-enable-emmc-phy.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/bootloaders.scm | 8 +++++- .../u-boot-rk3399-enable-emmc-phy.patch | 26 +++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/u-boot-rk3399-enable-emmc-phy.patch diff --git a/gnu/local.mk b/gnu/local.mk index 05258ac054..0f98d6ce56 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1842,6 +1842,7 @@ dist_patch_DATA = \ %D%/packages/patches/u-boot-rockchip-inno-usb.patch \ %D%/packages/patches/u-boot-sifive-prevent-reloc-initrd-fdt.patch \ %D%/packages/patches/u-boot-riscv64-fix-extlinux.patch \ + %D%/packages/patches/u-boot-rk3399-enable-emmc-phy.patch \ %D%/packages/patches/ucx-tcp-iface-ioctl.patch \ %D%/packages/patches/ungoogled-chromium-extension-search-path.patch \ %D%/packages/patches/ungoogled-chromium-ffmpeg-compat.patch \ diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 706ddf0207..c93af2241f 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -504,6 +504,11 @@ (define %u-boot-allow-disabling-openssl-patch ;; https://lists.denx.de/pipermail/u-boot/2021-October/462728.html (search-patch "u-boot-allow-disabling-openssl.patch")) +(define %u-boot-rk3399-enable-emmc-phy-patch + ;; Fix emmc boot on rockpro64 and pinebook-pro. + ;; https://lists.denx.de/pipermail/u-boot/2021-November/466329.html + (search-patch "u-boot-rk3399-enable-emmc-phy.patch")) + (define u-boot (package (name "u-boot") @@ -512,7 +517,8 @@ (define u-boot (patches (list %u-boot-rockchip-inno-usb-patch %u-boot-allow-disabling-openssl-patch - %u-boot-sifive-prevent-relocating-initrd-fdt)) + %u-boot-sifive-prevent-relocating-initrd-fdt + %u-boot-rk3399-enable-emmc-phy-patch)) (method url-fetch) (uri (string-append "https://ftp.denx.de/pub/u-boot/" diff --git a/gnu/packages/patches/u-boot-rk3399-enable-emmc-phy.patch b/gnu/packages/patches/u-boot-rk3399-enable-emmc-phy.patch new file mode 100644 index 0000000000..f14a9ce104 --- /dev/null +++ b/gnu/packages/patches/u-boot-rk3399-enable-emmc-phy.patch @@ -0,0 +1,26 @@ +adapting commit ac804143cf ("mmc: rockchip_sdhci: add phy and clock +config for rk3399") to fix the issue "Not found emmc phy device". + +Signed-off-by: Yifeng Zhao +--- + + arch/arm/dts/rk3399-u-boot.dtsi | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi +index 73922c328a..716b9a433a 100644 +--- a/arch/arm/dts/rk3399-u-boot.dtsi ++++ b/arch/arm/dts/rk3399-u-boot.dtsi +@@ -88,6 +88,10 @@ + u-boot,dm-pre-reloc; + }; + ++&emmc_phy { ++ u-boot,dm-pre-reloc; ++}; ++ + &grf { + u-boot,dm-pre-reloc; + }; +-- +2.17.1 -- 2.33.1