]> git.baikalelectronics.ru Git - uboot.git/commit
rockchip: ringneck: fix SDRAM init fail
authorQuentin Schulz <quentin.schulz@theobroma-systems.com>
Tue, 17 Jan 2023 17:26:54 +0000 (18:26 +0100)
committerKever Yang <kever.yang@rock-chips.com>
Tue, 28 Feb 2023 10:07:26 +0000 (18:07 +0800)
commitca9ba27327597bc4334a39e73179dc50634e50e2
tree48c1802b74d9fbe46196cfe073a940ba5d5fabdb
parent3bf79380681685b3e001755a24f922280d19e0e5
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>
configs/ringneck-px30_defconfig