summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2012-09-14 23:45:51 +0200
committerTom Rini <trini@ti.com>2012-10-15 11:53:59 -0700
commit036036d79c8535342594ab362143416d6a9bd11e (patch)
tree8e874f63630bd44b349eea84b368088c0b70a433 /include
parenta3827250606895ec2dd4b8d867342b7cabf3692f (diff)
downloadu-boot-imx-036036d79c8535342594ab362143416d6a9bd11e.zip
u-boot-imx-036036d79c8535342594ab362143416d6a9bd11e.tar.gz
u-boot-imx-036036d79c8535342594ab362143416d6a9bd11e.tar.bz2
serial: Remove CONFIG_SERIAL_MULTI from remaining sources
Remove the parts depending either on disabled CONFIG_SERIAL_MULTI or ifdefs around CONFIG_SERIAL_MULTI parts since CONFIG_SERIAL_MULTI is now enabled by default. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Marek Vasut <marek.vasut@gmail.com> Cc: Tom Rini <trini@ti.com> Cc: Anatolij Gustschin <agust@denx.de> Cc: Stefan Roese <sr@denx.de>
Diffstat (limited to 'include')
-rw-r--r--include/common.h12
-rw-r--r--include/serial.h2
2 files changed, 1 insertions, 13 deletions
diff --git a/include/common.h b/include/common.h
index 7d9ab15..7205677 100644
--- a/include/common.h
+++ b/include/common.h
@@ -195,18 +195,6 @@ typedef void (interrupt_handler_t)(void *);
# endif
#endif
-#ifndef CONFIG_SERIAL_MULTI
-
-#if defined(CONFIG_8xx_CONS_SMC1) || defined(CONFIG_8xx_CONS_SMC2) \
- || defined(CONFIG_8xx_CONS_SCC1) || defined(CONFIG_8xx_CONS_SCC2) \
- || defined(CONFIG_8xx_CONS_SCC3) || defined(CONFIG_8xx_CONS_SCC4)
-
-#define CONFIG_SERIAL_MULTI 1
-
-#endif
-
-#endif /* CONFIG_SERIAL_MULTI */
-
/*
* General Purpose Utilities
*/
diff --git a/include/serial.h b/include/serial.h
index 01a86b4..a8d23f5 100644
--- a/include/serial.h
+++ b/include/serial.h
@@ -63,7 +63,7 @@ extern int usbtty_tstc(void);
#endif /* CONFIG_USB_TTY */
-#if defined(CONFIG_MPC512X) && defined(CONFIG_SERIAL_MULTI)
+#if defined(CONFIG_MPC512X)
extern struct stdio_dev *open_port(int num, int baudrate);
extern int close_port(int num);
extern int write_port(struct stdio_dev *port, char *buf);