From: "Andreas Bießmann" <andreas.devel@googlemail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v2 3/4] arm920t/at91/reset: board_reset: define weak symbol
Date: Tue, 30 Nov 2010 20:45:05 +0100 [thread overview]
Message-ID: <1291146306-15103-4-git-send-email-andreas.devel@googlemail.com> (raw)
In-Reply-To: <1291146306-15103-1-git-send-email-andreas.devel@googlemail.com>
From: Andreas Bie?mann <biessmann@corscience.de>
Signed-off-by: Andreas Bie?mann <biessmann@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
next prev parent reply other threads:[~2010-11-30 19:45 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-30 19:45 [U-Boot] [PATCH v2 0/4] get at91rm9200ek working with ARM relocation Andreas Bießmann
2010-11-30 19:45 ` [U-Boot] [PATCH v2 1/4] at91rm9200ek: add configure target for RAM boot Andreas Bießmann
2010-11-30 19:45 ` [U-Boot] [PATCH v2 2/4] MAKEALL: fix AT91 Andreas Bießmann
2010-11-30 19:45 ` Andreas Bießmann [this message]
2010-12-02 19:00 ` [U-Boot] [PATCH v2 3/4] arm920t/at91/reset: board_reset: define weak symbol Jens Scharsig
2010-11-30 19:45 ` [U-Boot] [PATCH v2 4/4] arm920t/at91/timer: replace bss variables by gd Andreas Bießmann
2010-11-30 19:58 ` [U-Boot] [PATCH v2 0/4] get at91rm9200ek working with ARM relocation Reinhard Meyer
2010-11-30 22:20 ` Andreas Bießmann
2010-12-05 9:53 ` Reinhard Meyer
2010-12-05 17:43 ` Andreas Bießmann
2010-12-05 17:56 ` Albert ARIBAUD
2010-12-05 18:05 ` Andreas Bießmann
2010-12-05 19:14 ` Reinhard Meyer
2010-12-05 20:00 ` Albert ARIBAUD
2010-12-05 22:05 ` Reinhard Meyer
2010-12-05 21:04 ` Wolfgang Denk
2010-12-05 21:24 ` Reinhard Meyer
2010-12-05 21:42 ` Wolfgang Denk
2010-12-05 21:51 ` Reinhard Meyer
2010-12-06 5:37 ` Wolfgang Denk
2010-12-06 5:56 ` Reinhard Meyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1291146306-15103-4-git-send-email-andreas.devel@googlemail.com \
--to=andreas.devel@googlemail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox