summaryrefslogtreecommitdiffstats
path: root/arch/arm/boards/karo-tx53
diff options
context:
space:
mode:
authorChristian Kapeller <christian.kapeller@cmotion.eu>2012-11-15 10:57:15 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2012-11-15 12:45:34 +0100
commit4f2ac27e2503e15bffdebca4757e02638686fe94 (patch)
tree2686027ce4801c415a7875f54b81b4d8c5f00e6f /arch/arm/boards/karo-tx53
parent3e976a79f27a1b2cbdce74c3a275eeff0dd3c2e8 (diff)
downloadbarebox-4f2ac27e2503e15bffdebca4757e02638686fe94.tar.gz
barebox-4f2ac27e2503e15bffdebca4757e02638686fe94.tar.xz
tx53: remove reset() when not doing lowlevel init.
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> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/boards/karo-tx53')
-rw-r--r--arch/arm/boards/karo-tx53/lowlevel.c3
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 6b7314c28e..0ca164bda5 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