summaryrefslogtreecommitdiff
path: root/arch/arm/cpu/arm926ejs/davinci
diff options
context:
space:
mode:
authorChristian Riesch <christian.riesch@omicron.at>2011-12-14 09:54:36 +0100
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2011-12-24 10:23:30 +0100
commit8f7431400a67c4844240f875ebd7e4bcb3332633 (patch)
treedbb684c5b7cea1f4c2f4ed7b064bd5b405436df1 /arch/arm/cpu/arm926ejs/davinci
parent13b178edc242cb7b61b6f4264456f7061fa3cf5b (diff)
downloadu-boot-imx-8f7431400a67c4844240f875ebd7e4bcb3332633.zip
u-boot-imx-8f7431400a67c4844240f875ebd7e4bcb3332633.tar.gz
u-boot-imx-8f7431400a67c4844240f875ebd7e4bcb3332633.tar.bz2
arm, davinci: Fix build warnings for cam_enc_4xx
This patch fixes a build warning for the cam_enc_4xx board introduced by commit d6ec0c0dfc70447cf615ae80a952da81f73f16b4: spl.c:35:13: warning: 'gdata' defined but not used spl.c:36:13: warning: 'bdata' defined but not used Signed-off-by: Christian Riesch <christian.riesch@omicron.at> Cc: Tom Rini <trini@ti.com> Cc: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'arch/arm/cpu/arm926ejs/davinci')
-rw-r--r--arch/arm/cpu/arm926ejs/davinci/spl.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/cpu/arm926ejs/davinci/spl.c b/arch/arm/cpu/arm926ejs/davinci/spl.c
index 20f798e..f475f9b 100644
--- a/arch/arm/cpu/arm926ejs/davinci/spl.c
+++ b/arch/arm/cpu/arm926ejs/davinci/spl.c
@@ -29,13 +29,14 @@
#include <malloc.h>
#include <spi_flash.h>
-DECLARE_GLOBAL_DATA_PTR;
+#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
+DECLARE_GLOBAL_DATA_PTR;
/* Define global data structure pointer to it*/
static gd_t gdata __attribute__ ((section(".data")));
static bd_t bdata __attribute__ ((section(".data")));
-#ifndef CONFIG_SPL_LIBCOMMON_SUPPORT
+#else
void puts(const char *str)
{