提交: 248d426abdbbbf4f73835ce45017d62ca8ddddc3 - uboot (git)

Commit MetaInfo

• 修訂: 248d426abdbbbf4f73835ce45017d62ca8ddddc3 (tree)
• 時間: 2016-04-17 18:04:10
• 作者: Yoshinori Sato <ysato@user...>
• Commiter: Yoshinori Sato

Log Message

spl: disable serial output for !CONFIG_SPL_SERIAL

Signed-off-by: Yoshinori Sato <[e-mail]>

Change Summary

• modified: common/console.c
• modified: common/spl/spl.c
• modified: include/command.h
• modified: include/common.h
• modified: include/exports.h
• modified: lib/Makefile

差異

--- a/common/console.c
+++ b/common/console.c
@@ -267,7 +267,7 @@ static inline void console_doenv(int file, struct stdio_dev *dev)
 #endif /* defined(CONFIG_CONSOLE_MUX) */
 
 /** U-Boot INITIAL CONSOLE-NOT COMPATIBLE FUNCTIONS *************************/
-
+#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_SERIAL_SUPPORT)
 int serial_printf(const char *fmt, ...)
 {
 	va_list args;
@@ -285,6 +285,12 @@ int serial_printf(const char *fmt, ...)
 	serial_puts(printbuffer);
 	return i;
 }
+#else
+int serial_printf(const char *fmt, ...)
+{
+	return 0;
+}
+#endif
 
 int fgetc(int file)
 {
@@ -495,9 +501,11 @@ void putc(const char c)
 		/* Send to the standard output */
 		fputc(stdout, c);
 	} else {
+#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_SERIAL_SUPPORT)
 		/* Send directly to the handler */
 		pre_console_putc(c);
 		serial_putc(c);
+#endif
 	}
 }
 
@@ -540,9 +548,11 @@ void puts(const char *s)
 		/* Send to the standard output */
 		fputs(stdout, s);
 	} else {
+#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_SERIAL_SUPPORT)
 		/* Send directly to the handler */
 		pre_console_puts(s);
 		serial_puts(s);
+#endif
 	}
 }
 
@@ -740,13 +750,14 @@ int console_init_r(void)
 	int iomux_err = 0;
 #endif
 
+#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_SERIAL_SUPPORT)
 	/* set default handlers at first */
 	gd->jt->getc  = serial_getc;
 	gd->jt->tstc  = serial_tstc;
 	gd->jt->putc  = serial_putc;
 	gd->jt->puts  = serial_puts;
 	gd->jt->printf = serial_printf;
-
+#endif
 	/* stdin stdout and stderr are in environment */
 	/* scan for it */
 	stdinname  = getenv("stdin");

--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -32,8 +32,10 @@ DECLARE_GLOBAL_DATA_PTR;
 u32 *boot_params_ptr = NULL;
 struct spl_image_info spl_image;
 
+#ifdef CONFIG_SPL_SERIAL_SUPPORT
 /* Define board data structure */
 static bd_t bdata __attribute__ ((section(".data")));
+#endif
 
 /*
  * Default function to determine if u-boot or the OS should
@@ -408,6 +410,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
 	jump_to_image_no_args(&spl_image);
 }
 
+#ifdef CONFIG_SPL_SERIAL_SUPPORT
 /*
  * This requires UART clocks to be enabled.  In order for this to work the
  * caller must ensure that the gd pointer is valid.
@@ -475,3 +478,4 @@ ulong spl_relocate_stack_gd(void)
 	return 0;
 #endif
 }
+#endif

--- a/include/command.h
+++ b/include/command.h
@@ -92,7 +92,7 @@ extern int cmd_get_data_size(char* arg, int default_size);
 #ifdef CONFIG_CMD_BOOTD
 extern int do_bootd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
 #endif
-#ifdef CONFIG_CMD_BOOTM
+#if defined(CONFIG_CMD_BOOTM) && !defined(CONFIG_SPL_BUILD)
 extern int do_bootm(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
 extern int bootm_maybe_autostart(cmd_tbl_t *cmdtp, const char *cmd);
 #else

--- a/include/common.h
+++ b/include/common.h
@@ -856,15 +856,13 @@ int	tstc(void);
 #if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_SERIAL_SUPPORT)
 #define	putc(...) do { } while (0)
 #define puts(...) do { } while (0)
-#define printf(...) do { } while (0)
-#define vprintf(...) do { } while (0)
 #else
 void	putc(const char c);
 void	puts(const char *s);
+#endif
 int	printf(const char *fmt, ...)
 		__attribute__ ((format (__printf__, 1, 2)));
 int	vprintf(const char *fmt, va_list args);
-#endif
 
 /* stderr */
 #define eputc(c)		fputc(stderr, c)

--- a/include/exports.h
+++ b/include/exports.h
@@ -11,11 +11,13 @@ struct spi_slave;
 
 /* These are declarations of exported functions available in C code */
 unsigned long get_version(void);
+#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_SERIAL_SUPPORT)
 int  getc(void);
 int  tstc(void);
 void putc(const char);
 void puts(const char*);
 int printf(const char* fmt, ...);
+#endif
 void install_hdlr(int, interrupt_handler_t, void*);
 void free_hdlr(int);
 void *malloc(size_t);
@@ -24,7 +26,9 @@ void free(void*);
 #endif
 void __udelay(unsigned long);
 unsigned long get_timer(unsigned long);
+#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_SERIAL_SUPPORT)
 int vprintf(const char *, va_list);
+#endif
 unsigned long simple_strtoul(const char *cp, char **endp, unsigned int base);
 int strict_strtoul(const char *cp, unsigned int base, unsigned long *res);
 char *getenv (const char *name);

--- a/lib/Makefile
+++ b/lib/Makefile
@@ -83,9 +83,9 @@ obj-$(CONFIG_LIB_RAND) += rand.o
 ifdef CONFIG_SPL_BUILD
 # SPL U-Boot may use full-printf, tiny-printf or none at all
 ifdef CONFIG_USE_TINY_PRINTF
-obj-$(CONFIG_SPL_SERIAL_SUPPORT) += tiny-printf.o panic.o strto.o
+obj-y += tiny-printf.o panic.o strto.o
 else
-obj-$(CONFIG_SPL_SERIAL_SUPPORT) += vsprintf.o panic.o strto.o
+obj-y += vsprintf.o panic.o strto.o
 endif
 else
 # Main U-Boot always uses the full printf support