mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Christian Kapeller <christian.kapeller@cmotion.eu>
To: barebox@lists.infradead.org
Cc: "Günter Gebhardt" <guenter.gebhardt@freenet.de>,
	g@pengutronix.de, "Peter Wippich" <pewi@gw-instruments.de>
Subject: [TX53: boot fixes 2/2] tx53: remove reset() when not doing lowlevel init.
Date: Thu, 15 Nov 2012 10:57:15 +0100	[thread overview]
Message-ID: <1352973435-11618-3-git-send-email-christian.kapeller@cmotion.eu> (raw)
In-Reply-To: <1352973435-11618-1-git-send-email-christian.kapeller@cmotion.eu>
In-Reply-To: <alpine.LSU.2.00.1211121220380.14365@redbean.intranet.gw-instruments.de>

This patch fixes a linker error when PBL_IMAGE=n and DO_LOW_LEVEL_INIT=n.
In this configuration the symbol reset() was present multiple times,
and prevented the barebox image to be linked.


Signed-off-by: Christian Kapeller <christian.kapeller@cmotion.eu>
---
 arch/arm/boards/karo-tx53/lowlevel.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/arch/arm/boards/karo-tx53/lowlevel.c b/arch/arm/boards/karo-tx53/lowlevel.c
index 6b7314c..0ca164b 100644
--- a/arch/arm/boards/karo-tx53/lowlevel.c
+++ b/arch/arm/boards/karo-tx53/lowlevel.c
@@ -3,6 +3,8 @@
 #include <asm/barebox-arm.h>
 #include <mach/imx5.h>
 
+#ifdef CONFIG_MACH_DO_LOWLEVEL_INIT
+
 void __naked reset(void)
 {
 	common_reset();
@@ -17,3 +19,4 @@ void __naked reset(void)
 
 	board_init_lowlevel_return();
 }
+#endif
-- 
1.7.5.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2012-11-15  9:57 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-06 13:49 TX53: Not Bootable from next tree Peter Wippich
2012-11-07  8:04 ` Sascha Hauer
2012-11-12  8:33 ` Sascha Hauer
2012-11-12 11:22   ` Peter Wippich
2012-11-15  9:57     ` [TX53: boot fixes 0/2] Make TX53 bootable again Christian Kapeller
2012-11-15 11:46       ` Sascha Hauer
2012-11-15 12:00         ` Christian Kapeller
2012-11-15  9:57     ` [TX53: boot fixes 1/2] tx53: Fix unbootable TX53-8030 Christian Kapeller
2012-11-15  9:57     ` Christian Kapeller [this message]
2012-11-12 13:02   ` TX53: Not Bootable from next tree Christian Kapeller

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=1352973435-11618-3-git-send-email-christian.kapeller@cmotion.eu \
    --to=christian.kapeller@cmotion.eu \
    --cc=barebox@lists.infradead.org \
    --cc=g@pengutronix.de \
    --cc=guenter.gebhardt@freenet.de \
    --cc=pewi@gw-instruments.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