From 6052ac8386725056629357c197d13909ff0658eb Mon Sep 17 00:00:00 2001 From: Matthias Weisser Date: Mon, 9 Aug 2010 13:31:49 +0200 Subject: ARM: Add support for MB86R0x SoCs Signed-off-by: Matthias Weisser --- common/serial.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'common/serial.c') diff --git a/common/serial.c b/common/serial.c index fceabfa1e7e..6718648d4e8 100644 --- a/common/serial.c +++ b/common/serial.c @@ -40,9 +40,9 @@ struct serial_device *__default_serial_console (void) return &serial_scc_device; #elif defined(CONFIG_405GP) || defined(CONFIG_405CR) || defined(CONFIG_440) \ || defined(CONFIG_405EP) || defined(CONFIG_405EZ) || defined(CONFIG_405EX) \ - || defined(CONFIG_MPC5xxx) || defined(CONFIG_MPC83xx) \ - || defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) \ - || defined(CONFIG_SYS_SC520) + || defined(CONFIG_MB86R0x) || defined(CONFIG_MPC5xxx) \ + || defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx) \ + || defined(CONFIG_MPC86xx) || defined(CONFIG_SYS_SC520) #if defined(CONFIG_CONS_INDEX) && defined(CONFIG_SYS_NS16550_SERIAL) #if (CONFIG_CONS_INDEX==1) return &eserial1_device; -- cgit v1.2.3 From 889a275d428be2790270f7280385207c1666eb4b Mon Sep 17 00:00:00 2001 From: Minkyu Kang Date: Mon, 23 Aug 2010 19:52:03 +0900 Subject: ARMV7: S5P: rename from CONFIG_S5PC1XX to CONFIG_S5P Use the same configuration around S5P SoCs. (s5pc100, s5pc110, s5pc210 and so on) Signed-off-by: Minkyu Kang --- common/serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'common/serial.c') diff --git a/common/serial.c b/common/serial.c index fceabfa1e7e..9e5759ecf54 100644 --- a/common/serial.c +++ b/common/serial.c @@ -78,7 +78,7 @@ struct serial_device *__default_serial_console (void) #else #error "CONFIG_SERIAL? missing." #endif -#elif defined(CONFIG_S5PC1XX) +#elif defined(CONFIG_S5P) #if defined(CONFIG_SERIAL0) return &s5p_serial0_device; #elif defined(CONFIG_SERIAL1) @@ -162,7 +162,7 @@ void serial_initialize (void) serial_register(&s3c24xx_serial1_device); serial_register(&s3c24xx_serial2_device); #endif -#if defined(CONFIG_S5PC1XX) +#if defined(CONFIG_S5P) serial_register(&s5p_serial0_device); serial_register(&s5p_serial1_device); serial_register(&s5p_serial2_device); -- cgit v1.2.3