From: Quentin Schulz Date: Tue, 17 Jan 2023 17:26:54 +0000 (+0100) Subject: rockchip: ringneck: fix SDRAM init fail X-Git-Tag: v2023.07~139^2~64 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5bb4697ca3b731a4153a26da7a742b8360667658;p=platform%2Fkernel%2Fu-boot.git rockchip: ringneck: fix SDRAM init fail 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 Signed-off-by: Quentin Schulz Reviewed-by: Kever Yang Signed-off-by: Kever Yang --- diff --git a/configs/ringneck-px30_defconfig b/configs/ringneck-px30_defconfig index 34aee4e..91706d8 100644 --- a/configs/ringneck-px30_defconfig +++ b/configs/ringneck-px30_defconfig @@ -107,6 +107,7 @@ CONFIG_RAM=y CONFIG_SPL_RAM=y CONFIG_TPL_RAM=y CONFIG_ROCKCHIP_SDRAM_COMMON=y +CONFIG_RAM_ROCKCHIP_DDR4=y CONFIG_DM_RNG=y CONFIG_RNG_ROCKCHIP=y # CONFIG_SPECIFY_CONSOLE_INDEX is not set