From patchwork Tue Mar 14 00:38:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 1756634 X-Patchwork-Delegate: ykai007@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.a=rsa-sha256 header.s=s1 header.b=ATri/uGx; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PbF5B4wW3z1yWp for ; Tue, 14 Mar 2023 11:38:54 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8709685FF3; Tue, 14 Mar 2023 01:38:31 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.b="ATri/uGx"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id ACF9C85DBB; Tue, 14 Mar 2023 01:38:26 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE, SPF_PASS,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.2 Received: from wrqvtbkv.outbound-mail.sendgrid.net (wrqvtbkv.outbound-mail.sendgrid.net [149.72.123.24]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 2525685C52 for ; Tue, 14 Mar 2023 01:38:23 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bounces+31435339-7456-u-boot=lists.denx.de@em2124.kwiboo.se DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=from:subject:in-reply-to:references:mime-version:to:cc: content-transfer-encoding:content-type:cc:content-type:from:subject:to; s=s1; bh=MplQpyw8GvzOrAh3mUkbpD8glALQlEzx+CeNNbGfEXk=; b=ATri/uGxG7Uochz9U1LwAdj9Hw7MiWxtZHEziieNGNQ3p+L2dyPZgcsnFErQoxsv5H9g 6fHfzq8QP4HoZWcQcmagyGx9vMvp/yd4zaHfgveNH2D1+R+ws3gvAEjyx6gS4OKE9k9DW/ oghD1DIdIc17h46ucazdAtGTvAatPFADpAyoZaCCIv8jZBxIe/pvhLZKVxJfokS5CqnWCz P7GTpFpOKO4nFM5uldpPxSfnFaixAl4pNo0weaKT1CQXcUwsM7qBKdE28/SQVaLM7880Xi 04kN9ZR1yqUgwVM3vpbQNITaw+UsVmiicdtUPXxNIO9fHxs5Qvrd9xa+c+RJchlg== Received: by filterdrecv-59cb65cf6d-qj8b6 with SMTP id filterdrecv-59cb65cf6d-qj8b6-1-640FC1FD-3 2023-03-14 00:38:21.248053114 +0000 UTC m=+458839.293327645 Received: from bionic.localdomain (unknown) by geopod-ismtpd-8 (SG) with ESMTP id -IBuToGKSlyUcWCyqPCyYw Tue, 14 Mar 2023 00:38:21.031 +0000 (UTC) From: Jonas Karlman Subject: [PATCH 01/12] rockchip: Fix early use of bootph props Date: Tue, 14 Mar 2023 00:38:21 +0000 (UTC) Message-Id: <20230314003755.512696-2-jonas@kwiboo.se> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230314003755.512696-1-jonas@kwiboo.se> References: <20230314003755.512696-1-jonas@kwiboo.se> MIME-Version: 1.0 X-SG-EID: TdbjyGynYnRZWhH+7lKUQJL+ZxmxpowvO2O9SQF5CwCVrYgcwUXgU5DKUU3QxAfZekEeQsTe+RrMu3cja6a0h9dztB52lhAszypoV4b7PoRosnL0Hfq9q9UBt5UO7eI6BCzRz7Im1kPX9mo7xyW4fIcYXmMbdp84LjwBm39iREB94PFNab0P28JJa2cH+HF0pJdnoQCdEDlO/ilfos7KbHSNvYRxY18fN51MZORd8iogXLEA5FIqS4AJSW/XeVNX To: Kever Yang , Simon Glass , Philipp Tomsich , Akash Gajjar Cc: Jagan Teki , Eugen Hristev , u-boot@lists.denx.de, Jonas Karlman X-Entity-ID: P7KYpSJvGCELWjBME/J5tg== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Running U-Boot on a ROCK 3 Model A result in the following: No serial driver found resetting ... no sysreset ### ERROR ### Please RESET the board ### Replace bootph- props with u-boot,dm- props to fix this. Signed-off-by: Jonas Karlman Reviewed-by: Kever Yang --- arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi | 2 +- arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi | 2 +- arch/arm/dts/rk3568-rock-3a-u-boot.dtsi | 2 +- arch/arm/dts/rk3588-edgeble-neu6a-io-u-boot.dtsi | 2 +- arch/arm/dts/rk3588s-u-boot.dtsi | 14 +++++++------- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi b/arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi index a27a3adc082b..27735c49ddc0 100644 --- a/arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi +++ b/arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi @@ -11,7 +11,7 @@ }; &uart0 { - bootph-all; + u-boot,dm-pre-reloc; clock-frequency = <24000000>; status = "okay"; }; diff --git a/arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi b/arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi index 4e791738335f..589332503e72 100644 --- a/arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi +++ b/arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi @@ -13,6 +13,6 @@ &uart2 { clock-frequency = <24000000>; - bootph-all; + u-boot,dm-pre-reloc; status = "okay"; }; diff --git a/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi b/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi index ed47efa44bf9..b5ca23a82a20 100644 --- a/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi +++ b/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi @@ -19,6 +19,6 @@ &uart2 { clock-frequency = <24000000>; - bootph-all; + u-boot,dm-pre-reloc; status = "okay"; }; diff --git a/arch/arm/dts/rk3588-edgeble-neu6a-io-u-boot.dtsi b/arch/arm/dts/rk3588-edgeble-neu6a-io-u-boot.dtsi index 3235bd36e4c8..612966492b02 100644 --- a/arch/arm/dts/rk3588-edgeble-neu6a-io-u-boot.dtsi +++ b/arch/arm/dts/rk3588-edgeble-neu6a-io-u-boot.dtsi @@ -18,7 +18,7 @@ &sdmmc { bus-width = <4>; - bootph-all; + u-boot,dm-pre-reloc; u-boot,spl-fifo-mode; status = "okay"; }; diff --git a/arch/arm/dts/rk3588s-u-boot.dtsi b/arch/arm/dts/rk3588s-u-boot.dtsi index 1e225d71efc2..f880f4a16741 100644 --- a/arch/arm/dts/rk3588s-u-boot.dtsi +++ b/arch/arm/dts/rk3588s-u-boot.dtsi @@ -8,12 +8,12 @@ / { dmc { compatible = "rockchip,rk3588-dmc"; - bootph-all; + u-boot,dm-pre-reloc; status = "okay"; }; pmu1_grf: syscon@fd58a000 { - bootph-all; + u-boot,dm-pre-reloc; compatible = "rockchip,rk3588-pmu1-grf", "syscon"; reg = <0x0 0xfd58a000 0x0 0x2000>; }; @@ -46,26 +46,26 @@ }; &xin24m { - bootph-all; + u-boot,dm-pre-reloc; status = "okay"; }; &cru { - bootph-pre-ram; + u-boot,dm-spl; status = "okay"; }; &sys_grf { - bootph-pre-ram; + u-boot,dm-spl; status = "okay"; }; &uart2 { clock-frequency = <24000000>; - bootph-pre-ram; + u-boot,dm-spl; status = "okay"; }; &ioc { - bootph-pre-ram; + u-boot,dm-spl; }; From patchwork Tue Mar 14 00:38:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 1756635 X-Patchwork-Delegate: ykai007@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.a=rsa-sha256 header.s=s1 header.b=MOFbtH/J; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PbF5T2tblz1yWp for ; Tue, 14 Mar 2023 11:39:09 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9918685DBD; Tue, 14 Mar 2023 01:38:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.b="MOFbtH/J"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E797385C52; Tue, 14 Mar 2023 01:38:26 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_BL_SPAMCOP_NET, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.2 Received: from wrqvwxzv.outbound-mail.sendgrid.net (wrqvwxzv.outbound-mail.sendgrid.net [149.72.154.232]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 76BDB8587C for ; Tue, 14 Mar 2023 01:38:24 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bounces+31435339-7456-u-boot=lists.denx.de@em2124.kwiboo.se DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=from:subject:in-reply-to:references:mime-version:to:cc: content-transfer-encoding:content-type:cc:content-type:from:subject:to; s=s1; bh=mCwcPA/cEvhzLEN7FOmaDdTNLhGYApug8uI5UaxHcxc=; b=MOFbtH/J5N0VNHkIJ9jYfIYljBC7rnNWCCQAZSvIahLfmyVWVFSO0GZFLZ+9GG4AZA/b xqCMIA3URG4l2oZEDDk8fgqTE6FHLGBjP//HFrGzdxb1v1vvxynPxulujxDUoz56Q4Soz2 GliZgHpku8+5hUpkJDKQTypoQJ+Sq7e8EDs1Vr4t2FbRefFLwEkX56g5uZKNkwwQ7dbUcE T6885PWEaJcn4Mj8KITfCvUYXrMaMr8/DQqAcIJPmCmLLJ1IVVm1dqwBl6PAZXP4Vcozqw yws1AyS00XFbyZS57CFZVnRkA6Qxc6vKHD1PsshB2xOKc6Ql3TnBzytMwoKucA8w== Received: by filterdrecv-6c845fd887-6zjkw with SMTP id filterdrecv-6c845fd887-6zjkw-1-640FC1FE-29 2023-03-14 00:38:22.864476302 +0000 UTC m=+1731931.790619925 Received: from bionic.localdomain (unknown) by geopod-ismtpd-8 (SG) with ESMTP id 7pa5ZnJTRCyL5wCkffLwwQ Tue, 14 Mar 2023 00:38:22.636 +0000 (UTC) From: Jonas Karlman Subject: [PATCH 02/12] rockchip: rk3568: Fix boot device detection Date: Tue, 14 Mar 2023 00:38:23 +0000 (UTC) Message-Id: <20230314003755.512696-3-jonas@kwiboo.se> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230314003755.512696-1-jonas@kwiboo.se> References: <20230314003755.512696-1-jonas@kwiboo.se> MIME-Version: 1.0 X-SG-EID: TdbjyGynYnRZWhH+7lKUQJL+ZxmxpowvO2O9SQF5CwCVrYgcwUXgU5DKUU3QxAfZekEeQsTe+RrMu3cja6a0h+5IzQTXZbxIxRk5EHqOGgyQjEYxtjhgqe96MlMLEwYCCObVv6R63LOZda4/T68Yz3EJrEcU/KlTuzkEIbeC1gdy4IpyrDqR992ojACcz+3ydAaJy7Lxyf0Qffj5H2A0F5szodUHcpb63Vs8EvygThuA7RI/3AU3v5MPG8E99dUr To: Kever Yang , Simon Glass , Philipp Tomsich , Chris Morgan , Peter Geis Cc: Jagan Teki , Eugen Hristev , u-boot@lists.denx.de, Jonas Karlman X-Entity-ID: P7KYpSJvGCELWjBME/J5tg== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean The boot source node path for emmc is using the old sdhci name. Replace with correct mmc name and also add same-as-spl to boot order. Fixes: 0d61f8e5f1c0 ("rockchip: rk3568: add boot device detection") Signed-off-by: Jonas Karlman Reviewed-by: Kever Yang --- arch/arm/dts/rk356x-u-boot.dtsi | 2 +- arch/arm/mach-rockchip/rk3568/rk3568.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/dts/rk356x-u-boot.dtsi b/arch/arm/dts/rk356x-u-boot.dtsi index 23316410496d..04a7b0a0f668 100644 --- a/arch/arm/dts/rk356x-u-boot.dtsi +++ b/arch/arm/dts/rk356x-u-boot.dtsi @@ -12,7 +12,7 @@ }; chosen { - u-boot,spl-boot-order = &sdhci, &sdmmc0; + u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc0; }; dmc: dmc { diff --git a/arch/arm/mach-rockchip/rk3568/rk3568.c b/arch/arm/mach-rockchip/rk3568/rk3568.c index 4a08820a0937..69ef19cc85af 100644 --- a/arch/arm/mach-rockchip/rk3568/rk3568.c +++ b/arch/arm/mach-rockchip/rk3568/rk3568.c @@ -82,7 +82,7 @@ static struct mm_region rk3568_mem_map[] = { }; const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = { - [BROM_BOOTSOURCE_EMMC] = "/sdhci@fe310000", + [BROM_BOOTSOURCE_EMMC] = "/mmc@fe310000", [BROM_BOOTSOURCE_SPINOR] = "/spi@fe300000/flash@0", [BROM_BOOTSOURCE_SD] = "/mmc@fe2b0000", }; From patchwork Tue Mar 14 00:38:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 1756636 X-Patchwork-Delegate: ykai007@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.a=rsa-sha256 header.s=s1 header.b=Jncwz3in; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PbF5k5pp6z1yWp for ; Tue, 14 Mar 2023 11:39:22 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2FC9386139; Tue, 14 Mar 2023 01:38:42 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.b="Jncwz3in"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1A7FD85F94; Tue, 14 Mar 2023 01:38:32 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE, SPF_PASS,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.2 Received: from wrqvtbkv.outbound-mail.sendgrid.net (wrqvtbkv.outbound-mail.sendgrid.net [149.72.123.24]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id DC7F885966 for ; Tue, 14 Mar 2023 01:38:25 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bounces+31435339-7456-u-boot=lists.denx.de@em2124.kwiboo.se DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=from:subject:in-reply-to:references:mime-version:to:cc: content-transfer-encoding:content-type:cc:content-type:from:subject:to; s=s1; bh=teAvI4yuo8H/+vwjjgYpQe3wA0JCzouoyY4lrC4Z5rc=; b=Jncwz3inmwYQ0UnGhO6sMWq/fDCpjVp1lOdY+quf2cLOIKppjf0OPfS7dDe4ui7PBX3v NIZHcg8xjQK20gototm4U4jj0YPX/yXChNHGCQqobNUb2i7zDzmy8TfU0tkvzi2+0UJrrF HM5CM/1+oReyF1w433FzUtOfNJWUe13bmRP/ssO3KCHsPitxW48hePnr7z4qKBOIWMWteF eDqFZS5SNSNgxQdS8RdBrPLFxaEl+KVsYHioNGDz0/th4Mzha7ktMKfOVtOgBx9GDs0QXj JBtUB4jgrzeGR52xsZxa5nfo1ebcGHDa2L25+Nvo2iMTXBmNJfHtL6rbAKhe9qWg== Received: by filterdrecv-68f8d557c9-vlqms with SMTP id filterdrecv-68f8d557c9-vlqms-1-640FC200-1B 2023-03-14 00:38:24.419414003 +0000 UTC m=+1731965.272174852 Received: from bionic.localdomain (unknown) by geopod-ismtpd-8 (SG) with ESMTP id 33dYYrTfTVu7AHhuhFZkyg Tue, 14 Mar 2023 00:38:24.154 +0000 (UTC) From: Jonas Karlman Subject: [PATCH 03/12] rockchip: rk3568-rock-3a: Sync device tree from linux Date: Tue, 14 Mar 2023 00:38:24 +0000 (UTC) Message-Id: <20230314003755.512696-4-jonas@kwiboo.se> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230314003755.512696-1-jonas@kwiboo.se> References: <20230314003755.512696-1-jonas@kwiboo.se> MIME-Version: 1.0 X-SG-EID: TdbjyGynYnRZWhH+7lKUQJL+ZxmxpowvO2O9SQF5CwCVrYgcwUXgU5DKUU3QxAfZekEeQsTe+RrMu3cja6a0h4PKwq6DrD9vvQs3uniE/99Z3SkfcMcOU7ssYw6YnswA5L9mxUBpD53WMZVwbXIs3lJuEnOqEPgIL32rrDMwhbVSo3jdqohp1oA3lUjeVmVo59eO01d2L0fhpqIZ0E4e5+yLeVpQfceCerrxWHQoADs1yMXxSk3+G6jCXQwOD7DY To: Kever Yang , Simon Glass , Philipp Tomsich , Akash Gajjar Cc: Jagan Teki , Eugen Hristev , u-boot@lists.denx.de, Jonas Karlman X-Entity-ID: P7KYpSJvGCELWjBME/J5tg== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Running U-Boot from eMMC on a ROCK 3 Model A result in the following: U-Boot SPL 2023.04-rc3 (Mar 11 2023 - 17:24:48 +0000) Trying to boot from MMC1 Card did not respond to voltage select! : -110 spl: mmc init failed with error: -95 SPL: failed to boot from all boot devices ### ERROR ### Please RESET the board ### The sdhci node is missing in board device tree, sync device tree from linux v6.3-rc1 to fix booting from eMMC. Also disable sdmmc2 and uart1 nodes related to using a WiFi and BT module in the M2 slot. Fixes: b44c54f600ab ("arm64: dts: rockchip: rk3568: Add Radxa ROCK 3 Model A board support") Signed-off-by: Jonas Karlman Reviewed-by: Kever Yang --- arch/arm/dts/rk3568-rock-3a-u-boot.dtsi | 10 +- arch/arm/dts/rk3568-rock-3a.dts | 261 +++++++++++++++++++++++- 2 files changed, 262 insertions(+), 9 deletions(-) diff --git a/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi b/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi index b5ca23a82a20..04bbb01b5d51 100644 --- a/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi +++ b/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi @@ -9,12 +9,16 @@ / { chosen { stdout-path = &uart2; - u-boot,spl-boot-order = "same-as-spl", &sdmmc0; + u-boot,spl-boot-order = "same-as-spl", &sdmmc0, &sdhci; }; }; -&sdmmc0 { - status = "okay"; +&sdmmc2 { + status = "disabled"; +}; + +&uart1 { + status = "disabled"; }; &uart2 { diff --git a/arch/arm/dts/rk3568-rock-3a.dts b/arch/arm/dts/rk3568-rock-3a.dts index a2f2baa4ea91..917f5b2b8aab 100644 --- a/arch/arm/dts/rk3568-rock-3a.dts +++ b/arch/arm/dts/rk3568-rock-3a.dts @@ -1,22 +1,37 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright (c) 2021 Rockchip Electronics Co., Ltd. - * Copyright (c) 2023 Akash Gajjar - */ /dts-v1/; #include +#include #include +#include #include "rk3568.dtsi" / { model = "Radxa ROCK3 Model A"; compatible = "radxa,rock3a", "rockchip,rk3568"; + aliases { + ethernet0 = &gmac1; + mmc0 = &sdhci; + mmc1 = &sdmmc0; + }; + chosen: chosen { stdout-path = "serial2:1500000n8"; }; + hdmi-con { + compatible = "hdmi-connector"; + type = "a"; + + port { + hdmi_con_in: endpoint { + remote-endpoint = <&hdmi_out_con>; + }; + }; + }; + gmac1_clkin: external-gmac1-clock { compatible = "fixed-clock"; clock-frequency = <125000000>; @@ -24,13 +39,93 @@ #clock-cells = <0>; }; + leds { + compatible = "gpio-leds"; + + led_user: led-0 { + gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>; + function = LED_FUNCTION_HEARTBEAT; + color = ; + linux,default-trigger = "heartbeat"; + pinctrl-names = "default"; + pinctrl-0 = <&led_user_en>; + }; + }; + + rk809-sound { + compatible = "simple-audio-card"; + simple-audio-card,format = "i2s"; + simple-audio-card,name = "Analog RK809"; + simple-audio-card,mclk-fs = <256>; + + simple-audio-card,cpu { + sound-dai = <&i2s1_8ch>; + }; + + simple-audio-card,codec { + sound-dai = <&rk809>; + }; + }; + + sdio_pwrseq: sdio-pwrseq { + compatible = "mmc-pwrseq-simple"; + clocks = <&rk809 1>; + clock-names = "ext_clock"; + pinctrl-names = "default"; + pinctrl-0 = <&wifi_enable>; + post-power-on-delay-ms = <100>; + power-off-delay-us = <5000000>; + reset-gpios = <&gpio3 RK_PD4 GPIO_ACTIVE_LOW>; + }; + vcc12v_dcin: vcc12v-dcin-regulator { compatible = "regulator-fixed"; regulator-name = "vcc12v_dcin"; regulator-always-on; regulator-boot-on; - regulator-min-microvolt = <12000000>; - regulator-max-microvolt = <12000000>; + }; + + pcie30_avdd0v9: pcie30-avdd0v9-regulator { + compatible = "regulator-fixed"; + regulator-name = "pcie30_avdd0v9"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <900000>; + regulator-max-microvolt = <900000>; + vin-supply = <&vcc3v3_sys>; + }; + + pcie30_avdd1v8: pcie30-avdd1v8-regulator { + compatible = "regulator-fixed"; + regulator-name = "pcie30_avdd1v8"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + vin-supply = <&vcc3v3_sys>; + }; + + /* pi6c pcie clock generator */ + vcc3v3_pi6c_03: vcc3v3-pi6c-03-regulator { + compatible = "regulator-fixed"; + regulator-name = "vcc3v3_pi6c_03"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + vin-supply = <&vcc5v0_sys>; + }; + + vcc3v3_pcie: vcc3v3-pcie-regulator { + compatible = "regulator-fixed"; + enable-active-high; + gpios = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pcie_enable_h>; + regulator-name = "vcc3v3_pcie"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + vin-supply = <&vcc5v0_sys>; }; vcc3v3_sys: vcc3v3-sys-regulator { @@ -91,6 +186,7 @@ enable-active-high; gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; + pinctrl-0 = <&vcc5v0_usb_otg_en>; regulator-name = "vcc5v0_usb_otg"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; @@ -164,7 +260,43 @@ clock_in_out = "input"; phy-handle = <&rgmii_phy1>; phy-mode = "rgmii-id"; + phy-supply = <&vcc_3v3>; + pinctrl-names = "default"; + pinctrl-0 = <&gmac1m1_miim + &gmac1m1_tx_bus2 + &gmac1m1_rx_bus2 + &gmac1m1_rgmii_clk + &gmac1m1_clkinout + &gmac1m1_rgmii_bus>; + status = "okay"; +}; + +&gpu { + mali-supply = <&vdd_gpu>; + status = "okay"; +}; + +&hdmi { + avdd-0v9-supply = <&vdda0v9_image>; + avdd-1v8-supply = <&vcca1v8_image>; pinctrl-names = "default"; + pinctrl-0 = <&hdmitx_scl &hdmitx_sda &hdmitxm1_cec>; + status = "okay"; +}; + +&hdmi_in { + hdmi_in_vp0: endpoint { + remote-endpoint = <&vp0_out_hdmi>; + }; +}; + +&hdmi_out { + hdmi_out_con: endpoint { + remote-endpoint = <&hdmi_con_in>; + }; +}; + +&hdmi_sound { status = "okay"; }; @@ -441,6 +573,13 @@ }; &i2s1_8ch { + pinctrl-names = "default"; + pinctrl-0 = <&i2s1m0_sclktx &i2s1m0_lrcktx &i2s1m0_sdi0 &i2s1m0_sdo0>; + rockchip,trcm-sync-tx-only; + status = "okay"; +}; + +&i2s2_2ch { rockchip,trcm-sync-tx-only; status = "okay"; }; @@ -457,6 +596,27 @@ }; }; +&pcie2x1 { + pinctrl-names = "default"; + pinctrl-0 = <&pcie_reset_h>; + reset-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>; + vpcie3v3-supply = <&vcc3v3_pcie>; + status = "okay"; +}; + +&pcie30phy { + phy-supply = <&vcc3v3_pi6c_03>; + status = "okay"; +}; + +&pcie3x2 { + pinctrl-names = "default"; + pinctrl-0 = <&pcie30x2m1_pins>; + reset-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>; + vpcie3v3-supply = <&vcc3v3_pcie>; + status = "okay"; +}; + &pinctrl { cam { vcc_cam_en: vcc_cam_en { @@ -551,6 +711,78 @@ status = "okay"; }; +&saradc { + vref-supply = <&vcca_1v8>; + status = "okay"; +}; + +&sdhci { + bus-width = <8>; + max-frequency = <200000000>; + non-removable; + pinctrl-names = "default"; + pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd &emmc_datastrobe>; + vmmc-supply = <&vcc_3v3>; + vqmmc-supply = <&vcc_1v8>; + status = "okay"; +}; + +&sdmmc0 { + bus-width = <4>; + cap-sd-highspeed; + cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>; + disable-wp; + pinctrl-names = "default"; + pinctrl-0 = <&sdmmc0_bus4 &sdmmc0_clk &sdmmc0_cmd &sdmmc0_det>; + sd-uhs-sdr50; + vmmc-supply = <&vcc3v3_sd>; + vqmmc-supply = <&vccio_sd>; + status = "okay"; +}; + +&sdmmc2 { + bus-width = <4>; + disable-wp; + cap-sd-highspeed; + cap-sdio-irq; + keep-power-in-suspend; + mmc-pwrseq = <&sdio_pwrseq>; + non-removable; + pinctrl-names = "default"; + pinctrl-0 = <&sdmmc2m0_bus4 &sdmmc2m0_cmd &sdmmc2m0_clk>; + sd-uhs-sdr104; + vmmc-supply = <&vcc3v3_sys>; + vqmmc-supply = <&vcc_1v8>; + status = "okay"; +}; + +&tsadc { + rockchip,hw-tshut-mode = <1>; + rockchip,hw-tshut-polarity = <0>; + status = "okay"; +}; + +&uart1 { + pinctrl-names = "default"; + pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn &uart1m0_rtsn>; + uart-has-rtscts; + status = "okay"; + + bluetooth { + compatible = "brcm,bcm43438-bt"; + clocks = <&rk809 1>; + clock-names = "lpo"; + device-wakeup-gpios = <&gpio4 RK_PB5 GPIO_ACTIVE_HIGH>; + host-wakeup-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>; + shutdown-gpios = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&bt_host_wake &bt_wake &bt_enable>; + vbat-supply = <&vcc3v3_sys>; + vddio-supply = <&vcc_1v8>; + /* vddio comes from regulator on module, use IO bank voltage instead */ + }; +}; + &uart2 { status = "okay"; }; @@ -607,3 +839,20 @@ phy-supply = <&vcc5v0_usb_host>; status = "okay"; }; + +&vop { + assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>; + assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>; + status = "okay"; +}; + +&vop_mmu { + status = "okay"; +}; + +&vp0 { + vp0_out_hdmi: endpoint@ROCKCHIP_VOP2_EP_HDMI0 { + reg = ; + remote-endpoint = <&hdmi_in_vp0>; + }; +}; From patchwork Tue Mar 14 00:38:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 1756637 X-Patchwork-Delegate: ykai007@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.a=rsa-sha256 header.s=s1 header.b=KKy+wcQd; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PbF5z3yknz1yWp for ; Tue, 14 Mar 2023 11:39:35 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 93F8486145; Tue, 14 Mar 2023 01:38:47 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.b="KKy+wcQd"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 569478612D; Tue, 14 Mar 2023 01:38:33 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_BL_SPAMCOP_NET, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.2 Received: from wrqvwxzv.outbound-mail.sendgrid.net (wrqvwxzv.outbound-mail.sendgrid.net [149.72.154.232]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6CFC685D7B for ; Tue, 14 Mar 2023 01:38:27 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bounces+31435339-7456-u-boot=lists.denx.de@em2124.kwiboo.se DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=from:subject:in-reply-to:references:mime-version:to:cc: content-transfer-encoding:content-type:cc:content-type:from:subject:to; s=s1; bh=XxYf5cSyzv2em2lreJSvfPvyS22iWAIWFe2FHDvhjcU=; b=KKy+wcQdtRVMVNwnxkL7Dk3sbB84eYGUKrPFqW+0ZMgl1/1UQ1Tmn2ctQupqpk7mYrG1 1IjLau7Mh8IcWnhqNAET3oO4gjJ9BwyXga3x9qf+vQZeypD+M5ltnufTaBeWS5NW9K0f7o PmgjDZuiho6VKk/bn1lKRgDjO0lqyAvCjtDOZ/T/DrCfLXSUYhWrUPARLzJQIBGKR3ZBtX 42DNqw0y60hnlGJc4JgiDsjg8PEs1o7HcbkkOXgdgJSQu51VFaGzqDO8DrJEsFuOJfvtIC s+eQNOZbtx3+IbVUI58kBl0nIsy/BZFD7R4oM7DstawmesD4OMHR66rad9VkpzXg== Received: by filterdrecv-5848969764-8hxzr with SMTP id filterdrecv-5848969764-8hxzr-1-640FC201-1F 2023-03-14 00:38:25.824704115 +0000 UTC m=+1731882.339464737 Received: from bionic.localdomain (unknown) by geopod-ismtpd-8 (SG) with ESMTP id EUY3h_8QRVGc-vm_Mv5-Kw Tue, 14 Mar 2023 00:38:25.624 +0000 (UTC) From: Jonas Karlman Subject: [PATCH 04/12] clk: rockchip: rk3568: Fix reset handler Date: Tue, 14 Mar 2023 00:38:26 +0000 (UTC) Message-Id: <20230314003755.512696-5-jonas@kwiboo.se> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230314003755.512696-1-jonas@kwiboo.se> References: <20230314003755.512696-1-jonas@kwiboo.se> MIME-Version: 1.0 X-SG-EID: TdbjyGynYnRZWhH+7lKUQJL+ZxmxpowvO2O9SQF5CwCVrYgcwUXgU5DKUU3QxAfZekEeQsTe+RrMu3cja6a0h+ync1CU1M8MruXHtFYa7eZc/Bywzx4WaUMY2gZ5a7vSTygOmSZBQjN+KAeUUbKrUCiCrI6CLSTydVeYwMdLUB5MG2gF/ipfNICwfsCfIaIXKaKAAmsO5gf0cVfWVtUfdDcyk7fXhIIW9WPrMVpQiixy3Yy/fb5PPBh9Ad0RT3NM To: Kever Yang , Simon Glass , Philipp Tomsich , Lukasz Majewski , Sean Anderson , Elaine Zhang Cc: Jagan Teki , Eugen Hristev , u-boot@lists.denx.de, Jonas Karlman , Peter Geis , Jagan Teki X-Entity-ID: P7KYpSJvGCELWjBME/J5tg== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean From: Peter Geis The reset handler for rk3568 is missing its private data. This leads to an abort when a reset is triggered. => reset resetting ... "Synchronous Abort" handler, esr 0x96000045 elr: 0000000000a2bc04 lr : 0000000000a2bbd4 (reloc) elr: 00000000eff9bc04 lr : 00000000eff9bbd4 x0 : 00000000fdd20000 x1 : 0000000014000001 x2 : 000000000000fdb9 x3 : 00000000edf77e88 x4 : 00000000edf50e78 x5 : 00000000edf77530 x6 : 000000000000001d x7 : 00000000edf8a1d0 x8 : 00000000ffffffd8 x9 : 0000000000000008 x10: 000000000000000d x11: 0000000000000006 x12: 000000000001869f x13: 0000000086c290c5 x14: 000000009118e878 x15: 0000000000000000 x16: 00000000eff9bbb8 x17: 0000000012f8c119 x18: 00000000edf50dc0 x19: 0000000000000000 x20: 0000000000000001 x21: 0000000000000000 x22: 00000000edf85900 x23: 0000000000000001 x24: 00000000effe8bbc x25: 0000000000000000 x26: 00000000edf85940 x27: 0000000000000000 x28: 0000000000000000 x29: 00000000edf3c8e0 Code: d65f03c0 d5033fbf b9400661 529d9502 (b8216802) Resetting CPU ... Add the missing dev_set_priv to the rk3568 clk driver to fix this. Fixes: 4a262feba3a5 ("rockchip: rk3568: add clock driver") Signed-off-by: Peter Geis Reviewed-by: Kever Yang Reviewed-by: Jagan Teki Tested-by: Jagan Teki # radxa-cm3 Signed-off-by: Jonas Karlman --- Link: https://patchwork.ozlabs.org/project/uboot/patch/20220222013131.3114990-2-pgwipeout@gmail.com/ drivers/clk/rockchip/clk_rk3568.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/clk/rockchip/clk_rk3568.c b/drivers/clk/rockchip/clk_rk3568.c index 99c195b3afe3..253b69504f93 100644 --- a/drivers/clk/rockchip/clk_rk3568.c +++ b/drivers/clk/rockchip/clk_rk3568.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include @@ -2937,6 +2938,7 @@ static int rk3568_clk_bind(struct udevice *dev) glb_srst_fst); priv->glb_srst_snd_value = offsetof(struct rk3568_cru, glb_srsr_snd); + dev_set_priv(sys_child, priv); } #if CONFIG_IS_ENABLED(RESET_ROCKCHIP) From patchwork Tue Mar 14 00:38:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 1756639 X-Patchwork-Delegate: ykai007@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.a=rsa-sha256 header.s=s1 header.b=j0su98zj; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PbF6R5Tdgz1yWp for ; Tue, 14 Mar 2023 11:39:59 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F31758616D; Tue, 14 Mar 2023 01:39:13 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.b="j0su98zj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9FD8185E71; Tue, 14 Mar 2023 01:38:40 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_BL_SPAMCOP_NET, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.2 Received: from wrqvtzvf.outbound-mail.sendgrid.net (wrqvtzvf.outbound-mail.sendgrid.net [149.72.126.143]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id C576985DC9 for ; Tue, 14 Mar 2023 01:38:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bounces+31435339-7456-u-boot=lists.denx.de@em2124.kwiboo.se DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=from:subject:in-reply-to:references:mime-version:to:cc: content-transfer-encoding:content-type:cc:content-type:from:subject:to; s=s1; bh=pNa6FKYb8OjNRzBmqnfX5C8v2tbxkyqssX0mckYMEcU=; b=j0su98zjH+9CJF+QMmv1hPagU+qmXBLEChP7UNYx4K2GDKPqFF10bZEmYkJpZ7LSCiVR TL8hIWDOQFyB3WEAN7n+aWP+r6Fj1ITuYzJsLF1yPErbiM7FJ9guixb7toum+aSuX6EzS0 UhnNnEVJGcaFPym9Mi1iBKcR5Enw/UpzSD4zC4rXDDaT9gba3Q0hk3nmYWicN6/MnXy4eI 1bMslzx+QSCOIs9be1GW/73KmtTMNLoq1Q2o9GByTcn3HO8cMhRaI9ke77CdSX1RLAvVXn 9hWREXf/ubSIEp5VdpOdhQNrr9j88o7aDzppFu81MKp0raR6c2XX1ISuZ70zutVw== Received: by filterdrecv-5848969764-ck886 with SMTP id filterdrecv-5848969764-ck886-1-640FC203-4 2023-03-14 00:38:27.331525882 +0000 UTC m=+1732008.623435520 Received: from bionic.localdomain (unknown) by geopod-ismtpd-8 (SG) with ESMTP id rOv5J8yAQfWUNUkE7Y1aeg Tue, 14 Mar 2023 00:38:27.134 +0000 (UTC) From: Jonas Karlman Subject: [PATCH 05/12] clk: rockchip: rk3588: Fix clk_aux16m in clock driver Date: Tue, 14 Mar 2023 00:38:27 +0000 (UTC) Message-Id: <20230314003755.512696-6-jonas@kwiboo.se> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230314003755.512696-1-jonas@kwiboo.se> References: <20230314003755.512696-1-jonas@kwiboo.se> MIME-Version: 1.0 X-SG-EID: TdbjyGynYnRZWhH+7lKUQJL+ZxmxpowvO2O9SQF5CwCVrYgcwUXgU5DKUU3QxAfZekEeQsTe+RrMu3cja6a0hxoJz7P0F+YtpKVSvrxtVIWFvmRBfoy+y3MUgd3TCnPR0kNiDFrr+vId7eisQE9pBhcGbV9SjrH+ZSxQmmjSnbnLN8OOfCbHBbUCi3rlN2zpVRC/9QZi6BwGceVhyY2QtAvUaJedcHfFNulZmlvyLlJyuX5ci93MFZA6TAOpXMOx To: Kever Yang , Simon Glass , Philipp Tomsich , Lukasz Majewski , Sean Anderson , Elaine Zhang , Jagan Teki Cc: Eugen Hristev , u-boot@lists.denx.de, Jonas Karlman X-Entity-ID: P7KYpSJvGCELWjBME/J5tg== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean The rate and error value is not returned for aux16m clocks, fix this. Fixes: 7a474df74023 ("clk: rockchip: Add rk3588 clk support") Signed-off-by: Jonas Karlman Reviewed-by: Kever Yang --- drivers/clk/rockchip/clk_rk3588.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/clk/rockchip/clk_rk3588.c b/drivers/clk/rockchip/clk_rk3588.c index 5271d9434831..a7df553e8750 100644 --- a/drivers/clk/rockchip/clk_rk3588.c +++ b/drivers/clk/rockchip/clk_rk3588.c @@ -1558,7 +1558,7 @@ static ulong rk3588_clk_get_rate(struct clk *clk) #ifndef CONFIG_SPL_BUILD case CLK_AUX16M_0: case CLK_AUX16M_1: - rk3588_aux16m_get_clk(priv, clk->id); + rate = rk3588_aux16m_get_clk(priv, clk->id); break; case ACLK_VOP_ROOT: case ACLK_VOP: @@ -1707,7 +1707,7 @@ static ulong rk3588_clk_set_rate(struct clk *clk, ulong rate) #ifndef CONFIG_SPL_BUILD case CLK_AUX16M_0: case CLK_AUX16M_1: - rk3588_aux16m_set_clk(priv, clk->id, rate); + ret = rk3588_aux16m_set_clk(priv, clk->id, rate); break; case ACLK_VOP_ROOT: case ACLK_VOP: From patchwork Tue Mar 14 00:38:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 1756641 X-Patchwork-Delegate: ykai007@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.a=rsa-sha256 header.s=s1 header.b=ipoZi0uj; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PbF6t5NM8z247D for ; Tue, 14 Mar 2023 11:40:22 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E95CD860F3; Tue, 14 Mar 2023 01:39:21 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.b="ipoZi0uj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9ECC686145; Tue, 14 Mar 2023 01:38:40 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_BL_SPAMCOP_NET, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.2 Received: from wrqvtzvf.outbound-mail.sendgrid.net (wrqvtzvf.outbound-mail.sendgrid.net [149.72.126.143]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 7EBB585E71 for ; Tue, 14 Mar 2023 01:38:30 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bounces+31435339-7456-u-boot=lists.denx.de@em2124.kwiboo.se DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=from:subject:in-reply-to:references:mime-version:to:cc: content-transfer-encoding:content-type:cc:content-type:from:subject:to; s=s1; bh=YFjUB3DU4XZQxDBui1yLgQHTkWrZXppLudNr5CtAjs4=; b=ipoZi0ujGeWGbz4cV2Q1qPeeXuoNaGH4fF4TiWu3i+XvKHyyN6glc0GVEZ3Bqh9GT1Ro flIzYqCkcdCHyVdkz54xTiftInmMsxF0d+mOj1uzQgRKFGfDT4WtHI0zm+uR+vzsnf7bDH ratX39T+zWkMMZa9yFKPZaR/8KQYb0k6J/3BZH26gsPsY0kI24jKBV6/xKGTa8dksATu5H ErLn9TgB38pjv8EOlmJ7JBU507HGLDzkhCo2JyM0gsbLZXgTaCn90xlaIcj3fZxaxIxp2y TEyRy9jTdpxqpRfaBvqvryVKcBcULIJikSk4mxxZgsi4DuVu7FAIfZk8OW2Ld8Lw== Received: by filterdrecv-59cb65cf6d-qj8b6 with SMTP id filterdrecv-59cb65cf6d-qj8b6-1-640FC204-15 2023-03-14 00:38:28.669918367 +0000 UTC m=+458846.715192769 Received: from bionic.localdomain (unknown) by geopod-ismtpd-8 (SG) with ESMTP id sUPfWlXnQnKeNUnlnHn1Cw Tue, 14 Mar 2023 00:38:28.415 +0000 (UTC) From: Jonas Karlman Subject: [PATCH 06/12] rockchip: rk3588-rock-5b: Fix sdmmc boot Date: Tue, 14 Mar 2023 00:38:28 +0000 (UTC) Message-Id: <20230314003755.512696-7-jonas@kwiboo.se> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230314003755.512696-1-jonas@kwiboo.se> References: <20230314003755.512696-1-jonas@kwiboo.se> MIME-Version: 1.0 X-SG-EID: TdbjyGynYnRZWhH+7lKUQJL+ZxmxpowvO2O9SQF5CwCVrYgcwUXgU5DKUU3QxAfZekEeQsTe+RrMu3cja6a0h9iwD0pPrCUEggNb7hbqr2zQkyTPykH/0+gmnEyvq7n93DJpXgQOkAWV0fmL7G8VrOnQg+08nrU+Z+hiukSRhvcAGaiv0x8WhjqAAb+rNf/UxD3NN5/mqd15teI6Wi2zEpNp1ikd0dQwQxOsdTvtemfSLQLpLVezRtT0B0gq3dGl To: Kever Yang , Simon Glass , Philipp Tomsich , Eugen Hristev Cc: Jagan Teki , u-boot@lists.denx.de, Jonas Karlman X-Entity-ID: P7KYpSJvGCELWjBME/J5tg== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Running U-Boot from a SD-card on ROCK 5 Model B fails to load atf using DMA and prints debug_uart messages. U-Boot SPL 2023.04-rc3 (Mar 12 2023 - 00:30:16 +0000) Trying to boot from MMC1 ## Checking hash(es) for config config-1 ... OK ## Checking hash(es) for Image atf-1 ... sha256 error! Bad hash value for 'hash' hash node in 'atf-1' image node mmc_load_image_raw_sector: mmc block read error SPL: failed to boot from all boot devices ### ERROR ### Please RESET the board ### Use fifo-mode to disable DMA in SPL, add same-as-spl to boot-order and remove DEBUG_UART_ANNOUNCE option to fix this. Signed-off-by: Jonas Karlman Reviewed-by: Kever Yang --- arch/arm/dts/rk3588-rock-5b-u-boot.dtsi | 3 ++- configs/rock5b-rk3588_defconfig | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi index 2386edf90deb..36d557b4934d 100644 --- a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi +++ b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi @@ -11,12 +11,13 @@ }; chosen { - u-boot,spl-boot-order = &sdmmc; + u-boot,spl-boot-order = "same-as-spl", &sdmmc; }; }; &sdmmc { bus-width = <4>; u-boot,dm-spl; + u-boot,spl-fifo-mode; status = "okay"; }; diff --git a/configs/rock5b-rk3588_defconfig b/configs/rock5b-rk3588_defconfig index 66199387195a..3fcc6a26bb51 100644 --- a/configs/rock5b-rk3588_defconfig +++ b/configs/rock5b-rk3588_defconfig @@ -66,6 +66,5 @@ CONFIG_PWM_ROCKCHIP=y CONFIG_SPL_RAM=y CONFIG_BAUDRATE=1500000 CONFIG_DEBUG_UART_SHIFT=2 -CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_SYSRESET=y CONFIG_ERRNO_STR=y From patchwork Tue Mar 14 00:38:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 1756638 X-Patchwork-Delegate: ykai007@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.a=rsa-sha256 header.s=s1 header.b=E9DnC/SM; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PbF6C6SBNz1yWp for ; Tue, 14 Mar 2023 11:39:47 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 10F1B85BB7; Tue, 14 Mar 2023 01:38:56 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.b="E9DnC/SM"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9A7A486139; Tue, 14 Mar 2023 01:38:39 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_BL_SPAMCOP_NET, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.2 Received: from wrqvtzvf.outbound-mail.sendgrid.net (wrqvtzvf.outbound-mail.sendgrid.net [149.72.126.143]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 4B20585E75 for ; Tue, 14 Mar 2023 01:38:31 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bounces+31435339-7456-u-boot=lists.denx.de@em2124.kwiboo.se DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=from:subject:in-reply-to:references:mime-version:to:cc: content-transfer-encoding:content-type:cc:content-type:from:subject:to; s=s1; bh=HGXA5EteixWntDdpkCFw0slGu+p6W1JLwNx3WIGmd8w=; b=E9DnC/SM/+3ZV/dQma+ARJQldwBeNlUWt07wln8QRJKi/rAMbns0i7P6obF68jKea0+N JRwlaH68Z+/Dufr7dTd5wNKWX3VZif445OedxBWWApUqEqQJ854ComlPru2YzOdfqRDdHY 7P/qWL3cG8aS85MF9EN6N5KLNX5lUUbOfpDeMXgyF4KCwCdSZXnaIh4ATrltGZKHn/GOc2 Gma9drzk1Vg9tzyhz5NOZixIfAjjG57uaIbjJmWVoSXC3QBQ4oAW4mFAMLIQEtNLCcXU9D eqQ0FvbNrl93DuRZcdfw31WtmpkYqhm8kxoYGWmwwsVjzgHfk1i5a8kTQy1g84yA== Received: by filterdrecv-68f8d557c9-cxx9p with SMTP id filterdrecv-68f8d557c9-cxx9p-1-640FC205-33 2023-03-14 00:38:29.964077049 +0000 UTC m=+1732020.087912897 Received: from bionic.localdomain (unknown) by geopod-ismtpd-8 (SG) with ESMTP id AHLugkNfQf2artUS1GU3cA Tue, 14 Mar 2023 00:38:29.761 +0000 (UTC) From: Jonas Karlman Subject: [PATCH 07/12] rockchip: rk3588: Add boot device detection Date: Tue, 14 Mar 2023 00:38:30 +0000 (UTC) Message-Id: <20230314003755.512696-8-jonas@kwiboo.se> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230314003755.512696-1-jonas@kwiboo.se> References: <20230314003755.512696-1-jonas@kwiboo.se> MIME-Version: 1.0 X-SG-EID: TdbjyGynYnRZWhH+7lKUQJL+ZxmxpowvO2O9SQF5CwCVrYgcwUXgU5DKUU3QxAfZekEeQsTe+RrMu3cja6a0hw4lz0TTf4nawsNJ292kzb5dMdqcknYV1JEXIU3J8m1dP4oUN4ZNFWVcSg1pGKFouD0/DG+wS0nUb9sz90aqI3VaeIB6IC46rcWiEZZwN5Y3ZRvRdIM1ZOAyHEZmlbs0qj3e3jVxY1jwgzsOUbsMmMC4LyY8Td6gkViw1c2WFaPg To: Kever Yang , Simon Glass , Philipp Tomsich Cc: Jagan Teki , Eugen Hristev , u-boot@lists.denx.de, Jonas Karlman X-Entity-ID: P7KYpSJvGCELWjBME/J5tg== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Enable SPL on RK3588 to detect which device it was booted from. Fixes use of same-as-spl in u-boot,spl-boot-order prop. Signed-off-by: Jonas Karlman Reviewed-by: Kever Yang --- arch/arm/mach-rockchip/rk3588/rk3588.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm/mach-rockchip/rk3588/rk3588.c b/arch/arm/mach-rockchip/rk3588/rk3588.c index 2ee1db47671f..18e67b5ca9b2 100644 --- a/arch/arm/mach-rockchip/rk3588/rk3588.c +++ b/arch/arm/mach-rockchip/rk3588/rk3588.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include @@ -36,6 +37,12 @@ DECLARE_GLOBAL_DATA_PTR; #define BUS_IOC_GPIO2D_IOMUX_SEL_H 0x5c #define BUS_IOC_GPIO3A_IOMUX_SEL_L 0x60 +const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = { + [BROM_BOOTSOURCE_EMMC] = "/mmc@fe2e0000", + [BROM_BOOTSOURCE_SPINOR] = "/spi@fe2b0000/flash@0", + [BROM_BOOTSOURCE_SD] = "/mmc@fe2c0000", +}; + static struct mm_region rk3588_mem_map[] = { { .virt = 0x0UL, From patchwork Tue Mar 14 00:38:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 1756640 X-Patchwork-Delegate: ykai007@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.a=rsa-sha256 header.s=s1 header.b=ij9+oSzl; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PbF6h0xy5z247D for ; Tue, 14 Mar 2023 11:40:12 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5895B86185; Tue, 14 Mar 2023 01:39:17 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.b="ij9+oSzl"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4A60585DF9; Tue, 14 Mar 2023 01:38:42 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_BL_SPAMCOP_NET, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.2 Received: from wrqvtzvf.outbound-mail.sendgrid.net (wrqvtzvf.outbound-mail.sendgrid.net [149.72.126.143]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E179B860F7 for ; Tue, 14 Mar 2023 01:38:32 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bounces+31435339-7456-u-boot=lists.denx.de@em2124.kwiboo.se DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=from:subject:in-reply-to:references:mime-version:to:cc: content-transfer-encoding:content-type:cc:content-type:from:subject:to; s=s1; bh=4/Wx/dDI3NVetohpeHkzCPMiIJesIDGt/0A7ymi1sSw=; b=ij9+oSzl/eYKmlV3izuvsh+PCBQB4rujt4DSgVbBlJ2wHFndUn3+FqnY31WvU41pEQND CfGe6s9vBCi5LY/ecw5sRyd1e4fKl2WA694N9np/k+WZPu7Vg3gPgM0EQsp4o7qL2IGXQn n5ipDdpENOuKP4ESRV8y8tKC2L3HmFsXvqnum7SpFL/dPtTpJ8a2BsVmniCKQGZ9Y20B1S LTUvD3ykZH5clrA9rzJ/KCfJBL0tUKcXkXEu/eSUkR0rMH39aoXx/F+IWZGlQ5ZcuopIOR 24fZmDRU3ELt1W2c10GT7MxeqXE4EJ8K7J8tvhaxx4pin+2CK2gYMxkNV6Vp+9DA== Received: by filterdrecv-68f8d557c9-cxx9p with SMTP id filterdrecv-68f8d557c9-cxx9p-1-640FC207-11 2023-03-14 00:38:31.384312245 +0000 UTC m=+1732021.508148109 Received: from bionic.localdomain (unknown) by geopod-ismtpd-8 (SG) with ESMTP id MviV9rSeT3GK7Gb5qyryOQ Tue, 14 Mar 2023 00:38:31.184 +0000 (UTC) From: Jonas Karlman Subject: [PATCH 08/12] rockchip: tinker-rk3288: Use common BOOT_TARGET_DEVICES Date: Tue, 14 Mar 2023 00:38:31 +0000 (UTC) Message-Id: <20230314003755.512696-9-jonas@kwiboo.se> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230314003755.512696-1-jonas@kwiboo.se> References: <20230314003755.512696-1-jonas@kwiboo.se> MIME-Version: 1.0 X-SG-EID: TdbjyGynYnRZWhH+7lKUQJL+ZxmxpowvO2O9SQF5CwCVrYgcwUXgU5DKUU3QxAfZekEeQsTe+RrMu3cja6a0hxRmAiYw2QigXQmP51/LRKBCqfm8RlCdjw8pAf2NhAHfhyzd7iuZ6kDCiqeCnO3zqINytdDXeFfCJAGE8R7ErIwJa3g5VfNizh4ELoR4ElY+9QWIripTPQT8YZvnotT8E4PAlz15mDs9EsyXBrQmvBuKZ7UGDcXOAZUA4pe+wtjs To: Kever Yang , Simon Glass , Philipp Tomsich , Lin Huang , Michael Trimarchi Cc: Jagan Teki , Eugen Hristev , u-boot@lists.denx.de, Jonas Karlman X-Entity-ID: P7KYpSJvGCELWjBME/J5tg== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Building U-Boot for Tinker Board with USB or NET Kconfig option disabled result in the following build error: In file included from include/configs/rk3288_common.h:29, from include/configs/tinker_rk3288.h:14, from include/config.h:3, from include/common.h:16, from env/common.c:10: include/config_distro_bootcmd.h:302:9: error: expected '}' before 'BOOT_TARGET_DEVICES_references_USB_without_CONFIG_CMD_USB' 302 | BOOT_TARGET_DEVICES_references_USB_without_CONFIG_CMD_USB | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ include/config_distro_bootcmd.h:302:9: note: in definition of macro 'BOOTENV_DEV_NAME_USB' 302 | BOOT_TARGET_DEVICES_references_USB_without_CONFIG_CMD_USB | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ include/configs/tinker_rk3288.h:21:9: note: in expansion of macro 'BOOTENV_DEV_NAME' 21 | func(USB, usb, 0) \ | ^~~~ include/config_distro_bootcmd.h:454:25: note: in expansion of macro 'BOOT_TARGET_DEVICES' 454 | "boot_targets=" BOOT_TARGET_DEVICES(BOOTENV_DEV_NAME) "\0" | ^~~~~~~~~~~~~~~~~~~ include/config_distro_bootcmd.h:474:9: note: in expansion of macro 'BOOTENV_BOOT_TARGETS' 474 | BOOTENV_BOOT_TARGETS \ | ^~~~~~~~~~~~~~~~~~~~ include/configs/rk3288_common.h:40:9: note: in expansion of macro 'BOOTENV' 40 | BOOTENV | ^~~~~~~ include/env_default.h:122:9: note: in expansion of macro 'CFG_EXTRA_ENV_SETTINGS' 122 | CFG_EXTRA_ENV_SETTINGS | ^~~~~~~~~~~~~~~~~~~~~~ In file included from env/common.c:32: include/env_default.h:29:36: note: to match this '{' 29 | const char default_environment[] = { | ^ make[2]: *** [scripts/Makefile.build:256: env/common.o] Error 1 The BOOT_TARGET_DEVICES defined in rockchip-common.h include the same devices as defined in tinker_rk3288.h, remove the board specific one to fix building with USB or NET option disabled. Signed-off-by: Jonas Karlman Reviewed-by: Kever Yang --- include/configs/tinker_rk3288.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/include/configs/tinker_rk3288.h b/include/configs/tinker_rk3288.h index 269ec529a340..053c9032e2da 100644 --- a/include/configs/tinker_rk3288.h +++ b/include/configs/tinker_rk3288.h @@ -13,13 +13,4 @@ #include -#undef BOOT_TARGET_DEVICES - -#define BOOT_TARGET_DEVICES(func) \ - func(MMC, mmc, 0) \ - func(MMC, mmc, 1) \ - func(USB, usb, 0) \ - func(PXE, pxe, na) \ - func(DHCP, dchp, na) - #endif From patchwork Tue Mar 14 00:38:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 1756645 X-Patchwork-Delegate: ykai007@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.a=rsa-sha256 header.s=s1 header.b=G5QtNVE8; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PbF7l5tWrz247D for ; Tue, 14 Mar 2023 11:41:07 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 31E0D8615A; Tue, 14 Mar 2023 01:39:48 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.b="G5QtNVE8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4B6D685DBB; Tue, 14 Mar 2023 01:38:45 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE, SPF_PASS,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.2 Received: from wrqvtbkv.outbound-mail.sendgrid.net (wrqvtbkv.outbound-mail.sendgrid.net [149.72.123.24]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1860E85D7B for ; Tue, 14 Mar 2023 01:38:33 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bounces+31435339-7456-u-boot=lists.denx.de@em2124.kwiboo.se DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=from:subject:in-reply-to:references:mime-version:to:cc: content-transfer-encoding:content-type:cc:content-type:from:subject:to; s=s1; bh=bUJjUQKNyrx+fJipiCChqR66iCeeJbrz9r/iw1l784g=; b=G5QtNVE8ReUU+dH1hr3xgdHohb04p0TS1mnxl0fE0JAk6NeNXIyVE+opsdPSFh08GRRS YM734OK2IHiZLiUhwwy54EcXgHrKI0KscT4uJ8Xu249L4vOFXON4fyVktexUVm2ruxxNPS a2YyLkbYxZ6pw3m/HOxkgiYx8Lw06mWhBUTCzDeDKkU6Hb/FSu6mx/3lwUQRc/5MB7X3I2 p86xed2RCV+nkn4JCufeBN6nqBda+z8TzeyotArY7ZfHW7Ev3sDDloGSE/ZmuFl0IPdlz1 PPZWZjNSHIOXC2peHxMzIfFpxyGCrFby2ygk65iJ8Kogqd1QGgyv01i2ZTHNGz9g== Received: by filterdrecv-68f8d557c9-z8zks with SMTP id filterdrecv-68f8d557c9-z8zks-1-640FC208-10 2023-03-14 00:38:32.646335175 +0000 UTC m=+1731918.918798860 Received: from bionic.localdomain (unknown) by geopod-ismtpd-8 (SG) with ESMTP id 6cGs25P-R--M4hAB3QVy7A Tue, 14 Mar 2023 00:38:32.455 +0000 (UTC) From: Jonas Karlman Subject: [PATCH 09/12] mmc: rockchip_dw_mmc: Fix get_mmc_clk return value Date: Tue, 14 Mar 2023 00:38:32 +0000 (UTC) Message-Id: <20230314003755.512696-10-jonas@kwiboo.se> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230314003755.512696-1-jonas@kwiboo.se> References: <20230314003755.512696-1-jonas@kwiboo.se> MIME-Version: 1.0 X-SG-EID: TdbjyGynYnRZWhH+7lKUQJL+ZxmxpowvO2O9SQF5CwCVrYgcwUXgU5DKUU3QxAfZekEeQsTe+RrMu3cja6a0h/LNFVHw8JpnKlepKFhml5tSfkD5wnAyyfdZ4r/TnleuossCKajRRMaBrBIn37LEt53aCp8nsqRAGs9LWCMv4+k8bYg15l1WUiG1v4zkKTn70Oe6bmsB6gcYPfI+VT7UJT8F73LtJo9Jvw8teTTtXqxRGzUadm6j/YM3JPQLeLDm To: Kever Yang , Simon Glass , Philipp Tomsich , Peng Fan , Jaehoon Chung Cc: Jagan Teki , Eugen Hristev , u-boot@lists.denx.de, Jonas Karlman X-Entity-ID: P7KYpSJvGCELWjBME/J5tg== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean The get_mmc_clk ops is expected to set a clock rate and return the configured rate as an unsigned value. However, if clk_set_rate fails, e.g. using a fixed rate clock, a negative error value is returned. The mmc core will treat this as a valid unsigned rate and tries to configure a divider based on this bogus clock rate. Use 0 as the return value when setting clock rate fails, the mmc core will configure to use bypass mode instead of using a bogus divider. Signed-off-by: Jonas Karlman Reviewed-by: Kever Yang --- drivers/mmc/rockchip_dw_mmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/rockchip_dw_mmc.c b/drivers/mmc/rockchip_dw_mmc.c index 3661ce33143e..72c820ee6330 100644 --- a/drivers/mmc/rockchip_dw_mmc.c +++ b/drivers/mmc/rockchip_dw_mmc.c @@ -52,7 +52,7 @@ static uint rockchip_dwmmc_get_mmc_clk(struct dwmci_host *host, uint freq) ret = clk_set_rate(&priv->clk, freq); if (ret < 0) { debug("%s: err=%d\n", __func__, ret); - return ret; + return 0; } return freq; From patchwork Tue Mar 14 00:38:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 1756642 X-Patchwork-Delegate: ykai007@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.a=rsa-sha256 header.s=s1 header.b=A21LJ7um; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PbF754y8Lz247D for ; Tue, 14 Mar 2023 11:40:33 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AE58886164; Tue, 14 Mar 2023 01:39:27 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.b="A21LJ7um"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 26B0285E75; Tue, 14 Mar 2023 01:38:47 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE, SPF_PASS,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.2 Received: from wrqvtbkv.outbound-mail.sendgrid.net (wrqvtbkv.outbound-mail.sendgrid.net [149.72.123.24]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B97EC85F94 for ; Tue, 14 Mar 2023 01:38:35 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bounces+31435339-7456-u-boot=lists.denx.de@em2124.kwiboo.se DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=from:subject:in-reply-to:references:mime-version:to:cc: content-transfer-encoding:content-type:cc:content-type:from:subject:to; s=s1; bh=fSVrjpG7tjSdtw5zBuv7GQ/nqUW5b7gj7x2mN8mMlno=; b=A21LJ7umonOhg996tpcRaUsadKhC90Kty3UA9QYxgZqTM6rdGUh7F2C/uBTYe/NaIJ9o +BZDHCl8WotO2OT6ZOZPltOpHfgJKBGBnXrwjXRUOiFNlPutOuGXBXZh/NPLFuss6k9Wx0 h1a6K0ViBo0vpCIW+Uo8tFx0TIp7hOPK8GkHKKyiJ36RviQIfU1FazHxWSwO4laQ31YoMX BqvOZMyPN3AatagleW2MNECIg3DFL+gSPWj41BeF/VBuWaoPTSEHIzJ9nWgzdWelvhRT2i J3WD+3X6/63aBpVYL2X9CEOgUvBcFKicYZP2YdZikrOj6IYkwqaSH2tbcC9rvBLA== Received: by filterdrecv-5848969764-8hxzr with SMTP id filterdrecv-5848969764-8hxzr-1-640FC20A-14 2023-03-14 00:38:34.491932769 +0000 UTC m=+1731891.006693404 Received: from bionic.localdomain (unknown) by geopod-ismtpd-8 (SG) with ESMTP id mgyKdIngQRq9IcJIYTR8Nw Tue, 14 Mar 2023 00:38:34.290 +0000 (UTC) From: Jonas Karlman Subject: [PATCH 10/12] rockchip: include: configs: Remove dangling comments Date: Tue, 14 Mar 2023 00:38:34 +0000 (UTC) Message-Id: <20230314003755.512696-11-jonas@kwiboo.se> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230314003755.512696-1-jonas@kwiboo.se> References: <20230314003755.512696-1-jonas@kwiboo.se> MIME-Version: 1.0 X-SG-EID: TdbjyGynYnRZWhH+7lKUQJL+ZxmxpowvO2O9SQF5CwCVrYgcwUXgU5DKUU3QxAfZekEeQsTe+RrMu3cja6a0h3QO6DKA4TBosf+LfjTVP7WIcl5copSbguD13T4DFx+lAA/HlUynrdQo9KbHo9rIdIbkqG+J/WEAj+Hbxtuh2245FpZzsZ6VkizLBp0GOSkcXC5KYRrqo95zKObYVWFjWbGmL9HeJ8e7b2Wmgg97nq8onCWWqNzlUU+4SFYluwj8 To: Kever Yang , Simon Glass , Philipp Tomsich , Jagan Teki Cc: Jagan Teki , Eugen Hristev , u-boot@lists.denx.de, Jonas Karlman X-Entity-ID: P7KYpSJvGCELWjBME/J5tg== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean This removes dangling comments that no longer serve a purpose and has been left after conversion of defines to Kconfig option. Signed-off-by: Jonas Karlman Reviewed-by: Kever Yang --- include/configs/rk3128_common.h | 4 ---- include/configs/rk3188_common.h | 5 ----- include/configs/rk3288_common.h | 2 -- include/configs/rk3328_common.h | 1 - include/configs/rk3399_common.h | 1 - include/configs/rockchip-common.h | 2 -- include/configs/rv1108_common.h | 2 -- include/configs/vyasa-rk3288.h | 6 ------ 8 files changed, 23 deletions(-) diff --git a/include/configs/rk3128_common.h b/include/configs/rk3128_common.h index 8aa17bfbd364..8736b14d1015 100644 --- a/include/configs/rk3128_common.h +++ b/include/configs/rk3128_common.h @@ -12,13 +12,9 @@ #define CFG_IRAM_BASE 0x10080000 -/* RAW SD card / eMMC locations. */ - #define CFG_SYS_SDRAM_BASE 0x60000000 #define SDRAM_MAX_SIZE 0x80000000 -/* usb mass storage */ - #define ENV_MEM_LAYOUT_SETTINGS \ "scriptaddr=0x60500000\0" \ "pxefile_addr_r=0x60600000\0" \ diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h index ac9195672fb7..ebb421c69297 100644 --- a/include/configs/rk3188_common.h +++ b/include/configs/rk3188_common.h @@ -11,15 +11,10 @@ #define CFG_IRAM_BASE 0x10080000 -/* spl size 32kb sram - 2kb bootrom */ - #define CFG_SYS_SDRAM_BASE 0x60000000 #define SDRAM_BANK_SIZE (2UL << 30) #define SDRAM_MAX_SIZE 0x80000000 -/* usb otg */ - -/* usb host support */ #define ENV_MEM_LAYOUT_SETTINGS \ "scriptaddr=0x60000000\0" \ "pxefile_addr_r=0x60100000\0" \ diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index 5f29432be10b..fa409c70c931 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -13,8 +13,6 @@ #define CFG_IRAM_BASE 0xff700000 -/* RAW SD card / eMMC locations. */ - #define CFG_SYS_SDRAM_BASE 0 #define SDRAM_BANK_SIZE (2UL << 30) #define SDRAM_MAX_SIZE 0xfe000000 diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h index 24b21c024dee..e565ccff8979 100644 --- a/include/configs/rk3328_common.h +++ b/include/configs/rk3328_common.h @@ -10,7 +10,6 @@ #define CFG_IRAM_BASE 0xff090000 -/* FAT sd card locations. */ #define CFG_SYS_SDRAM_BASE 0 #define SDRAM_MAX_SIZE 0xff000000 diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index 3ef9ffa2e9c4..04dcbf20bcb5 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -10,7 +10,6 @@ #define CFG_IRAM_BASE 0xff8c0000 -/* FAT sd card locations. */ #define CFG_SYS_SDRAM_BASE 0 #define SDRAM_MAX_SIZE 0xf8000000 diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index b7c5c6634394..18544d75acc6 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -11,8 +11,6 @@ #define CFG_CPUID_OFFSET 0x7 #endif -/* ((CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR - 64) * 512) */ - #ifndef CONFIG_SPL_BUILD /* First try to boot from SD (index 1), then eMMC (index 0) */ diff --git a/include/configs/rv1108_common.h b/include/configs/rv1108_common.h index 63551b47e200..050d37bff0b5 100644 --- a/include/configs/rv1108_common.h +++ b/include/configs/rv1108_common.h @@ -17,8 +17,6 @@ #define CFG_SYS_SDRAM_BASE 0x60000000 -/* rockchip ohci host driver */ - #define ENV_MEM_LAYOUT_SETTINGS \ "scriptaddr=0x60000000\0" \ "fdt_addr_r=0x61f00000\0" \ diff --git a/include/configs/vyasa-rk3288.h b/include/configs/vyasa-rk3288.h index e8c1013a71a3..81ff61bf7a6a 100644 --- a/include/configs/vyasa-rk3288.h +++ b/include/configs/vyasa-rk3288.h @@ -20,10 +20,4 @@ #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 1) \ -#ifndef CONFIG_TPL_BUILD -/* Falcon Mode */ - -/* Falcon Mode - MMC support: args@16MB kernel@17MB */ -#endif - #endif From patchwork Tue Mar 14 00:38:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 1756644 X-Patchwork-Delegate: ykai007@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.a=rsa-sha256 header.s=s1 header.b=ZAV/vwd4; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PbF7X2QnQz247D for ; Tue, 14 Mar 2023 11:40:56 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 926278616A; Tue, 14 Mar 2023 01:39:42 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.b="ZAV/vwd4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 24A2485ECB; Tue, 14 Mar 2023 01:38:46 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_BL_SPAMCOP_NET, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.2 Received: from wrqvtzvf.outbound-mail.sendgrid.net (wrqvtzvf.outbound-mail.sendgrid.net [149.72.126.143]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0801085DE9 for ; Tue, 14 Mar 2023 01:38:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bounces+31435339-7456-u-boot=lists.denx.de@em2124.kwiboo.se DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=from:subject:in-reply-to:references:mime-version:to:cc: content-transfer-encoding:content-type:cc:content-type:from:subject:to; s=s1; bh=2b0rGby3mpieBeRhGLcXUYTE66oYsHyWG2a9F3/Pj9M=; b=ZAV/vwd4y3UBsOx9rZK64cEm27jHnTPZjOiL7dyUWsrWKQvmWJNmYfoPPyhzhyLmWxK1 DmeuayIDutJ8x3clf7uJL2otxpEnz1q3wsx+Z1F5J7TBzIGRj4hCVuebn4PBMVF6hBgLsY LLCk8SHb0+5R3dnI551+5JULl0ePXlFtA0Zm/YkkKBRT6VF4UKoSDWjlJ9xRgMZ6jHI8LR 1V7U3kuU8j7llwIquwQkW0N0ALbEg3v2PSYJGin8vGd81y17O2ylktZb1tX/4O9lWs9eRo avGLeZGL6kH58s9JceU1gQ6gf+Yy9oDf54y/R5G7glHcyKERg5uykXY/lgDd+Khw== Received: by filterdrecv-59cb65cf6d-87hlw with SMTP id filterdrecv-59cb65cf6d-87hlw-1-640FC20D-C 2023-03-14 00:38:37.190032213 +0000 UTC m=+1732017.301091369 Received: from bionic.localdomain (unknown) by geopod-ismtpd-8 (SG) with ESMTP id T0SFqdskRA6RkIFCwntjGg Tue, 14 Mar 2023 00:38:36.974 +0000 (UTC) From: Jonas Karlman Subject: [PATCH 11/12] rockchip: include: configs: Remove unused SDRAM_BANK_SIZE Date: Tue, 14 Mar 2023 00:38:37 +0000 (UTC) Message-Id: <20230314003755.512696-12-jonas@kwiboo.se> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230314003755.512696-1-jonas@kwiboo.se> References: <20230314003755.512696-1-jonas@kwiboo.se> MIME-Version: 1.0 X-SG-EID: TdbjyGynYnRZWhH+7lKUQJL+ZxmxpowvO2O9SQF5CwCVrYgcwUXgU5DKUU3QxAfZekEeQsTe+RrMu3cja6a0h881SKqMFKromd/yWttA2IVChsmBJegQAmwVrJ3mhjdq4a9gC0lkF4x2S4Bq6O/zR3XCfjKpqDCs1pqYWNocyecN++/KWRDg2nd/sr5p7cMdCBBMmu+ry/3UsbxhrTYrhYec5sCNkUjDX32SP1Mlczf6J2iPXFf1JJSPqdI8mGAm To: Kever Yang , Simon Glass , Philipp Tomsich , Quentin Schulz , Klaus Goger , Levin Du , Suniel Mahesh , Manivannan Sadhasivam , Akash Gajjar , Jagan Teki Cc: Jagan Teki , Eugen Hristev , u-boot@lists.denx.de, Jonas Karlman X-Entity-ID: P7KYpSJvGCELWjBME/J5tg== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Remove unused SDRAM_BANK_SIZE define. Signed-off-by: Jonas Karlman Reviewed-by: Kever Yang --- include/configs/evb_rk3328.h | 2 -- include/configs/evb_rk3399.h | 2 -- include/configs/pinebook-pro-rk3399.h | 2 -- include/configs/pinephone-pro-rk3399.h | 2 -- include/configs/puma_rk3399.h | 2 -- include/configs/px30_common.h | 1 - include/configs/rk3188_common.h | 1 - include/configs/rk322x_common.h | 1 - include/configs/rk3288_common.h | 1 - include/configs/rk3308_common.h | 1 - include/configs/roc-pc-rk3399.h | 2 -- include/configs/rock960_rk3399.h | 1 - include/configs/rockpro64_rk3399.h | 1 - 13 files changed, 19 deletions(-) diff --git a/include/configs/evb_rk3328.h b/include/configs/evb_rk3328.h index cac613d021a8..d10e5b1d2e03 100644 --- a/include/configs/evb_rk3328.h +++ b/include/configs/evb_rk3328.h @@ -8,6 +8,4 @@ #include -#define SDRAM_BANK_SIZE (2UL << 30) - #endif diff --git a/include/configs/evb_rk3399.h b/include/configs/evb_rk3399.h index b7e850370b31..70ab587795e2 100644 --- a/include/configs/evb_rk3399.h +++ b/include/configs/evb_rk3399.h @@ -13,6 +13,4 @@ #include -#define SDRAM_BANK_SIZE (2UL << 30) - #endif diff --git a/include/configs/pinebook-pro-rk3399.h b/include/configs/pinebook-pro-rk3399.h index 241dc39be008..141ffcd036bb 100644 --- a/include/configs/pinebook-pro-rk3399.h +++ b/include/configs/pinebook-pro-rk3399.h @@ -14,6 +14,4 @@ #include -#define SDRAM_BANK_SIZE (2UL << 30) - #endif diff --git a/include/configs/pinephone-pro-rk3399.h b/include/configs/pinephone-pro-rk3399.h index 78017d6bcc37..9cd444734392 100644 --- a/include/configs/pinephone-pro-rk3399.h +++ b/include/configs/pinephone-pro-rk3399.h @@ -14,6 +14,4 @@ #include -#define SDRAM_BANK_SIZE (2UL << 30) - #endif diff --git a/include/configs/puma_rk3399.h b/include/configs/puma_rk3399.h index 23de326e7208..969acc89b937 100644 --- a/include/configs/puma_rk3399.h +++ b/include/configs/puma_rk3399.h @@ -8,6 +8,4 @@ #include -#define SDRAM_BANK_SIZE (2UL << 30) - #endif diff --git a/include/configs/px30_common.h b/include/configs/px30_common.h index c0896e5f6281..8df481b09788 100644 --- a/include/configs/px30_common.h +++ b/include/configs/px30_common.h @@ -15,7 +15,6 @@ #define CFG_SYS_SDRAM_BASE 0 #define SDRAM_MAX_SIZE 0xff000000 -#define SDRAM_BANK_SIZE (2UL << 30) #define ENV_MEM_LAYOUT_SETTINGS \ "scriptaddr=0x00500000\0" \ diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h index ebb421c69297..fcb274565e9e 100644 --- a/include/configs/rk3188_common.h +++ b/include/configs/rk3188_common.h @@ -12,7 +12,6 @@ #define CFG_IRAM_BASE 0x10080000 #define CFG_SYS_SDRAM_BASE 0x60000000 -#define SDRAM_BANK_SIZE (2UL << 30) #define SDRAM_MAX_SIZE 0x80000000 #define ENV_MEM_LAYOUT_SETTINGS \ diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h index fcaf9c52c4be..39a40f4e2d10 100644 --- a/include/configs/rk322x_common.h +++ b/include/configs/rk322x_common.h @@ -13,7 +13,6 @@ #define CFG_IRAM_BASE 0x10080000 #define CFG_SYS_SDRAM_BASE 0x60000000 -#define SDRAM_BANK_SIZE (512UL << 20UL) #define SDRAM_MAX_SIZE 0x80000000 #define ENV_MEM_LAYOUT_SETTINGS \ diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index fa409c70c931..71d2426d72a4 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -14,7 +14,6 @@ #define CFG_IRAM_BASE 0xff700000 #define CFG_SYS_SDRAM_BASE 0 -#define SDRAM_BANK_SIZE (2UL << 30) #define SDRAM_MAX_SIZE 0xfe000000 #define ENV_MEM_LAYOUT_SETTINGS \ diff --git a/include/configs/rk3308_common.h b/include/configs/rk3308_common.h index 55a0dfecb21b..ba9ee112e2df 100644 --- a/include/configs/rk3308_common.h +++ b/include/configs/rk3308_common.h @@ -12,7 +12,6 @@ #define CFG_SYS_SDRAM_BASE 0 #define SDRAM_MAX_SIZE 0xff000000 -#define SDRAM_BANK_SIZE (2UL << 30) #define ENV_MEM_LAYOUT_SETTINGS \ "scriptaddr=0x00500000\0" \ diff --git a/include/configs/roc-pc-rk3399.h b/include/configs/roc-pc-rk3399.h index 59fe22289cff..f99871cb9fc5 100644 --- a/include/configs/roc-pc-rk3399.h +++ b/include/configs/roc-pc-rk3399.h @@ -13,6 +13,4 @@ #include -#define SDRAM_BANK_SIZE (2UL << 30) - #endif diff --git a/include/configs/rock960_rk3399.h b/include/configs/rock960_rk3399.h index 6099d2fa55a6..b85978115f5b 100644 --- a/include/configs/rock960_rk3399.h +++ b/include/configs/rock960_rk3399.h @@ -13,5 +13,4 @@ #include -#define SDRAM_BANK_SIZE (2UL << 30) #endif diff --git a/include/configs/rockpro64_rk3399.h b/include/configs/rockpro64_rk3399.h index 9195b9b99e41..5381efac3f63 100644 --- a/include/configs/rockpro64_rk3399.h +++ b/include/configs/rockpro64_rk3399.h @@ -13,5 +13,4 @@ #include -#define SDRAM_BANK_SIZE (2UL << 30) #endif From patchwork Tue Mar 14 00:38:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 1756643 X-Patchwork-Delegate: ykai007@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.a=rsa-sha256 header.s=s1 header.b=b8glq/Af; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PbF7K2ng2z247D for ; Tue, 14 Mar 2023 11:40:45 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 63B7686177; Tue, 14 Mar 2023 01:39:33 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.b="b8glq/Af"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D5A8385DF9; Tue, 14 Mar 2023 01:38:45 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_BL_SPAMCOP_NET, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.2 Received: from wrqvtzvf.outbound-mail.sendgrid.net (wrqvtzvf.outbound-mail.sendgrid.net [149.72.126.143]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D4347860F3 for ; Tue, 14 Mar 2023 01:38:39 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bounces+31435339-7456-u-boot=lists.denx.de@em2124.kwiboo.se DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=from:subject:in-reply-to:references:mime-version:to:cc: content-transfer-encoding:content-type:cc:content-type:from:subject:to; s=s1; bh=LIQp9qiU71fOd7vJf/n5wECEVxkR5oTrO46DDR2vO1Q=; b=b8glq/Afd21vX28mAY8FESG31RhCpmm4hSOCs385LIuMOkyGuvLK9O+F4JSmQ35vxV2i U8ZEbooPEY+F5y654n6Rnc9dBHQIribAa/f122Tkvyvzww8xsiwycOgmo9bEj/vB98Ep11 g2GmKc+DicFDXI1Oh/bQ9LGyO1vVXnJokt00iNt45muoRDOiA+HaD/SmFbX3VHuoWNr6Hm i1KO/Od5Z4+ndoLki0TCtggkPLIkH4V2jSx31AIz7+GZg9N1G4Jwfzsn8O++zJfGhpMGhe cJGy08EDx+7H15WOVn9vicylXruYaZs1Ir79itrnXQ3+KcX9j0WaLLV8EwmL5+uQ== Received: by filterdrecv-68f8d557c9-z8zks with SMTP id filterdrecv-68f8d557c9-z8zks-1-640FC20E-E 2023-03-14 00:38:38.537175188 +0000 UTC m=+1731924.809638965 Received: from bionic.localdomain (unknown) by geopod-ismtpd-8 (SG) with ESMTP id BuCBmshoQX-xJldHdxEIZQ Tue, 14 Mar 2023 00:38:38.344 +0000 (UTC) From: Jonas Karlman Subject: [PATCH 12/12] rockchip: Convert rk35xx to use standard boot Date: Tue, 14 Mar 2023 00:38:38 +0000 (UTC) Message-Id: <20230314003755.512696-13-jonas@kwiboo.se> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230314003755.512696-1-jonas@kwiboo.se> References: <20230314003755.512696-1-jonas@kwiboo.se> MIME-Version: 1.0 X-SG-EID: TdbjyGynYnRZWhH+7lKUQJL+ZxmxpowvO2O9SQF5CwCVrYgcwUXgU5DKUU3QxAfZekEeQsTe+RrMu3cja6a0h+DMgd+SpioD6WStgIxIJzLhLb7Dr5eZgaCQhwaxUWeDbP4TTF6mlLB9ipFIAAxax+VVNUieK9jCoTDj6xq7wvFN4cCh6zp/zjVZuHh3aThNp6ge3MV3Iammno4Bp5EpDVYBdSgj+CIBA4tuFVimF501L9ATWXw/9bCTM878BqaL To: Kever Yang , Simon Glass , Philipp Tomsich Cc: Jagan Teki , Eugen Hristev , u-boot@lists.denx.de, Jonas Karlman X-Entity-ID: P7KYpSJvGCELWjBME/J5tg== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Imply use of BOOTSTD and OF_LIBFDT_OVERLAY on RK3568 and RK3588. Drop the use of scripts and rely on standard boot for all operation. Signed-off-by: Jonas Karlman Reviewed-by: Simon Glass --- arch/arm/mach-rockchip/Kconfig | 6 ++++++ include/configs/rk3568_common.h | 9 +++++++-- include/configs/rk3588_common.h | 9 +++++++-- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index e5ac58ae60b5..5e8aacc2ea14 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -289,6 +289,9 @@ config ROCKCHIP_RK3568 select DM_REGULATOR_FIXED select DM_RESET imply ROCKCHIP_COMMON_BOARD + imply BOOTSTD_BOOTCOMMAND + imply BOOTSTD_DEFAULTS + imply OF_LIBFDT_OVERLAY imply ROCKCHIP_OTP imply MISC_INIT_R help @@ -310,6 +313,9 @@ config ROCKCHIP_RK3588 select SYSCON select BOARD_LATE_INIT imply ROCKCHIP_COMMON_BOARD + imply BOOTSTD_BOOTCOMMAND + imply BOOTSTD_DEFAULTS + imply OF_LIBFDT_OVERLAY imply ROCKCHIP_OTP imply MISC_INIT_R help diff --git a/include/configs/rk3568_common.h b/include/configs/rk3568_common.h index a5e1dde50888..164c123d9490 100644 --- a/include/configs/rk3568_common.h +++ b/include/configs/rk3568_common.h @@ -17,10 +17,15 @@ #define ENV_MEM_LAYOUT_SETTINGS \ "scriptaddr=0x00c00000\0" \ + "script_offset_f=0xffe000\0" \ + "script_size_f=0x2000\0" \ "pxefile_addr_r=0x00e00000\0" \ "fdt_addr_r=0x0a100000\0" \ + "fdtoverlay_addr_r=0x02000000\0" \ "kernel_addr_r=0x02080000\0" \ - "ramdisk_addr_r=0x0a200000\0" + "ramdisk_addr_r=0x0a200000\0" \ + "kernel_comp_addr_r=0x08000000\0" \ + "kernel_comp_size=0x2000000\0" #include #define CFG_EXTRA_ENV_SETTINGS \ @@ -28,6 +33,6 @@ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "partitions=" PARTS_DEFAULT \ ROCKCHIP_DEVICE_SETTINGS \ - BOOTENV + BOOTENV_BOOT_TARGETS #endif diff --git a/include/configs/rk3588_common.h b/include/configs/rk3588_common.h index abd20139aaf3..7ff0481a69fd 100644 --- a/include/configs/rk3588_common.h +++ b/include/configs/rk3588_common.h @@ -16,10 +16,15 @@ #define ENV_MEM_LAYOUT_SETTINGS \ "scriptaddr=0x00c00000\0" \ + "script_offset_f=0xffe000\0" \ + "script_size_f=0x2000\0" \ "pxefile_addr_r=0x00e00000\0" \ "fdt_addr_r=0x0a100000\0" \ + "fdtoverlay_addr_r=0x02000000\0" \ "kernel_addr_r=0x02080000\0" \ - "ramdisk_addr_r=0x0a200000\0" + "ramdisk_addr_r=0x0a200000\0" \ + "kernel_comp_addr_r=0x08000000\0" \ + "kernel_comp_size=0x2000000\0" #include #define CFG_EXTRA_ENV_SETTINGS \ @@ -27,6 +32,6 @@ "partitions=" PARTS_DEFAULT \ ENV_MEM_LAYOUT_SETTINGS \ ROCKCHIP_DEVICE_SETTINGS \ - BOOTENV + BOOTENV_BOOT_TARGETS #endif /* __CONFIG_RK3588_COMMON_H */