Move DECLARE_GLOBAL_DATA_PTR to file scope

[u-boot] / 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 ce9c156154f1e3252d6770999a5eb2c196efa38c..51043ecddb3f66a5c0d56e13fdbd71e37cafeb77 100644 (file)
--- 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),