El Fri, Jul 15, 2022 at 05:09:49PM +0200, Quentin Schulz deia:
From: Quentin Schulz quentin.schulz@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.
Also switch to IS_ENABLED ifdef and in-code check.
Thank you. That helps when CONGIF_SPL_GPIO is enabled. But in case CONFIG_SPL_GPIO is disabled...
Fixes: 07586ee4322a ("rockchip: rk3399: Support common spl_board_init") Cc: Quentin Schulz foss+uboot@0leil.net Signed-off-by: Quentin Schulz quentin.schulz@theobroma-systems.com
v2:
- use IS_ENABLED checks,
arch/arm/mach-rockchip/rk3399/rk3399.c | 45 ++++++++++++++------------ 1 file changed, 24 insertions(+), 21 deletions(-)
diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c index 920da22307..db8a6cb83a 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 IS_ENABLED(CONFIG_SPL_GPIO)
+#include <asm/arch-rockchip/cru.h>
then (if CONFIG_SPL_GPIO is disabled...) the include is not in effect, but the call to
static void rk3399_force_power_on_reset(void) { ofnode node;
the #endif for that #if is somewhere over here.
@@ -253,27 +255,28 @@ void spl_board_init(void) { led_setup();
-#if defined(SPL_GPIO)
- struct rockchip_cru *cru = rockchip_get_cru();
- if (IS_ENABLED(CONFIG_SPL_GPIO)) {
struct rockchip_cru *cru = rockchip_get_cru();
[...]
/*
[...]
*/if (cru->glb_rst_st != 0)
This gives me a compilation error (rock-pi-4, CONFIG_SPL_GPIO disabled), because of the missing include defining rockchip_cru (and glb_rst_st as a member of it)
rk3399_force_power_on_reset();
This gives a warning, because the function declaration is #ifdefed out.
So we could leave the include outside the #if defined(SPL_GPIO) and add an inline dummy function in #else,
or we could change the if (IS_ENABLED(CONFIG_SPL_GPIO)) to #if (IS_ENABLED(CONFIG_SPL_GPIO))
I think the first is preferred in U-Boot, but not sure if that might somehow make SPL bigger or something. I don't think so.