serial: move CFG_NS9750_UART to CONFIG_NS9750_UART

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 3716974c62e0abbb2141591fd15f8a894438bd69..2384735a2ce125752931fb48c4513ce8bf14a07b 100644 (file)
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -27,7 +27,7 @@ LIB   := $(obj)libserial.a
 
 COBJS-$(CONFIG_ATMEL_USART) += atmel_usart.o
 COBJS-$(CONFIG_MCFUART) += mcfuart.o
-COBJS-y += ns9750_serial.o
+COBJS-$(CONFIG_NS9750_UART) += ns9750_serial.o
 COBJS-y += ns16550.o
 COBJS-$(CONFIG_DRIVER_S3C4510_UART) += s3c4510b_uart.o
 COBJS-y += serial.o

diff --git a/drivers/serial/ns9750_serial.c b/drivers/serial/ns9750_serial.c
index 02c0d3952099c58cf4a8034adf55ae4f51ea8877..e9645a053de19166153314f5fe3b0022d65d3a66 100644 (file)
--- a/drivers/serial/ns9750_serial.c
+++ b/drivers/serial/ns9750_serial.c
@@ -28,8 +28,6 @@
 
 #include <common.h>
 
-#ifdef CFG_NS9750_UART
-
 #include "ns9750_bbus.h"       /* for GPIOs */
 #include "ns9750_ser.h"                /* for serial configuration */
 
@@ -210,5 +208,3 @@ static unsigned int calcRxCharGapRegister( void )
 {
        return NS9750_SER_RX_CHAR_TIMER_TRUN;
 }
-
-#endif /* CFG_NS9750_UART */

diff --git a/include/configs/ns9750dev.h b/include/configs/ns9750dev.h
index f30cb46cf7ccfd1d7f4521e0f303416763e98e56..746a56e9aa36814bcf8f728886e20913738075b6 100644 (file)
--- a/include/configs/ns9750dev.h
+++ b/include/configs/ns9750dev.h
@@ -56,7 +56,7 @@
 /*
  * Hardware drivers
  */
-#define CFG_NS9750_UART                        1       /* use on-chip UART */
+#define CONFIG_NS9750_UART             1       /* use on-chip UART */
 #define CONFIG_DRIVER_NS9750_ETHERNET  1       /* use on-chip ethernet */
 
 /*