From: Andreas Bießmann <biessmann@corscience.de>
Date: Tue, 30 Nov 2010 09:45:05 +0000 (+0000)
Subject: arm920t/at91/reset: board_reset: define weak symbol
X-Git-Tag: v2010.12-rc3~24^2~1
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=305bf489d1e7dd70f45720720ae0066fcce3acb1;p=karo-tx-uboot.git

arm920t/at91/reset: board_reset: define weak symbol

Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
---

diff --git a/arch/arm/cpu/arm920t/at91/reset.c b/arch/arm/cpu/arm920t/at91/reset.c
index ce9c156154..51043ecddb 100644
--- a/arch/arm/cpu/arm920t/at91/reset.c
+++ b/arch/arm/cpu/arm920t/at91/reset.c
@@ -35,7 +35,10 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_st.h>
 
-void board_reset(void) __attribute__((__weak__));
+void  __attribute__((weak)) board_reset(void)
+{
+	/* true empty function for defining weak symbol */
+}
 
 void reset_cpu(ulong ignored)
 {
@@ -45,8 +48,7 @@ void reset_cpu(ulong ignored)
 	serial_exit();
 #endif
 
-	if (board_reset)
-		board_reset();
+	board_reset();
 
 	/* Reset the cpu by setting up the watchdog timer */
 	writel(AT91_ST_WDMR_RSTEN | AT91_ST_WDMR_EXTEN | AT91_ST_WDMR_WDV(2),