diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-12-08 23:17:57 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-12-08 23:17:57 +0100 |
| commit | b097b9282c96ee0a10fc5e64894be440e075335d (patch) | |
| tree | caf53bd1ac96587323f1d69b6770b19e8155a772 /arch/arm/cpu/arm920t/at91/reset.c | |
| parent | a430b137eb578cf73be476ff05a43baa2aba1ad8 (diff) | |
| parent | a429db7e3ce6136f80f22584588247926ba60b05 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/cpu/arm920t/at91/reset.c')
| -rw-r--r-- | 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 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), |