summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-10-24 22:26:09 +0200
committerWolfgang Denk <wd@denx.de>2009-10-24 22:26:09 +0200
commit922754cc82a82ac90e486b7565a148c9e4b6b584 (patch)
tree7f42bd45ddc7ba92343446af911a4ac5d71cc874 /common
parent4ee63268152594bb7af6bec2b59d53bba68082bf (diff)
parent4bc3d2afb380e78fdbb9c501d9a8da6d59eb178e (diff)
downloadu-boot-imx-922754cc82a82ac90e486b7565a148c9e4b6b584.zip
u-boot-imx-922754cc82a82ac90e486b7565a148c9e4b6b584.tar.gz
u-boot-imx-922754cc82a82ac90e486b7565a148c9e4b6b584.tar.bz2
Merge branch 'master-sync' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'common')
-rw-r--r--common/serial.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/common/serial.c b/common/serial.c
index b4db46b..5f9ffd7 100644
--- a/common/serial.c
+++ b/common/serial.c
@@ -69,6 +69,18 @@ struct serial_device *__default_serial_console (void)
#else
#error "CONFIG_SERIAL? missing."
#endif
+#elif defined(CONFIG_S5PC1XX)
+#if defined(CONFIG_SERIAL0)
+ return &s5pc1xx_serial0_device;
+#elif defined(CONFIG_SERIAL1)
+ return &s5pc1xx_serial1_device;
+#elif defined(CONFIG_SERIAL2)
+ return &s5pc1xx_serial2_device;
+#elif defined(CONFIG_SERIAL3)
+ return &s5pc1xx_serial3_device;
+#else
+#error "CONFIG_SERIAL? missing."
+#endif
#elif defined(CONFIG_OMAP3_ZOOM2)
return ZOOM2_DEFAULT_SERIAL_DEVICE;
#else
@@ -141,6 +153,12 @@ void serial_initialize (void)
serial_register(&s3c24xx_serial1_device);
serial_register(&s3c24xx_serial2_device);
#endif
+#if defined(CONFIG_S5PC1XX)
+ serial_register(&s5pc1xx_serial0_device);
+ serial_register(&s5pc1xx_serial1_device);
+ serial_register(&s5pc1xx_serial2_device);
+ serial_register(&s5pc1xx_serial3_device);
+#endif
serial_assign (default_serial_console ()->name);
}