diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-08-13 01:40:39 +0200 |
|---|---|---|
| committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-08-13 01:40:39 +0200 |
| commit | 1a6ffbfaf4353bec379ed1fcfc54b6f1a30af09a (patch) | |
| tree | 7f553ae05760a0f446e782b1933429f062967dca | |
| parent | 6c58a030f86829fa4f0d4337cf4b794c41a1823e (diff) | |
| download | olio-uboot-2014.01-1a6ffbfaf4353bec379ed1fcfc54b6f1a30af09a.tar.xz olio-uboot-2014.01-1a6ffbfaf4353bec379ed1fcfc54b6f1a30af09a.zip | |
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>
| -rw-r--r-- | drivers/serial/Makefile | 2 | ||||
| -rw-r--r-- | drivers/serial/ns9750_serial.c | 4 | ||||
| -rw-r--r-- | include/configs/ns9750dev.h | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index 3716974c6..2384735a2 100644 --- 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 02c0d3952..e9645a053 100644 --- 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 f30cb46cf..746a56e9a 100644 --- 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 */ /* |