projects
/
project
/
bcm63xx
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c7527b7
)
i.MX28: Avoid redefining serial_put[cs]()
author
Marek Vasut
<
[email protected]
>
Tue, 1 May 2012 11:09:53 +0000
(11:09 +0000)
committer
Albert ARIBAUD
<
[email protected]
>
Tue, 15 May 2012 06:31:36 +0000
(08:31 +0200)
Do not define serial_putc() and serial_puts() calls if
CONFIG_SPL_SERIAL_SUPPORT is set.
Signed-off-by: Marek Vasut <
[email protected]
>
Cc: Detlev Zundel <
[email protected]
>
Cc: Fabio Estevam <
[email protected]
>
Cc: Stefano Babic <
[email protected]
>
Cc: Wolfgang Denk <
[email protected]
>
Acked-by: Stefano Babic <
[email protected]
>
arch/arm/cpu/arm926ejs/mx28/spl_boot.c
patch
|
blob
|
history
diff --git
a/arch/arm/cpu/arm926ejs/mx28/spl_boot.c
b/arch/arm/cpu/arm926ejs/mx28/spl_boot.c
index c9b45661b51f07c6a0f63a5a1b2cf6f35c59e0eb..a6dfca3f51f66ff87d758dbe7d9633a696191be6 100644
(file)
--- 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)
{