From: Johan Jonker <jbx6244@gmail.com>
To: kever.yang@rock-chips.com
Cc: sjg@chromium.org, philipp.tomsich@vrull.eu, heiko@sntech.de,
peng.fan@nxp.com, jh80.chung@samsung.com, u-boot@lists.denx.de
Subject: [PATCH v5 04/13] rockchip: tpl: use IS_ENABLED for timer_init() call condition
Date: Sat, 9 Apr 2022 18:55:05 +0200 [thread overview]
Message-ID: <20220409165514.19220-5-jbx6244@gmail.com> (raw)
In-Reply-To: <20220409165514.19220-1-jbx6244@gmail.com>
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>
---
Changed V5:
rebase
add include kconfig.h
---
arch/arm/mach-rockchip/tpl.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-rockchip/tpl.c b/arch/arm/mach-rockchip/tpl.c
index 7f43f58406..8126587060 100644
--- a/arch/arm/mach-rockchip/tpl.c
+++ b/arch/arm/mach-rockchip/tpl.c
@@ -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) {
--
2.20.1
next prev parent reply other threads:[~2022-04-09 16:56 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-09 16:55 [PATCH v5 00/13] Prepare RK3066 U-boot support Johan Jonker
2022-04-09 16:55 ` [PATCH v5 01/13] rockchip: move ROCKCHIP_STIMER_BASE to Kconfig Johan Jonker
2022-04-09 16:55 ` [PATCH v5 02/13] rockchip: spl: change call condition rockchip_stimer_init() Johan Jonker
2022-04-11 2:23 ` Kever Yang
2022-04-09 16:55 ` [PATCH v5 03/13] rockchip: tpl: " Johan Jonker
2022-04-11 2:23 ` Kever Yang
2022-04-09 16:55 ` Johan Jonker [this message]
2022-04-09 16:55 ` [PATCH v5 05/13] rockchip: timer: add OF_PLATDATA support for dw-apb-timer Johan Jonker
2022-04-09 16:55 ` [PATCH v5 06/13] rockchip: timer: dw-apb-timer: fix whitespace in U_BOOT_DRIVER structure Johan Jonker
2022-04-09 16:55 ` [PATCH v5 07/13] rockchip: mmc: rockchip_dw_mmc: fix ciu clock index Johan Jonker
2022-04-09 16:55 ` [PATCH v5 08/13] rockchip: mmc: rockchip_dw_mmc: add rk3066/rk3188 support Johan Jonker
2022-04-11 2:24 ` Kever Yang
2022-04-09 16:55 ` [PATCH v5 09/13] rockchip: serial: restyle the serial_rockchip.c driver Johan Jonker
2022-04-09 16:55 ` [PATCH v5 10/13] rockchip: serial: move driver alias to serial_rockchip.c Johan Jonker
2022-04-09 16:55 ` [PATCH v5 11/13] rockchip: serial: rename U_BOOT_DRIVER name to rockchip_uart Johan Jonker
2022-04-11 2:25 ` Kever Yang
2022-04-09 16:55 ` [PATCH v5 12/13] rockchip: serial: Kconfig: add select SYS_NS16550 to config ROCKCHIP_SERIAL Johan Jonker
2022-04-09 16:55 ` [PATCH v5 13/13] rockchip: serial: Kconfig: allow ROCKCHIP_SERIAL enabled in TPL Johan Jonker
2022-04-11 2:26 ` Kever Yang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220409165514.19220-5-jbx6244@gmail.com \
--to=jbx6244@gmail.com \
--cc=heiko@sntech.de \
--cc=jh80.chung@samsung.com \
--cc=kever.yang@rock-chips.com \
--cc=peng.fan@nxp.com \
--cc=philipp.tomsich@vrull.eu \
--cc=sjg@chromium.org \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox