bugfix: all Marvell specific build fails due to undefined reference to `get_ticks'

PATCH Superseded Prafulla Wadaskar 2 participants 4 messages Feb 8, 2012 – Feb 9, 2012 Arm (32-bit)

lore

Share & tools

lore

Prafulla Wadaskar

author

2012-02-08 11:09 UTC #0 lore raw

PATCH v2 1/1 bugfix: all Marvell specific build fails due to undefined reference to `get_ticks'

after http://patchwork.ozlabs.org/patch/136415/ was applied. All Marvell build fails with below error

common/libcommon.o: In function `cread_line':
/home/uboot/src/u-boot-arm/common/main.c:717: undefined reference to get_ticks' /home/uboot/src/u-boot-arm/common/main.c:717: undefined reference to get_tbclk' /home/uboot/src/u-boot-arm/common/main.c:720: undefined reference to `get_ticks'

The same is fixed for Kirkwood, ARMADA100, pantheon and orion5x SoCs

Signed-off-by Prafulla Wadaskar <[email protected]>

---
Change log:
V2: get_tbclk body changed to single line stateent as per feedback by Graeme Russ

 arch/arm/cpu/arm926ejs/armada100/timer.c |   18 ++++++++++++++++++
 arch/arm/cpu/arm926ejs/kirkwood/timer.c  |   18 ++++++++++++++++++
 arch/arm/cpu/arm926ejs/orion5x/timer.c   |   18 ++++++++++++++++++
 arch/arm/cpu/arm926ejs/pantheon/timer.c  |   18 ++++++++++++++++++
 4 files changed, 72 insertions(+), 0 deletions(-)

arch/arm/cpu/arm926ejs/armada100/timer.c +18 -0

index fbade4b..355cd6d 100644
@@ -190,3 +190,21 @@ void reset_cpu (unsigned long ignored)
 
 	while(1);
 }
+
+/*
+ * This function is derived from PowerPC code (read timebase as long long).
+ * On ARM it just returns the timer value.
+ */
+unsigned long long get_ticks(void)
+{
+	return get_timer(0);
+}
+
+/*
+ * This function is derived from PowerPC code (timebase clock frequency).
+ * On ARM it returns the number of timer ticks per second.
+ */
+ulong get_tbclk (void)
+{
+	return (ulong)CONFIG_SYS_HZ;
+}

arch/arm/cpu/arm926ejs/kirkwood/timer.c +18 -0

index a98f54c..f5d0160 100644
@@ -153,3 +153,21 @@ int timer_init(void)
 
 	return 0;
 }
+
+/*
+ * This function is derived from PowerPC code (read timebase as long long).
+ * On ARM it just returns the timer value.
+ */
+unsigned long long get_ticks(void)
+{
+	return get_timer(0);
+}
+
+/*
+ * This function is derived from PowerPC code (timebase clock frequency).
+ * On ARM it returns the number of timer ticks per second.
+ */
+ulong get_tbclk (void)
+{
+	return (ulong)CONFIG_SYS_HZ;
+}

arch/arm/cpu/arm926ejs/orion5x/timer.c +18 -0

index e39ecc2..8a8aaf1 100644
@@ -167,3 +167,21 @@ void timer_init_r(void)
 	lastdec = read_timer();
 	timestamp = 0;
 }
+
+/*
+ * This function is derived from PowerPC code (read timebase as long long).
+ * On ARM it just returns the timer value.
+ */
+unsigned long long get_ticks(void)
+{
+	return get_timer(0);
+}
+
+/*
+ * This function is derived from PowerPC code (timebase clock frequency).
+ * On ARM it returns the number of timer ticks per second.
+ */
+ulong get_tbclk (void)
+{
+	return (ulong)CONFIG_SYS_HZ;
+}

arch/arm/cpu/arm926ejs/pantheon/timer.c +18 -0

index 17045b1..28aadad 100644
@@ -197,3 +197,21 @@ void reset_cpu (unsigned long ignored)
 	/*enable functional WDT clock */
 	writel(APBC_APBCLK | APBC_FNCLK, &mpmu->wdtpcr);
 }
+
+/*
+ * This function is derived from PowerPC code (read timebase as long long).
+ * On ARM it just returns the timer value.
+ */
+unsigned long long get_ticks(void)
+{
+	return get_timer(0);
+}
+
+/*
+ * This function is derived from PowerPC code (timebase clock frequency).
+ * On ARM it returns the number of timer ticks per second.
+ */
+ulong get_tbclk (void)
+{
+	return (ulong)CONFIG_SYS_HZ;
+}

Signature · 1 line

1.5.3.4

Prafulla Wadaskar

author

2012-02-08 09:49 UTC #1 lore raw

PATCH v2 1/1 bugfix: all Marvell specific build fails due to undefined reference to `get_ticks'

Quoted 148 lines

-----Original Message-----
From: Prafulla Wadaskar [mailto:prafulla at marvell.com]
Sent: 08 February 2012 16:40
To: u-boot at lists.denx.de
Cc: Prabhanjan Sarnaik; Ashish Karkare; Prafulla Wadaskar
Subject: [PATCH V2] bugfix: all Marvell specific build fails due to undefined reference to `get_ticks'
after http://patchwork.ozlabs.org/patch/136415/ was applied. All Marvell
build fails with below error
common/libcommon.o: In function `cread_line':
/home/uboot/src/u-boot-arm/common/main.c:717: undefined reference to `get_ticks'
/home/uboot/src/u-boot-arm/common/main.c:717: undefined reference to `get_tbclk'
/home/uboot/src/u-boot-arm/common/main.c:720: undefined reference to `get_ticks'
The same is fixed for Kirkwood, ARMADA100, pantheon and orion5x SoCs
Signed-off-by Prafulla Wadaskar <[email protected]>
---
Change log:
V2: get_tbclk body changed to single line stateent as per feedback by Graeme Russ
 arch/arm/cpu/arm926ejs/armada100/timer.c |   18 ++++++++++++++++++
 arch/arm/cpu/arm926ejs/kirkwood/timer.c  |   18 ++++++++++++++++++
 arch/arm/cpu/arm926ejs/orion5x/timer.c   |   18 ++++++++++++++++++
 arch/arm/cpu/arm926ejs/pantheon/timer.c  |   18 ++++++++++++++++++
 4 files changed, 72 insertions(+), 0 deletions(-)
arch/arm/cpu/arm926ejs/armada100/timer.c +3 -0
index fbade4b..355cd6d 100644
@@ -190,3 +190,21 @@ void reset_cpu (unsigned long ignored)
 
 	while(1);
 }
+
+/*
+ * This function is derived from PowerPC code (read timebase as long
long).
+ * On ARM it just returns the timer value.
+ */
arch/arm/cpu/arm926ejs/armada100/timer.c +7 -0
+unsigned long long get_ticks(void)
+{
+	return get_timer(0);
+}
+
+/*
+ * This function is derived from PowerPC code (timebase clock
frequency).
+ * On ARM it returns the number of timer ticks per second.
+ */
arch/arm/cpu/arm926ejs/armada100/timer.c +4 -0
+ulong get_tbclk (void)
+{
+	return (ulong)CONFIG_SYS_HZ;
+}
arch/arm/cpu/arm926ejs/kirkwood/timer.c +3 -0
index a98f54c..f5d0160 100644
@@ -153,3 +153,21 @@ int timer_init(void)
 
 	return 0;
 }
