[PATCH] rk3399: boot_devices fix spinor node name

Kever Yang kever.yang at rock-chips.com
Wed Aug 11 11:45:49 CEST 2021


Artem Lapkin <email2tema at gmail.com> 于2021年5月26日周三 下午5:33写道:
>
> Problem: board_spl_was_booted_from return wrong boot_devices[3] value
> /spi at 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 at ff1d0000 > board_boot_order: could not map node @618 to a boot-device
> /sdhci at fe330000 > /mmc at fe320000
>
> Solution: just change it to /spi at ff1d0000/flash at 0
>
> spl-boot-order: same-as-spl > *** BOOT_SOURCE_ID 3 (2:emmc 3:spi 5:sd ...
> /spi at ff1d0000/flash at 0 > /sdhci at fe330000 > /mmc at fe320000
>
> Signed-off-by: Artem Lapkin <art at khadas.com>

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

Thanks,
- Kever
> ---
>  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 at fe330000",
> -       [BROM_BOOTSOURCE_SPINOR] = "/spi at ff1d0000",
> +       [BROM_BOOTSOURCE_SPINOR] = "/spi at ff1d0000/flash at 0",
>         [BROM_BOOTSOURCE_SD] = "/mmc at fe320000",
>  };
>
> --
> 2.25.1
>


More information about the U-Boot mailing list