[PATCH] rockchip: ringneck: fix SDRAM init fail

Kever Yang kever.yang at rock-chips.com
Sun Jan 29 02:07:50 CET 2023


On 2023/1/18 01:26, Quentin Schulz wrote:
> From: Quentin Schulz <quentin.schulz at theobroma-systems.com>
>
> CONFIG_RAM_PX30_DDR4 got renamed to CONFIG_RAM_ROCKCHIP_DDR4 in commit
> 26f92be07e2a ("ram: rockchip: Add common ddr type configs"). Since both
> patchsets were merged unbeknownst to the other, the conflict wasn't
> detected while testing each patchset individually and could only be
> observed after a merge to master branch.
>
> Fixes: c925be73a0a8 ("rockchip: add support for PX30 Ringneck SoM on Haikou Devkit")
> Cc: Quentin Schulz <foss+uboot at 0leil.net>
> Signed-off-by: Quentin Schulz <quentin.schulz at theobroma-systems.com>
Reviewed-by: Kever Yang <kever.yang at rock-chips.com>

Thanks,
- Kever
> ---
>   configs/ringneck-px30_defconfig | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/configs/ringneck-px30_defconfig b/configs/ringneck-px30_defconfig
> index dd332ece72..93b2df99a1 100644
> --- a/configs/ringneck-px30_defconfig
> +++ b/configs/ringneck-px30_defconfig
> @@ -106,7 +106,7 @@ CONFIG_RAM=y
>   CONFIG_SPL_RAM=y
>   CONFIG_TPL_RAM=y
>   CONFIG_ROCKCHIP_SDRAM_COMMON=y
> -CONFIG_RAM_PX30_DDR4=y
> +CONFIG_RAM_ROCKCHIP_DDR4=y
>   CONFIG_DM_RESET=y
>   CONFIG_DM_RNG=y
>   CONFIG_RNG_ROCKCHIP=y
>
> ---
> base-commit: 5b958dea5c678dbdb2aeb6ac3c0c8cc8dfea065c
> change-id: 20230117-ringneck-defconfig-ddr-1fd7bca182f4
>
> Best regards,


More information about the U-Boot mailing list