[PATCH 06/12] rockchip: rk3588-rock-5b: Fix sdmmc boot

[Kever Yang]

On 2023/3/14 08:38, Jonas Karlman wrote:
> Running U-Boot from a SD-card on ROCK 5 Model B fails to load atf using
> DMA and prints debug_uart messages.
>
>    <debug_uart>
>
>    <debug_uart>
>
>    U-Boot SPL 2023.04-rc3 (Mar 12 2023 - 00:30:16 +0000)
>    Trying to boot from MMC1
>    ## Checking hash(es) for config config-1 ... OK
>    ## Checking hash(es) for Image atf-1 ... sha256 error!
>    Bad hash value for 'hash' hash node in 'atf-1' image node
>    mmc_load_image_raw_sector: mmc block read error
>    SPL: failed to boot from all boot devices
>    ### ERROR ### Please RESET the board ###
>
> Use fifo-mode to disable DMA in SPL, add same-as-spl to boot-order and
> remove DEBUG_UART_ANNOUNCE option to fix this.
>
> Signed-off-by: Jonas Karlman <jonas at kwiboo.se>
Reviewed-by: Kever Yang <kever.yang at rock-chips.com>

Thanks,
- Kever
> ---
>   arch/arm/dts/rk3588-rock-5b-u-boot.dtsi | 3 ++-
>   configs/rock5b-rk3588_defconfig         | 1 -
>   2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
> index 2386edf90deb..36d557b4934d 100644
> --- a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
> +++ b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
> @@ -11,12 +11,13 @@
>   	};
>   
>   	chosen {
> -		u-boot,spl-boot-order = &sdmmc;
> +		u-boot,spl-boot-order = "same-as-spl", &sdmmc;
>   	};
>   };
>   
>   &sdmmc {
>   	bus-width = <4>;
>   	u-boot,dm-spl;
> +	u-boot,spl-fifo-mode;
>   	status = "okay";
>   };
> diff --git a/configs/rock5b-rk3588_defconfig b/configs/rock5b-rk3588_defconfig
> index 66199387195a..3fcc6a26bb51 100644
> --- a/configs/rock5b-rk3588_defconfig
> +++ b/configs/rock5b-rk3588_defconfig
> @@ -66,6 +66,5 @@ CONFIG_PWM_ROCKCHIP=y
>   CONFIG_SPL_RAM=y
>   CONFIG_BAUDRATE=1500000
>   CONFIG_DEBUG_UART_SHIFT=2
> -CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_SYSRESET=y
>   CONFIG_ERRNO_STR=y