summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-07-05 21:10:23 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-07-25 09:27:27 +0200
commitb0927fc95c3669f5327f2cf588cf46e47dff5b26 (patch)
tree19270a471545549f2e0435a7f0a120c6fe08a108
parent97ba7671fefd02c562f8e064bb74506ccafefa2f (diff)
downloadbarebox-b0927fc95c3669f5327f2cf588cf46e47dff5b26.tar.gz
barebox-b0927fc95c3669f5327f2cf588cf46e47dff5b26.tar.xz
ARM: let armlinux_set_* depend on the correct option
We need inline versions of armlinux_set* exactly when CONFIG_ARM_LINUX is not set, because this is the symbol used to compile the non inline versions. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/include/asm/armlinux.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/include/asm/armlinux.h b/arch/arm/include/asm/armlinux.h
index 9ca1e4b6db..8ec8c4df7c 100644
--- a/arch/arm/include/asm/armlinux.h
+++ b/arch/arm/include/asm/armlinux.h
@@ -3,8 +3,7 @@
#include <asm/memory.h>
-#if defined CONFIG_CMD_BOOTM || defined CONFIG_CMD_BOOTZ || \
- defined CONFIG_CMD_BOOTU
+#if defined CONFIG_ARM_LINUX
void armlinux_set_bootparams(void *params);
void armlinux_set_architecture(int architecture);
void armlinux_set_revision(unsigned int);