[PATCH 2/2] rockchip: rk3399: fix incorrect ifdef check on SPL_GPIO

Quentin Schulz foss+uboot at 0leil.net
Tue Jul 12 17:38:25 CEST 2022

From: Quentin Schulz <quentin.schulz at theobroma-systems.com>

The check to perform is on CONFIG_SPL_GPIO and not SPL_GPIO.
Because this was never compiled in, it missed an include of cru.h that
was not detected before. Let's include it too.

Fixes: 07586ee4322a ("rockchip: rk3399: Support common spl_board_init")
Cc: Quentin Schulz <foss+uboot at 0leil.net>
Signed-off-by: Quentin Schulz <quentin.schulz at theobroma-systems.com>
 arch/arm/mach-rockchip/rk3399/rk3399.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c
index ad274b66ce..6d30b70565 100644
--- a/arch/arm/mach-rockchip/rk3399/rk3399.c
+++ b/arch/arm/mach-rockchip/rk3399/rk3399.c
@@ -221,7 +221,9 @@ void spl_perform_fixups(struct spl_image_info *spl_image)
 			   "u-boot,spl-boot-device", boot_ofpath);
-#if defined(SPL_GPIO)
+#if defined(CONFIG_SPL_GPIO)
+#include <asm/arch-rockchip/cru.h>
 static void rk3399_force_power_on_reset(void)
 	ofnode node;
@@ -253,7 +255,7 @@ void spl_board_init(void)
-#if defined(SPL_GPIO)
+#if defined(CONFIG_SPL_GPIO)
 	struct rockchip_cru *cru = rockchip_get_cru();

More information about the U-Boot mailing list