+
+/*
+ * This function is derived from PowerPC code (read timebase as long
long).
+ * On ARM it just returns the timer value.
+ */
arch/arm/cpu/arm926ejs/kirkwood/timer.c +7 -0
+unsigned long long get_ticks(void)
+{
+	return get_timer(0);
+}
+
+/*
+ * This function is derived from PowerPC code (timebase clock
frequency).
+ * On ARM it returns the number of timer ticks per second.
+ */
arch/arm/cpu/arm926ejs/kirkwood/timer.c +4 -0
+ulong get_tbclk (void)
+{
+	return (ulong)CONFIG_SYS_HZ;
+}
arch/arm/cpu/arm926ejs/orion5x/timer.c +3 -0
index e39ecc2..8a8aaf1 100644
@@ -167,3 +167,21 @@ void timer_init_r(void)
 	lastdec = read_timer();
 	timestamp = 0;
 }
+
+/*
+ * This function is derived from PowerPC code (read timebase as long
long).
+ * On ARM it just returns the timer value.
+ */
arch/arm/cpu/arm926ejs/orion5x/timer.c +7 -0
+unsigned long long get_ticks(void)
+{
+	return get_timer(0);
+}
+
+/*
+ * This function is derived from PowerPC code (timebase clock
frequency).
+ * On ARM it returns the number of timer ticks per second.
+ */
arch/arm/cpu/arm926ejs/orion5x/timer.c +4 -0
+ulong get_tbclk (void)
+{
+	return (ulong)CONFIG_SYS_HZ;
+}
arch/arm/cpu/arm926ejs/pantheon/timer.c +3 -0
index 17045b1..28aadad 100644
@@ -197,3 +197,21 @@ void reset_cpu (unsigned long ignored)
 	/*enable functional WDT clock */
 	writel(APBC_APBCLK | APBC_FNCLK, &mpmu->wdtpcr);
 }
+
+/*
+ * This function is derived from PowerPC code (read timebase as long
long).
+ * On ARM it just returns the timer value.
+ */
arch/arm/cpu/arm926ejs/pantheon/timer.c +7 -0
+unsigned long long get_ticks(void)
+{
+	return get_timer(0);
+}
+
+/*
+ * This function is derived from PowerPC code (timebase clock
frequency).
+ * On ARM it returns the number of timer ticks per second.
+ */

arch/arm/cpu/arm926ejs/pantheon/timer.c

Quoted 5 lines

arch/arm/cpu/arm926ejs/pantheon/timer.c +4 -1
+ulong get_tbclk (void)
+{
+	return (ulong)CONFIG_SYS_HZ;
+}
--

Applied to u-boot-marvell.git master branch

Regards..
Prafulla . . .

Mike Frysinger

2012-02-09 03:41 UTC #2 lore raw

PATCH v2 1/1 bugfix: all Marvell specific build fails due to undefined reference to `get_ticks'

In reply to Prafulla Wadaskar

Quoted 1 line · On Wednesday 08 February 2012 06:09:32 Prafulla Wadaskar wrote:

+ulong get_tbclk (void)

no space before the "("

happens to all of them
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20120208/5b0a48e2/attachment.pgp>

Prafulla Wadaskar

author

2012-02-09 06:53 UTC #3 lore raw

PATCH v2 1/1 bugfix: all Marvell specific build fails due to undefined reference to `get_ticks'

Quoted 10 lines

-----Original Message-----
From: Mike Frysinger [mailto:vapier at gentoo.org]
Sent: 09 February 2012 09:12
To: u-boot at lists.denx.de
Cc: Prafulla Wadaskar; Ashish Karkare; Prabhanjan Sarnaik
Subject: Re: [U-Boot] [PATCH V2] bugfix: all Marvell specific build fails due to undefined reference to `get_ticks'

Quoted 6 lines

Quoted 1 line · On Wednesday 08 February 2012 06:09:32 Prafulla Wadaskar wrote:
+ulong get_tbclk (void)
no space before the "("
happens to all of them

Hi Mike
Thanks for this comment, actually there are few more places in the code too where such kind of cleanup needed.

I will post a separate cleanup patch for the same.

Regards..
Prafulla . . .