commit 470b4b01378bcf12030d5d424c39c3b3d8c59f7b
author Andreas Bießmann <biessmann@corscience.de> Tue Nov 30 09:45:05 2010 +0000
committer Reinhard Meyer <u-boot@emk-elektronik.de> Tue Dec 07 22:08:07 2010 +0100
tree 6b8a48af0d0f1f63c227f453cdb2075d66f0e25b
parent bb96a8ec0bb78fba05f99bebcb7fbc7e8d6183df

arm920t/at91/reset: board_reset: define weak symbol

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

arch/arm/cpu/arm920t/at91/reset.c

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