All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kever Yang <kever.yang@rock-chips.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] rockchip: Fix spl boot order path of booting device
Date: Sun, 10 Nov 2019 22:37:14 +0800	[thread overview]
Message-ID: <eedf4dca-bc94-a9ef-0c42-ba1a33439ab5@rock-chips.com> (raw)
In-Reply-To: <20191109122625.6244-1-michael@amarulasolutions.com>


On 2019/11/9 下午8:26, Michael Trimarchi wrote:
> 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 at ff0f0000'
> board_boot_order: could not find dwmmc at ff0f0000 in FDT
>
> Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>

Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

Thanks,
- Kever
> ---
>   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 at 1021c000",
> -	[BROM_BOOTSOURCE_SD] = "dwmmc at 10214000",
> +	[BROM_BOOTSOURCE_EMMC] = "/dwmmc at 1021c000",
> +	[BROM_BOOTSOURCE_SD] = "/dwmmc at 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 <asm/arch-rockchip/hardware.h>
>   
>   const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
> -	[BROM_BOOTSOURCE_EMMC] = "dwmmc at 30020000",
> -	[BROM_BOOTSOURCE_SD] = "dwmmc at 30000000",
> +	[BROM_BOOTSOURCE_EMMC] = "/dwmmc at 30020000",
> +	[BROM_BOOTSOURCE_SD] = "/dwmmc at 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 at ff0f0000",
> -	[BROM_BOOTSOURCE_SD] = "dwmmc at ff0c0000",
> +	[BROM_BOOTSOURCE_EMMC] = "/dwmmc at ff0f0000",
> +	[BROM_BOOTSOURCE_SD] = "/dwmmc at 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 at ff0f0000",
> -	[BROM_BOOTSOURCE_SD] = "dwmmc at ff0c0000",
> +	[BROM_BOOTSOURCE_EMMC] = "/dwmmc at ff0f0000",
> +	[BROM_BOOTSOURCE_SD] = "/dwmmc at ff0c0000",
>   };
>   
>   #ifdef CONFIG_ARCH_EARLY_INIT_R

  parent reply	other threads:[~2019-11-10 14:37 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-09 12:26 [U-Boot] [PATCH] rockchip: Fix spl boot order path of booting device Michael Trimarchi
2019-11-09 21:23 ` Mark Kettenis
2019-11-10 14:37 ` Kever Yang [this message]
2019-11-14 13:09 ` Kever Yang
2019-11-14 13:18   ` Michael Nazzareno Trimarchi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=eedf4dca-bc94-a9ef-0c42-ba1a33439ab5@rock-chips.com \
    --to=kever.yang@rock-chips.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.