From: Quentin Schulz <quentin.schulz@theobroma-systems.com>
Date: Tue, 17 Jan 2023 17:26:54 +0000 (+0100)
Subject: rockchip: ringneck: fix SDRAM init fail
X-Git-Tag: baikal/mips/sdk5.8.2~5^2~29^2~64
X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=ca9ba27327597bc4334a39e73179dc50634e50e2;p=uboot.git

rockchip: ringneck: fix SDRAM init fail

CONFIG_RAM_PX30_DDR4 got renamed to CONFIG_RAM_ROCKCHIP_DDR4 in commit
5c85614634fd ("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: 7b9ac3cb78e7 ("rockchip: add support for PX30 Ringneck SoM on Haikou Devkit")
Cc: Quentin Schulz <foss+uboot@0leil.net>
Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
---

diff --git a/configs/ringneck-px30_defconfig b/configs/ringneck-px30_defconfig
index 34aee4e59c..91706d8def 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