[U-Boot] [PATCH v2 3/4] arm920t/at91/reset: board_reset: define weak symbol

Andreas Bießmann andreas.devel at googlemail.com
Tue Nov 30 20:45:05 CET 2010


From: Andreas Bießmann <biessmann at corscience.de>

Signed-off-by: Andreas Bießmann <biessmann at corscience.de>
---
remove 'arm920t: fix linker skript for -pie linking' in favor of this patch

 arch/arm/cpu/arm920t/at91/reset.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/arch/arm/cpu/arm920t/at91/reset.c b/arch/arm/cpu/arm920t/at91/reset.c
index ce9c156..7ba0814 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),
-- 
1.7.3.2



More information about the U-Boot mailing list