diff options
author | Marek Vasut <marex@denx.de> | 2012-05-01 11:09:53 +0000 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-05-15 08:31:36 +0200 |
commit | 39007ec8cdd8ecfee659dca90f3b267b8e68da3c (patch) | |
tree | c984a8f7da6a5fe2e2cacab0e91dc370041d01b1 /arch/arm | |
parent | c7527b70f96791c1ee746c870f4e728ed73f2bb9 (diff) | |
download | u-boot-imx-39007ec8cdd8ecfee659dca90f3b267b8e68da3c.zip u-boot-imx-39007ec8cdd8ecfee659dca90f3b267b8e68da3c.tar.gz u-boot-imx-39007ec8cdd8ecfee659dca90f3b267b8e68da3c.tar.bz2 |
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>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/cpu/arm926ejs/mx28/spl_boot.c | 2 |
1 files changed, 2 insertions, 0 deletions
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 @@ 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) { |