summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2012-09-14 23:44:09 +0200
committerTom Rini <trini@ti.com>2012-10-15 11:53:58 -0700
commita3827250606895ec2dd4b8d867342b7cabf3692f (patch)
tree6b12200d510d6f07ce49ef3e90642b09142e60f4 /board
parentbffe31c144909722eb8b5878992fdf402cd42f9d (diff)
serial: Remove CONFIG_SERIAL_MULTI from serial drivers
Remove the support for not-CONFIG_SERIAL_MULTI part from serial port drivers and some board files. Since CONFIG_SERIAL_MULTI is now enabled by default, that part is a dead code. Remove it. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Marek Vasut <marek.vasut@gmail.com> Cc: Anatolij Gustschin <agust@denx.de> Cc: Stefan Roese <sr@denx.de> Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'board')
-rw-r--r--board/Marvell/common/serial.c32
-rw-r--r--board/amirix/ap1000/serial.c31
-rw-r--r--board/bmw/serial.c32
-rw-r--r--board/cogent/serial.c32
-rw-r--r--board/esd/cpci750/serial.c31
-rw-r--r--board/evb64260/serial.c31
-rw-r--r--board/ml2/serial.c31
-rw-r--r--board/pcippc2/sconsole.c31
-rw-r--r--board/pdm360ng/pdm360ng.c6
-rw-r--r--board/prodrive/p3mx/serial.c32
-rw-r--r--board/trizepsiv/conxs.c2
11 files changed, 0 insertions, 291 deletions
diff --git a/board/Marvell/common/serial.c b/board/Marvell/common/serial.c
index a5231eb434e..1327c62a75a 100644
--- a/board/Marvell/common/serial.c
+++ b/board/Marvell/common/serial.c
@@ -146,7 +146,6 @@ static void marvell_serial_puts(const char *s)
}
}
-#ifdef CONFIG_SERIAL_MULTI
static struct serial_device marvell_serial_drv = {
.name = "marvell_serial",
.start = marvell_serial_init,
@@ -167,37 +166,6 @@ __weak struct serial_device *default_serial_console(void)
{
return &marvell_serial_drv;
}
-#else
-int serial_init(void)
-{
- return marvell_serial_init();
-}
-
-void serial_setbrg(void)
-{
- marvell_serial_setbrg();
-}
-
-void serial_putc(const char c)
-{
- marvell_serial_putc(c);
-}
-
-void serial_puts(const char *s)
-{
- marvell_serial_puts(s);
-}
-
-int serial_getc(void)
-{
- return marvell_serial_getc();
-}
-
-int serial_tstc(void)
-{
- return marvell_serial_tstc();
-}
-#endif
#if defined(CONFIG_CMD_KGDB)
void kgdb_serial_init (void)
diff --git a/board/amirix/ap1000/serial.c b/board/amirix/ap1000/serial.c
index 2c2e9f9d769..a77d332bcd8 100644
--- a/board/amirix/ap1000/serial.c
+++ b/board/amirix/ap1000/serial.c
@@ -86,7 +86,6 @@ static void amirix_serial_puts(const char *s)
}
}
-#ifdef CONFIG_SERIAL_MULTI
static struct serial_device amirix_serial_drv = {
.name = "amirix_serial",
.start = amirix_serial_init,
@@ -107,37 +106,7 @@ __weak struct serial_device *default_serial_console(void)
{
return &amirix_serial_drv;
}
-#else
-int serial_init(void)
-{
- return amirix_serial_init();
-}
-
-void serial_setbrg(void)
-{
- amirix_serial_setbrg();
-}
-void serial_putc(const char c)
-{
- amirix_serial_putc(c);
-}
-
-void serial_puts(const char *s)
-{
- amirix_serial_puts(s);
-}
-
-int serial_getc(void)
-{
- return amirix_serial_getc();
-}
-
-int serial_tstc(void)
-{
- return amirix_serial_tstc();
-}
-#endif
#if defined(CONFIG_CMD_KGDB)
void kgdb_serial_init (void)
{
diff --git a/board/bmw/serial.c b/board/bmw/serial.c
index 569131fbd5d..08f449c8642 100644
--- a/board/bmw/serial.c
+++ b/board/bmw/serial.c
@@ -83,7 +83,6 @@ static void bmw_serial_setbrg(void)
NS16550_reinit (console, clock_divisor);
}
-#ifdef CONFIG_SERIAL_MULTI
static struct serial_device bmw_serial_drv = {
.name = "bmw_serial",
.start = bmw_serial_init,
@@ -104,34 +103,3 @@ __weak struct serial_device *default_serial_console(void)
{
return &bmw_serial_drv;
}
-#else
-int serial_init(void)
-{
- return bmw_serial_init();
-}
-
-void serial_setbrg(void)
-{
- bmw_serial_setbrg();
-}
-
-void serial_putc(const char c)
-{
- bmw_serial_putc(c);
-}
-
-void serial_puts(const char *s)
-{
- bmw_serial_puts(s);
-}
-
-int serial_getc(void)
-{
- return bmw_serial_getc();
-}
-
-int serial_tstc(void)
-{
- return bmw_serial_tstc();
-}
-#endif
diff --git a/board/cogent/serial.c b/board/cogent/serial.c
index 18a9dbf35cd..cd4a976f89e 100644
--- a/board/cogent/serial.c
+++ b/board/cogent/serial.c
@@ -90,7 +90,6 @@ static int cogent_serial_tstc(void)
return ((cma_mb_reg_read (&mbsp->ser_lsr) & LSR_DR) != 0);
}
-#ifdef CONFIG_SERIAL_MULTI
static struct serial_device cogent_serial_drv = {
.name = "cogent_serial",
.start = cogent_serial_init,
@@ -111,37 +110,6 @@ __weak struct serial_device *default_serial_console(void)
{
return &cogent_serial_drv;
}
-#else
-int serial_init(void)
-{
- return cogent_serial_init();
-}
-
-void serial_setbrg(void)
-{
- cogent_serial_setbrg();
-}
-
-void serial_putc(const char c)
-{
- cogent_serial_putc(c);
-}
-
-void serial_puts(const char *s)
-{
- cogent_serial_puts(s);
-}
-
-int serial_getc(void)
-{
- return cogent_serial_getc();
-}
-
-int serial_tstc(void)
-{
- return cogent_serial_tstc();
-}
-#endif
#endif /* CONS_NONE */
#if defined(CONFIG_CMD_KGDB) && \
diff --git a/board/esd/cpci750/serial.c b/board/esd/cpci750/serial.c
index 9ff7c27c9bb..25f8950e9ad 100644
--- a/board/esd/cpci750/serial.c
+++ b/board/esd/cpci750/serial.c
@@ -83,7 +83,6 @@ static void cpci750_serial_puts(const char *s)
}
}
-#ifdef CONFIG_SERIAL_MULTI
static struct serial_device cpci750_serial_drv = {
.name = "cpci750_serial",
.start = cpci750_serial_init,
@@ -104,37 +103,7 @@ __weak struct serial_device *default_serial_console(void)
{
return &cpci750_serial_drv;
}
-#else
-int serial_init(void)
-{
- return cpci750_serial_init();
-}
-
-void serial_setbrg(void)
-{
- cpci750_serial_setbrg();
-}
-void serial_putc(const char c)
-{
- cpci750_serial_putc(c);
-}
-
-void serial_puts(const char *s)
-{
- cpci750_serial_puts(s);
-}
-
-int serial_getc(void)
-{
- return cpci750_serial_getc();
-}
-
-int serial_tstc(void)
-{
- return cpci750_serial_tstc();
-}
-#endif
#if defined(CONFIG_CMD_KGDB)
void kgdb_serial_init (void)
{
diff --git a/board/evb64260/serial.c b/board/evb64260/serial.c
index cf46a4d1270..9fd429864a7 100644
--- a/board/evb64260/serial.c
+++ b/board/evb64260/serial.c
@@ -146,7 +146,6 @@ static void evb64260_serial_puts(const char *s)
}
}
-#ifdef CONFIG_SERIAL_MULTI
static struct serial_device evb64260_serial_drv = {
.name = "evb64260_serial",
.start = evb64260_serial_init,
@@ -167,37 +166,7 @@ __weak struct serial_device *default_serial_console(void)
{
return &evb64260_serial_drv;
}
-#else
-int serial_init(void)
-{
- return evb64260_serial_init();
-}
-
-void serial_setbrg(void)
-{
- evb64260_serial_setbrg();
-}
-void serial_putc(const char c)
-{
- evb64260_serial_putc(c);
-}
-
-void serial_puts(const char *s)
-{
- evb64260_serial_puts(s);
-}
-
-int serial_getc(void)
-{
- return evb64260_serial_getc();
-}
-
-int serial_tstc(void)
-{
- return evb64260_serial_tstc();
-}
-#endif
#if defined(CONFIG_CMD_KGDB)
void
kgdb_serial_init(void)
diff --git a/board/ml2/serial.c b/board/ml2/serial.c
index 0ed1150d905..787ff464d21 100644
--- a/board/ml2/serial.c
+++ b/board/ml2/serial.c
@@ -90,7 +90,6 @@ static void ml2_serial_puts(const char *s)
}
}
-#ifdef CONFIG_SERIAL_MULTI
static struct serial_device ml2_serial_drv = {
.name = "ml2_serial",
.start = ml2_serial_init,
@@ -111,37 +110,7 @@ __weak struct serial_device *default_serial_console(void)
{
return &ml2_serial_drv;
}
-#else
-int serial_init(void)
-{
- return ml2_serial_init();
-}
-
-void serial_setbrg(void)
-{
- ml2_serial_setbrg();
-}
-void serial_putc(const char c)
-{
- ml2_serial_putc(c);
-}
-
-void serial_puts(const char *s)
-{
- ml2_serial_puts(s);
-}
-
-int serial_getc(void)
-{
- return ml2_serial_getc();
-}
-
-int serial_tstc(void)
-{
- return ml2_serial_tstc();
-}
-#endif
#if defined(CONFIG_CMD_KGDB)
void kgdb_serial_init (void)
{
diff --git a/board/pcippc2/sconsole.c b/board/pcippc2/sconsole.c
index 0a319635570..aa3c908c638 100644
--- a/board/pcippc2/sconsole.c
+++ b/board/pcippc2/sconsole.c
@@ -115,7 +115,6 @@ static void sconsole_serial_setbrg(void)
}
}
-#ifdef CONFIG_SERIAL_MULTI
static struct serial_device sconsole_serial_drv = {
.name = "sconsole_serial",
.start = sconsole_serial_init,
@@ -136,37 +135,7 @@ __weak struct serial_device *default_serial_console(void)
{
return &sconsole_serial_drv;
}
-#else
-int serial_init(void)
-{
- return sconsole_serial_init();
-}
-
-void serial_setbrg(void)
-{
- sconsole_serial_setbrg();
-}
-
-void serial_putc(const char c)
-{
- sconsole_serial_putc(c);
-}
-void serial_puts(const char *s)
-{
- sconsole_serial_puts(s);
-}
-
-int serial_getc(void)
-{
- return sconsole_serial_getc();
-}
-
-int serial_tstc(void)
-{
- return sconsole_serial_tstc();
-}
-#endif
int sconsole_get_baudrate (void)
{
sconsole_buffer_t *sb = SCONSOLE_BUFFER;
diff --git a/board/pdm360ng/pdm360ng.c b/board/pdm360ng/pdm360ng.c
index 2082ad48a27..a2a132344f5 100644
--- a/board/pdm360ng/pdm360ng.c
+++ b/board/pdm360ng/pdm360ng.c
@@ -172,9 +172,7 @@ phys_size_t initdram (int board_type)
return msize;
}
-#if defined(CONFIG_SERIAL_MULTI)
static int set_lcd_brightness(char *);
-#endif
int misc_init_r(void)
{
@@ -237,9 +235,7 @@ int misc_init_r(void)
#endif
#ifdef CONFIG_FSL_DIU_FB
-#if defined(CONFIG_SERIAL_MULTI)
set_lcd_brightness(0);
-#endif
/* Switch LCD-Backlight and LVDS-Interface on */
setbits_be32(&im->gpio.gpdir, 0x01040000);
clrsetbits_be32(&im->gpio.gpdat, 0x01000000, 0x00040000);
@@ -608,7 +604,6 @@ void ft_board_setup(void *blob, bd_t *bd)
}
#endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */
-#if defined(CONFIG_SERIAL_MULTI)
/*
* If argument is NULL, set the LCD brightness to the
* value from "brightness" environment variable. Set
@@ -685,4 +680,3 @@ U_BOOT_CMD(lcdbr, 2, 1, cmd_lcd_brightness,
"set LCD brightness",
"<brightness> - set LCD backlight level to <brightness>.\n"
);
-#endif /* CONFIG_SERIAL_MULTI */
diff --git a/board/prodrive/p3mx/serial.c b/board/prodrive/p3mx/serial.c
index d3591b4667d..2f4d294b9d2 100644
--- a/board/prodrive/p3mx/serial.c
+++ b/board/prodrive/p3mx/serial.c
@@ -83,7 +83,6 @@ static void p3mx_serial_puts(const char *s)
}
}
-#ifdef CONFIG_SERIAL_MULTI
static struct serial_device p3mx_serial_drv = {
.name = "p3mx_serial",
.start = p3mx_serial_init,
@@ -104,37 +103,6 @@ __weak struct serial_device *default_serial_console(void)
{
return &p3mx_serial_drv;
}
-#else
-int serial_init(void)
-{
- return p3mx_serial_init();
-}
-
-void serial_setbrg(void)
-{
- p3mx_serial_setbrg();
-}
-
-void serial_putc(const char c)
-{
- p3mx_serial_putc(c);
-}
-
-void serial_puts(const char *s)
-{
- p3mx_serial_puts(s);
-}
-
-int serial_getc(void)
-{
- return p3mx_serial_getc();
-}
-
-int serial_tstc(void)
-{
- return p3mx_serial_tstc();
-}
-#endif
#if defined(CONFIG_CMD_KGDB)
void kgdb_serial_init (void)
diff --git a/board/trizepsiv/conxs.c b/board/trizepsiv/conxs.c
index 8fc3c40e6b4..871e052b04e 100644
--- a/board/trizepsiv/conxs.c
+++ b/board/trizepsiv/conxs.c
@@ -120,7 +120,6 @@ int board_init (void)
int board_late_init(void)
{
-#if defined(CONFIG_SERIAL_MULTI)
char *console=getenv("boot_console");
if ((console == NULL) || (strcmp(console,"serial_btuart") &&
@@ -131,7 +130,6 @@ int board_late_init(void)
setenv("stdout",console);
setenv("stdin", console);
setenv("stderr",console);
-#endif
return 0;
}