From: Marek Vasut <marex@denx.de>
Date: Tue, 1 May 2012 11:09:53 +0000 (+0000)
Subject: i.MX28: Avoid redefining serial_put[cs]()
X-Git-Tag: v2012.07-rc1~144^2~44
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=39007ec8cdd8ecfee659dca90f3b267b8e68da3c;p=oweals%2Fu-boot.git

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>
---

diff --git a/arch/arm/cpu/arm926ejs/mx28/spl_boot.c b/arch/arm/cpu/arm926ejs/mx28/spl_boot.c
index c9b45661b5..a6dfca3f51 100644
--- a/arch/arm/cpu/arm926ejs/mx28/spl_boot.c
+++ b/arch/arm/cpu/arm926ejs/mx28/spl_boot.c
@@ -123,8 +123,10 @@ inline void board_init_r(gd_t *id, ulong dest_addr)
 		;
 }
 
+#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)
 {