From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F41EBC6FD19 for ; Tue, 14 Mar 2023 00:39:45 +0000 (UTC) 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) 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: =?us-ascii?Q?TdbjyGynYnRZWhH+7lKUQJL+ZxmxpowvO2O9SQF5CwCVrYgcwUXgU5DKUU3QxA?= =?us-ascii?Q?fZekEeQsTe+RrMu3cja6a0hw4lz0TTf4nawsNJ2?= =?us-ascii?Q?92kzb5dMdqcknYV1JEXIU3J8m1dP4oUN4ZNFWVc?= =?us-ascii?Q?Sg1pGKFouD0=2FDG+wS0nUb9sz90aqI3VaeIB6IC4?= =?us-ascii?Q?6rcWiEZZwN5Y3ZRvRdIM1ZOAyHEZmlbs0qj3e3j?= =?us-ascii?Q?VxY1jwgzsOUbsMmMC4LyY8Td6gkViw1c2WFaPg?= To: Kever Yang , Simon Glass , Philipp Tomsich Cc: Jagan Teki , Eugen Hristev , u-boot@lists.denx.de, Jonas Karlman X-Entity-ID: P7KYpSJvGCELWjBME/J5tg== Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii 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 --- 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, -- 2.39.2