From patchwork Sat Nov 9 12:26:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Nazzareno Trimarchi X-Patchwork-Id: 1192404 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=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="YE5/hjvE"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 479GbR2YZPz9sNx for ; Sat, 9 Nov 2019 23:26:43 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id E43EFC21D65; Sat, 9 Nov 2019 12:26:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id C82BEC21C4A; Sat, 9 Nov 2019 12:26:30 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 675FEC21C4A; Sat, 9 Nov 2019 12:26:28 +0000 (UTC) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by lists.denx.de (Postfix) with ESMTPS id 117EBC21BE5 for ; Sat, 9 Nov 2019 12:26:28 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id b11so8741872wmb.5 for ; Sat, 09 Nov 2019 04:26:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id; bh=9Mh8oEYxnGk61EJif71eyiy2laZF5DDZPM9Gsv6+X5I=; b=YE5/hjvENymd4vsKgkCnYMrgx2jRdx3wmVvL/q4RELYjavNvnYLtsI6tGpAKSUDAzi LbFVFkzdVck/hB0tGOwSUKCTmq6m5kW6Yy3hclQp9tZ1fKg1l+7Q76330Tygr7YJQbrR zwwSqC5X7ioJ5nT6EJ7bQeOkZv624vOXvF22s= 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; bh=9Mh8oEYxnGk61EJif71eyiy2laZF5DDZPM9Gsv6+X5I=; b=quNz6bIBn8CslhxV2I4jZ6BMtvOkK3cUtZYxsHwzE4f3pbW3CGOITTobkpsY7YAsg4 eD1mU8Mvmt3zsSs+SKVM5MJA3IvuflHlUCzfBDCbCsqdBfSRsoiFpI9il259sRoFjJKv sXA5NboVaWIuqLYck0aM+pTT9oXzCbo0dCRzbFzSnPGbjVQA4s1WwLEwXqPMwHOPlzJN WbtUjW7vTJlQ6jJHg4k3iSFY1r0COD355w3u/0ln1N2DCCCc1k4Mm3NxilYXI9OO7+CX /5clUU25qlwKRscprNgzKPPbRLdXQEZD9FtlU/M+OtHBzeZGlXDMFQavILhyRUt5dCj9 bmpg== X-Gm-Message-State: APjAAAWPOVDz3Zx2Z29FbllgQy3xsAGXFj+F5mGaTxhKKXlpNRFQHcs/ I7gDPVcAXtneFhUb6aLBGoF4Kw== X-Google-Smtp-Source: APXvYqz9THbYvoex8e9Dyok3Plc4eiWTEfEpjDiOEujBWjvbcrls6bDEl2lc21XLn1urDVs2+tniEQ== X-Received: by 2002:a05:600c:2942:: with SMTP id n2mr13346195wmd.81.1573302387404; Sat, 09 Nov 2019 04:26:27 -0800 (PST) Received: from localhost.localdomain (dynamic-2a00-1028-8d1f-56d2-5d0a-6d23-96a2-e4d4.ipv6.broadband.iol.cz. [2a00:1028:8d1f:56d2:5d0a:6d23:96a2:e4d4]) by smtp.gmail.com with ESMTPSA id w12sm8434059wmi.17.2019.11.09.04.26.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Nov 2019 04:26:26 -0800 (PST) From: Michael Trimarchi To: Kever Yang Date: Sat, 9 Nov 2019 13:26:25 +0100 Message-Id: <20191109122625.6244-1-michael@amarulasolutions.com> X-Mailer: git-send-email 2.17.1 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH] rockchip: Fix spl boot order path of booting device X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Fix rk3288, rk3188, rk322x, rk3368 Tested on rk3288 U-Boot SPL 2019.10-rc4-00014-g0493073dc4-dirty (Nov 09 2019 - 13:04:06 +0100) board_spl_was_booted_from: brom_bootdevice_id 2 maps to 'dwmmc@ff0f0000' board_boot_order: could not find dwmmc@ff0f0000 in FDT Signed-off-by: Michael Trimarchi Reviewed-by: Mark Kettenis Reviewed-by: Kever Yang --- arch/arm/mach-rockchip/rk3188/rk3188.c | 4 ++-- arch/arm/mach-rockchip/rk322x/rk322x.c | 4 ++-- arch/arm/mach-rockchip/rk3288/rk3288.c | 4 ++-- arch/arm/mach-rockchip/rk3368/rk3368.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-rockchip/rk3188/rk3188.c b/arch/arm/mach-rockchip/rk3188/rk3188.c index 95f0e3ccbe..1b012f7f67 100644 --- a/arch/arm/mach-rockchip/rk3188/rk3188.c +++ b/arch/arm/mach-rockchip/rk3188/rk3188.c @@ -14,8 +14,8 @@ #define GRF_BASE 0x20008000 const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = { - [BROM_BOOTSOURCE_EMMC] = "dwmmc@1021c000", - [BROM_BOOTSOURCE_SD] = "dwmmc@10214000", + [BROM_BOOTSOURCE_EMMC] = "/dwmmc@1021c000", + [BROM_BOOTSOURCE_SD] = "/dwmmc@10214000", }; #ifdef CONFIG_DEBUG_UART_BOARD_INIT diff --git a/arch/arm/mach-rockchip/rk322x/rk322x.c b/arch/arm/mach-rockchip/rk322x/rk322x.c index cd0bf8a70c..562117e6c1 100644 --- a/arch/arm/mach-rockchip/rk322x/rk322x.c +++ b/arch/arm/mach-rockchip/rk322x/rk322x.c @@ -8,8 +8,8 @@ #include const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = { - [BROM_BOOTSOURCE_EMMC] = "dwmmc@30020000", - [BROM_BOOTSOURCE_SD] = "dwmmc@30000000", + [BROM_BOOTSOURCE_EMMC] = "/dwmmc@30020000", + [BROM_BOOTSOURCE_SD] = "/dwmmc@30000000", }; #ifdef CONFIG_DEBUG_UART_BOARD_INIT diff --git a/arch/arm/mach-rockchip/rk3288/rk3288.c b/arch/arm/mach-rockchip/rk3288/rk3288.c index 057ce92080..987b4e0d58 100644 --- a/arch/arm/mach-rockchip/rk3288/rk3288.c +++ b/arch/arm/mach-rockchip/rk3288/rk3288.c @@ -22,8 +22,8 @@ DECLARE_GLOBAL_DATA_PTR; #define GRF_BASE 0xff770000 const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = { - [BROM_BOOTSOURCE_EMMC] = "dwmmc@ff0f0000", - [BROM_BOOTSOURCE_SD] = "dwmmc@ff0c0000", + [BROM_BOOTSOURCE_EMMC] = "/dwmmc@ff0f0000", + [BROM_BOOTSOURCE_SD] = "/dwmmc@ff0c0000", }; #ifdef CONFIG_SPL_BUILD diff --git a/arch/arm/mach-rockchip/rk3368/rk3368.c b/arch/arm/mach-rockchip/rk3368/rk3368.c index 7ccd417a18..20ae797794 100644 --- a/arch/arm/mach-rockchip/rk3368/rk3368.c +++ b/arch/arm/mach-rockchip/rk3368/rk3368.c @@ -54,8 +54,8 @@ static struct mm_region rk3368_mem_map[] = { struct mm_region *mem_map = rk3368_mem_map; const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = { - [BROM_BOOTSOURCE_EMMC] = "dwmmc@ff0f0000", - [BROM_BOOTSOURCE_SD] = "dwmmc@ff0c0000", + [BROM_BOOTSOURCE_EMMC] = "/dwmmc@ff0f0000", + [BROM_BOOTSOURCE_SD] = "/dwmmc@ff0c0000", }; #ifdef CONFIG_ARCH_EARLY_INIT_R