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>

diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index de6fbab..3716974 100644 (file)
--- 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)

diff --git a/drivers/serial/serial_sh.c b/drivers/serial/serial_sh.c
index 0801ac4..2b9eeed 100644 (file)
--- 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 */

diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h
index fa0e5db..ffa9b54 100644 (file)
--- 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 */

diff --git a/include/configs/mpr2.h b/include/configs/mpr2.h
index 0fc0b97..2598b34 100644 (file)
--- 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 */

diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h
index 5e79a27..dc0af15 100644 (file)
--- 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

diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h
index 7298e55..910a44e 100644 (file)
--- 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

diff --git a/include/configs/ms7750se.h b/include/configs/ms7750se.h
index 3000c77..bee0aab 100644 (file)
--- 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

diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h
index e269336..414e8dc 100644 (file)
--- 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

diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h
index 4c82c5a..0b08f18 100644 (file)
--- 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
 

diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h
index 5a65663..4723634 100644 (file)
--- 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