From patchwork Wed May 26 09:32:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Art Nikpal X-Patchwork-Id: 1483956 X-Patchwork-Delegate: ykai007@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: 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: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=g4Nx3mr4; 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 RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Fqm2d5NPrz9s5R for ; Wed, 26 May 2021 19:32:55 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3538882B82; Wed, 26 May 2021 11:32:42 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.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=gmail.com header.i=@gmail.com header.b="g4Nx3mr4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3374E82CCA; Wed, 26 May 2021 11:32:40 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pf1-x431.google.com (mail-pf1-x431.google.com [IPv6:2607:f8b0:4864:20::431]) (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 4D58382AF4 for ; Wed, 26 May 2021 11:32:37 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=email2tema@gmail.com Received: by mail-pf1-x431.google.com with SMTP id p39so490987pfw.8 for ; Wed, 26 May 2021 02:32:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=F483BYMLxqUFlpmuKhCUcKD+lNHOLqveP+zK2maUmBU=; b=g4Nx3mr4Ueik0a0wji1BcedHSrjYLsCm/4TSPctlQDTwmx/JTLlifceX2X379AGE1Z emXeHfRNQkMGtyKOSXr2oXcTKYg/pFmK4pF8dbuypc0iMJyAcisBN/POGbVx8CkeqK2A HzY3MBscKAleQIvcrx3hEtJy//NEpH1DTC93wr87xlqk059HzL/Iu2qni9E/Ri8nm2L4 Rei+h3H2wbssF0onAb1YxYIqoqQ6PtqCnyhYlwB4LHrersvaqe2K/HDoQqkhA3/AmyeM 0qKpK27LruHGSjy4q5KGSsZwi+VRrRO+1TIfg0nxZTI/m19UqRDIeWkfpg6ZgHZEXRXi k1Ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=F483BYMLxqUFlpmuKhCUcKD+lNHOLqveP+zK2maUmBU=; b=rzMLBlyZxP26dG8sOzq06VFQWlUhP72WdDgsaFJrN2vWEuWk7p0eu+NEKxJqgHp46q 3Otd/OSvOGp30HqOTc44WIjaXtzS7r/px/37Th51jSWT9kf+Ok1CaBko8ATh35ye5hm8 4bxTO31DP36wN17rOj+kkbPnSAviBqOT2Z1A5d5OeJuxaNYVWHXacUOzZ7XBQfNCx75g WCrmN9xeKVfkYVsVHaPmTpuRbhmmEFDmaCRd7DRH21dd4LhnqXwevNonlD98lqGU2rGh 1pQ3cORPw8188rtzAfyKmYCuhOW4ogTv4hNYJY9P0gRioVP9D8bl8cRuDcWT2pf8+HqB B3Vg== X-Gm-Message-State: AOAM530oHvp9OnRHrbHGFCsrYPcU1weFazkiq3gBbvzLDB7ueFdNrusR hztAWriZPMf2a3iTZi6J1mM= X-Google-Smtp-Source: ABdhPJwpSsa+HXHbdIvVYbzrjMo2a63Y+ZEfS64ldAJfDa4UDdBjeLLZnWjua/3+NBrywPzWNNnQrg== X-Received: by 2002:a62:860b:0:b029:28e:d45b:4d2e with SMTP id x11-20020a62860b0000b029028ed45b4d2emr34991732pfd.70.1622021555629; Wed, 26 May 2021 02:32:35 -0700 (PDT) Received: from localhost.localdomain (104.194.74.249.16clouds.com. [104.194.74.249]) by smtp.gmail.com with ESMTPSA id p8sm15001498pfw.165.2021.05.26.02.32.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 May 2021 02:32:35 -0700 (PDT) From: Artem Lapkin X-Google-Original-From: Artem Lapkin To: kever.yang@rock-chips.com Cc: sjg@chromium.org, philipp.tomsich@theobroma-systems.com, jagan@amarulasolutions.com, sunil@amarulasolutions.com, u-boot@lists.denx.de, art@khadas.com, nick@khadas.com, gouwa@khadas.com Subject: [PATCH] rk3399: boot_devices fix spinor node name Date: Wed, 26 May 2021 17:32:27 +0800 Message-Id: <20210526093227.273974-1-art@khadas.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.102.4 at phobos.denx.de X-Virus-Status: Clean Problem: board_spl_was_booted_from return wrong boot_devices[3] value /spi@ff1d0000 and same-as-spl dont work properly for SPINOR flash because arch/arm/mach-rockchip/spl-boot-order.c spl_node_to_boot_device need parse SPINOR flash node as UCLASS_SPI_FLASH spl-boot-order: same-as-spl > *** BOOT_SOURCE_ID 3 (2:emmc 3:spi 5:sd ... /spi@ff1d0000 > board_boot_order: could not map node @618 to a boot-device /sdhci@fe330000 > /mmc@fe320000 Solution: just change it to /spi@ff1d0000/flash@0 spl-boot-order: same-as-spl > *** BOOT_SOURCE_ID 3 (2:emmc 3:spi 5:sd ... /spi@ff1d0000/flash@0 > /sdhci@fe330000 > /mmc@fe320000 Signed-off-by: Artem Lapkin Reviewed-by: Kever Yang --- arch/arm/mach-rockchip/rk3399/rk3399.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c index 869d2159..69e0c8c2 100644 --- a/arch/arm/mach-rockchip/rk3399/rk3399.c +++ b/arch/arm/mach-rockchip/rk3399/rk3399.c @@ -28,7 +28,7 @@ DECLARE_GLOBAL_DATA_PTR; const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = { [BROM_BOOTSOURCE_EMMC] = "/sdhci@fe330000", - [BROM_BOOTSOURCE_SPINOR] = "/spi@ff1d0000", + [BROM_BOOTSOURCE_SPINOR] = "/spi@ff1d0000/flash@0", [BROM_BOOTSOURCE_SD] = "/mmc@fe320000", };