lib: time: add weak timer_init() function

PATCH In review Darwin Rambo 2 participants 2 messages Dec 19, 2013 – Jan 27, 2014

Subsystems (5)

Arm (32-bit) Library code Broadcom BCM2711/BCM2835 Arm architecture Broadcom BCM281XX/BCM11XXX/BCM216XX Arm architecture +1 more subsystems

lore

Share & tools

lore

Darwin Rambo

author

2013-12-19 23:06 UTC #0 lore raw

PATCH 1/1 lib: time: add weak timer_init() function

If timer_init() is made a weak stub function, then it allows us to remove several empty timer_init functions for those boards that already have a timer initialized when u-boot starts. Architectures that use the timer framework may also remove the need for timer.c.

Signed-off-by Darwin Rambo <[email protected]>

Reviewed-by Tim Kryger <[email protected]>

---
 arch/arm/cpu/arm1176/bcm2835/timer.c    |    5 -----
 arch/arm/cpu/sa1100/timer.c             |    5 -----
 board/armltd/vexpress/vexpress_common.c |    5 -----
 board/nvidia/common/board.c             |   11 -----------
 board/sandbox/sandbox/sandbox.c         |    5 -----
 lib/time.c                              |    5 +++++
 6 files changed, 5 insertions(+), 31 deletions(-)

arch/arm/cpu/arm1176/bcm2835/timer.c +0 -5

index 2edd671..017907c 100644
@@ -18,11 +18,6 @@
 #include <asm/io.h>
 #include <asm/arch/timer.h>
 
-int timer_init(void)
-{
-	return 0;
-}
-
 ulong get_timer_us(ulong base)
 {
 	struct bcm2835_timer_regs *regs =

arch/arm/cpu/sa1100/timer.c +0 -5

index 4b981e4..0a0006b 100644
@@ -13,11 +13,6 @@
 #include <common.h>
 #include <SA-1100.h>
 
-int timer_init (void)
-{
-	return 0;
-}
-
 ulong get_timer (ulong base)
 {
 	return get_timer_masked ();

board/armltd/vexpress/vexpress_common.c +0 -5

index da5cb01..cb2de2f 100644
@@ -119,11 +119,6 @@ void dram_init_banksize(void)
 			get_ram_size((long *)PHYS_SDRAM_2, PHYS_SDRAM_2_SIZE);
 }
 
-int timer_init(void)
-{
-	return 0;
-}
-
 /*
  * Start timer:
  *    Setup a 32 bit timer, running at 1KHz

board/nvidia/common/board.c +0 ~~-11~~

index 1972527..e650fed 100644
@@ -48,17 +48,6 @@ const struct tegra_sysinfo sysinfo = {
 	CONFIG_TEGRA_BOARD_STRING
 };
 
-#ifndef CONFIG_SPL_BUILD
-/*
- * Routine: timer_init
- * Description: init the timestamp and lastinc value
- */
-int timer_init(void)
-{
-	return 0;
-}
-#endif
-
 void __pin_mux_usb(void)
 {
 }

board/sandbox/sandbox/sandbox.c +0 -5

index 65dcce8..95efaff 100644
@@ -23,11 +23,6 @@ unsigned long timer_read_counter(void)
 	return os_get_nsec() / 1000;
 }
 
-int timer_init(void)
-{
-	return 0;
-}
-
 int dram_init(void)
 {
 	gd->ram_size = CONFIG_SYS_SDRAM_SIZE;

lib/time.c +5 -0

index 8085aa4..73c3b6a 100644
@@ -60,6 +60,11 @@ static unsigned long long notrace tick_to_time(uint64_t tick)
 	return tick;
 }
 
+int __weak timer_init(void)
+{
+	return 0;
+}
+
 ulong __weak get_timer(ulong base)
 {
 	return tick_to_time(get_ticks()) - base;

Signature · 1 line

1.7.9.5

Tom Rini

2014-01-27 14:52 UTC #1 lore raw

Quoted 7 lines · Darwin Rambo

If timer_init() is made a weak stub function, then it allows us to remove several empty timer_init functions for those boards that already have a timer initialized when u-boot starts. Architectures that use the timer framework may also remove the need for timer.c.
Signed-off-by Darwin Rambo <[email protected]>
Reviewed-by Tim Kryger <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140127/d64c3899/attachment.pgp>