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 03A38C433EF for ; Thu, 14 Jul 2022 14:18:51 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3FADD8407A; Thu, 14 Jul 2022 16:18:49 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=metanate.com 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=metanate.com header.i=@metanate.com header.b="qJNW48L6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8A0C5840EE; Thu, 14 Jul 2022 16:18:47 +0200 (CEST) Received: from metanate.com (unknown [IPv6:2001:8b0:1628:5005::111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 2DBE48402F for ; Thu, 14 Jul 2022 16:18:45 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=metanate.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=john@metanate.com DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=metanate.com; s=stronger; h=Content-Transfer-Encoding:Message-Id:Date: Subject:Cc:To:From:Content-Type:Reply-To:Content-ID:Content-Description: In-Reply-To:References; bh=Pc2hu8hzsn1gumeqpcT6/5k+g8HMv+pRbNiKxCHY/zM=; b=qJ NW48L6Zm2plM1DcVy7aC8p58k/roEpC6KwEe5KcPbULSfvi6TrX1Ayietnm4C793XpFKbOmhNyLzE j72gwhw1TyA1p5AvqjUenS4BkS44ID9fyzTeCKCt5RdKlpdPWR0kyS99WR8+vLTspD+mIE4nBczUJ fYFFxIRC6MmArigs2rFviqM2kCa/aU4gYam6WNb9r2uzFst4gMM4vZEiw5RwoLF2Sc72qh8YYVFpA 7I5c/DeY/3WRKYUomajODuV5sk1T1pXRrbOsFjbrih4G09rlmUNWSSg69wmwH5jDx5d072Vk0VbpR xygU9Bm306hHgSEPHwfVk/ZT6/SuR/6A==; Received: from [81.174.171.191] (helo=donbot.metanate.com) by email.metanate.com with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1oBzfv-0000qI-Dq; Thu, 14 Jul 2022 15:18:44 +0100 From: John Keeping To: u-boot@lists.denx.de Cc: John Keeping , Simon Glass , Philipp Tomsich , Kever Yang Subject: [PATCH] rockchip: rk3308: fix same-as-spl boot order Date: Thu, 14 Jul 2022 15:18:37 +0100 Message-Id: <20220714141837.74599-1-john@metanate.com> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Authenticated: YES 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.6 at phobos.denx.de X-Virus-Status: Clean Rockchip SoCs need the boot_devices array defined in order to map the bootloader's value to a U-Boot device. Implement this for rk3308. Signed-off-by: John Keeping --- arch/arm/mach-rockchip/rk3308/rk3308.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm/mach-rockchip/rk3308/rk3308.c b/arch/arm/mach-rockchip/rk3308/rk3308.c index 70fe0d0ac3..dd9109b7c3 100644 --- a/arch/arm/mach-rockchip/rk3308/rk3308.c +++ b/arch/arm/mach-rockchip/rk3308/rk3308.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -142,6 +143,11 @@ enum { #define GPIO0_A4 4 +const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = { + [BROM_BOOTSOURCE_EMMC] = "/mmc@ff490000", + [BROM_BOOTSOURCE_SD] = "/mmc@ff480000", +}; + int rk_board_init(void) { static struct rk3308_grf * const grf = (void *)GRF_BASE; -- 2.37.1