summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-08-13 01:40:38 +0200
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-08-13 01:40:38 +0200
commit6c58a030f86829fa4f0d4337cf4b794c41a1823e (patch)
tree52fc9a0ec4b5492d9d46a8078cccd3bc33e96a13 /drivers
parentd6e9ee92e890f67594ab150689510df361133ead (diff)
downloadu-boot-imx-6c58a030f86829fa4f0d4337cf4b794c41a1823e.zip
u-boot-imx-6c58a030f86829fa4f0d4337cf4b794c41a1823e.tar.gz
u-boot-imx-6c58a030f86829fa4f0d4337cf4b794c41a1823e.tar.bz2
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/serial/Makefile2
-rw-r--r--drivers/serial/serial_sh.c4
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index de6fbab..3716974 100644
--- 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
--- 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 */