summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorAndreas Bießmann <biessmann@corscience.de>2010-11-30 09:45:05 +0000
committerReinhard Meyer <u-boot@emk-elektronik.de>2010-12-07 22:08:07 +0100
commit305bf489d1e7dd70f45720720ae0066fcce3acb1 (patch)
tree6b8a48af0d0f1f63c227f453cdb2075d66f0e25b /arch/arm
parent0a41edaabb74f2ccfde62a232165088098763e3e (diff)
downloadu-boot-imx-305bf489d1e7dd70f45720720ae0066fcce3acb1.zip
u-boot-imx-305bf489d1e7dd70f45720720ae0066fcce3acb1.tar.gz
u-boot-imx-305bf489d1e7dd70f45720720ae0066fcce3acb1.tar.bz2
arm920t/at91/reset: board_reset: define weak symbol
Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/cpu/arm920t/at91/reset.c8
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..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 @@ 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),