diff options
| author | Quentin Schulz <[email protected]> | 2023-01-17 18:26:54 +0100 |
|---|---|---|
| committer | Kever Yang <[email protected]> | 2023-02-28 18:07:26 +0800 |
| commit | 5bb4697ca3b731a4153a26da7a742b8360667658 (patch) | |
| tree | 48c1802b74d9fbe46196cfe073a940ba5d5fabdb | |
| parent | ea0f7662531fd360abf300691c85ceff5a0d0397 (diff) | |
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 <[email protected]>
Signed-off-by: Quentin Schulz <[email protected]>
Reviewed-by: Kever Yang <[email protected]>
Signed-off-by: Kever Yang <[email protected]>
| -rw-r--r-- | configs/ringneck-px30_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/configs/ringneck-px30_defconfig b/configs/ringneck-px30_defconfig index 34aee4e59c5..91706d8def2 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 |