]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
rockchip: tpl: use IS_ENABLED for timer_init() call condition
authorJohan Jonker <jbx6244@gmail.com>
Sat, 9 Apr 2022 16:55:05 +0000 (18:55 +0200)
committerKever Yang <kever.yang@rock-chips.com>
Mon, 18 Apr 2022 03:25:13 +0000 (11:25 +0800)
Not all Rockchip SoC models use the ARM arch timer.
Call the function timer_init() only when
CONFIG_SYS_ARCH_TIMER is available.
Use the call condition IS_ENABLED to increase
build coverage and make the code easier to read.

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
arch/arm/mach-rockchip/tpl.c

index 7f43f58406605fcb04c2a651522228591b73d42b..8126587060f6efe482dbaf2b6c2c333c2bf7093e 100644 (file)
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <asm/arch-rockchip/bootrom.h>
 #include <linux/bitops.h>
+#include <linux/kconfig.h>
 
 #if CONFIG_IS_ENABLED(BANNER_PRINT)
 #include <timestamp.h>
@@ -77,8 +78,10 @@ void board_init_f(ulong dummy)
 
        /* Init secure timer */
        rockchip_stimer_init();
-       /* Init ARM arch timer in arch/arm/cpu/ */
-       timer_init();
+
+       /* Init ARM arch timer */
+       if (IS_ENABLED(CONFIG_SYS_ARCH_TIMER))
+               timer_init();
 
        ret = uclass_get_device(UCLASS_RAM, 0, &dev);
        if (ret) {