commit 609d35a8d1801f7569f5dfce98090ee4abeef9bf
author Marek Vasut <marex@denx.de> Tue May 01 11:09:53 2012 +0000
committer Albert ARIBAUD <albert.u.boot@aribaud.net> Tue May 15 08:31:36 2012 +0200
tree c984a8f7da6a5fe2e2cacab0e91dc370041d01b1
parent 336ff280a358c9f56ce51c7234dacf8f718ec617

i.MX28: Avoid redefining serial_put[cs]()

Do not define serial_putc() and serial_puts() calls if
CONFIG_SPL_SERIAL_SUPPORT is set.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Detlev Zundel <dzu@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Wolfgang Denk <wd@denx.de>
Acked-by: Stefano Babic <sbabic@denx.de>

arch/arm/cpu/arm926ejs/mx28/spl_boot.c

diff --git a/arch/arm/cpu/arm926ejs/mx28/spl_boot.c b/arch/arm/cpu/arm926ejs/mx28/spl_boot.c
index c9b4566..a6dfca3 100644
--- a/arch/arm/cpu/arm926ejs/mx28/spl_boot.c
+++ b/arch/arm/cpu/arm926ejs/mx28/spl_boot.c
@@ -123,8 +123,10 @@
 		;
 }
 
+#ifndef CONFIG_SPL_SERIAL_SUPPORT
 void serial_putc(const char c) {}
 void serial_puts(const char *s) {}
+#endif
 void hang(void) __attribute__ ((noreturn));
 void hang(void)
 {