serial: move CFG_SCIF_CONSOLE to CONFIG_SCIF_CONSOLE

move also conditional compilation to Makefile Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
17 years ago · 6c58a030f8
parent d6e9ee92e8
commit 6c58a030f8
10 changed files with 9 additions and 13 deletions
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@ -35,7 +35,7 @@ COBJS-$(CONFIG_MAX3100_SERIAL) += serial_max3100.o
 COBJS-y += serial_pl010.o
 COBJS-y += serial_pl011.o
 COBJS-$(CONFIG_XILINX_UARTLITE) += serial_xuartlite.o
-COBJS-y += serial_sh.o
+COBJS-$(CONFIG_SCIF_CONSOLE) += serial_sh.o
 COBJS-$(CONFIG_USB_TTY) += usbtty.o

 COBJS	:= $(COBJS-y)
--- a/drivers/serial/serial_sh.c
+++ b/drivers/serial/serial_sh.c
@ -20,8 +20,6 @@
 #include <common.h>
 #include <asm/processor.h>

-#ifdef CFG_SCIF_CONSOLE
-
 #if defined (CONFIG_CONS_SCIF0)
 #define SCIF_BASE	SCIF0_BASE
 #elif defined (CONFIG_CONS_SCIF1)
@ -215,5 +213,3 @@ int serial_getc(void)

 	return ch;
 }
-
-#endif /* CFG_SCIF_CONSOLE */
--- a/include/configs/MigoR.h
+++ b/include/configs/MigoR.h
@ -67,7 +67,7 @@
 #define CFG_BAUDRATE_TABLE	{ 115200 }	/* List of legal baudrate settings for this board */

 /* SCIF */
-#define CFG_SCIF_CONSOLE	1
+#define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_CONS_SCIF0	1
 #undef  CFG_CONSOLE_INFO_QUIET	/* Suppress display of console
 								   information at boot */
--- a/include/configs/mpr2.h
+++ b/include/configs/mpr2.h
@ -86,7 +86,7 @@
 #define CFG_HZ			(CONFIG_SYS_CLK_FREQ / TMU_CLK_DIVIDER)

 /* UART */
-#define CFG_SCIF_CONSOLE	1
+#define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_CONS_SCIF0	1

 #endif	/* __MPR2_H */
--- a/include/configs/ms7720se.h
+++ b/include/configs/ms7720se.h
@ -63,7 +63,7 @@
 #define CFG_BAUDRATE_TABLE	{ 115200 }

 /* SCIF */
-#define CFG_SCIF_CONSOLE	1
+#define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_CONS_SCIF0	1

 #define CFG_MEMTEST_START	MS7720SE_SDRAM_BASE
--- a/include/configs/ms7722se.h
+++ b/include/configs/ms7722se.h
@ -62,7 +62,7 @@
 #define CFG_BAUDRATE_TABLE	{ 115200 }	/* List of legal baudrate settings for this board */

 /* SCIF */
-#define CFG_SCIF_CONSOLE	1
+#define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_CONS_SCIF0	1
 #undef  CFG_CONSOLE_INFO_QUIET			/* Suppress display of console information at boot */
 #undef  CFG_CONSOLE_OVERWRITE_ROUTINE
--- a/include/configs/ms7750se.h
+++ b/include/configs/ms7750se.h
@ -42,7 +42,7 @@
 #define CONFIG_CMD_FLASH
 #define CONFIG_CMD_ENV

-#define CFG_SCIF_CONSOLE	1
+#define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_BAUDRATE		38400
 #define CONFIG_CONS_SCIF1	1
 #define BOARD_LATE_INIT		1
--- a/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@ -26,7 +26,7 @@
 #define CONFIG_DOS_PARTITION

 /* SCIF */
-#define CFG_SCIF_CONSOLE	1
+#define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_BAUDRATE		115200
 #define CONFIG_CONS_SCIF1	1
 #define BOARD_LATE_INIT		1
--- a/include/configs/r7780mp.h
+++ b/include/configs/r7780mp.h
@ -49,7 +49,7 @@
 #define CONFIG_CMD_EXT2
 #define CONFIG_DOS_PARTITION

-#define CFG_SCIF_CONSOLE	1
+#define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_BAUDRATE		115200
 #define CONFIG_CONS_SCIF0	1

--- a/include/configs/sh7763rdp.h
+++ b/include/configs/sh7763rdp.h
@ -52,7 +52,7 @@
 #undef  CONFIG_SHOW_BOOT_PROGRESS

 /* SCIF */
-#define CFG_SCIF_CONSOLE        1
+#define CONFIG_SCIF_CONSOLE        1
 #define CONFIG_BAUDRATE         115200
 #define CONFIG_CONS_SCIF2		1