aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2007-08-02 07:08:32 -0400
committerRalf Baechle <ralf@linux-mips.org>2007-08-26 21:16:51 -0400
commit477f949e0ad7f1d3503a87b9f158d70c29abc918 (patch)
treef98f59928250cb2fd8367adbc8730080ac199e4e /arch
parent7acae224a423a492454d6550ce65c9af556d02c7 (diff)
[MIPS] Sibyte: CONFIG_SIBYTE_SB1250_DUART -> CONFIG_SERIAL_SB1250_DUART
This is needed since the Sibyte serial driver was exchanged. Issue report by Imre Kaloz <kaloz@openwrt.org>. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/configs/bigsur_defconfig4
-rw-r--r--arch/mips/configs/sb1250-swarm_defconfig4
-rw-r--r--arch/mips/sibyte/bcm1480/irq.c4
-rw-r--r--arch/mips/sibyte/cfe/console.c2
-rw-r--r--arch/mips/sibyte/sb1250/irq.c4
5 files changed, 9 insertions, 9 deletions
diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig
index 67a80f4c7d87..700a3a2d688e 100644
--- a/arch/mips/configs/bigsur_defconfig
+++ b/arch/mips/configs/bigsur_defconfig
@@ -663,8 +663,8 @@ CONFIG_MOXA_SMARTIO_NEW=m
663# CONFIG_SX is not set 663# CONFIG_SX is not set
664# CONFIG_RIO is not set 664# CONFIG_RIO is not set
665# CONFIG_STALDRV is not set 665# CONFIG_STALDRV is not set
666CONFIG_SIBYTE_SB1250_DUART=y 666CONFIG_SERIAL_SB1250_DUART=y
667CONFIG_SIBYTE_SB1250_DUART_CONSOLE=y 667CONFIG_SERIAL_SB1250_DUART_CONSOLE=y
668 668
669# 669#
670# Serial drivers 670# Serial drivers
diff --git a/arch/mips/configs/sb1250-swarm_defconfig b/arch/mips/configs/sb1250-swarm_defconfig
index e72fdf36b3fe..93f9e8331ad7 100644
--- a/arch/mips/configs/sb1250-swarm_defconfig
+++ b/arch/mips/configs/sb1250-swarm_defconfig
@@ -655,8 +655,8 @@ CONFIG_MOXA_SMARTIO_NEW=m
655# CONFIG_SX is not set 655# CONFIG_SX is not set
656# CONFIG_RIO is not set 656# CONFIG_RIO is not set
657# CONFIG_STALDRV is not set 657# CONFIG_STALDRV is not set
658CONFIG_SIBYTE_SB1250_DUART=y 658CONFIG_SERIAL_SB1250_DUART=y
659CONFIG_SIBYTE_SB1250_DUART_CONSOLE=y 659CONFIG_SERIAL_SB1250_DUART_CONSOLE=y
660 660
661# 661#
662# Serial drivers 662# Serial drivers
diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c
index ba0c4b776c85..79ae6ef979bb 100644
--- a/arch/mips/sibyte/bcm1480/irq.c
+++ b/arch/mips/sibyte/bcm1480/irq.c
@@ -76,7 +76,7 @@ __setup("nokgdb", nokgdb);
76 76
77/* Default to UART1 */ 77/* Default to UART1 */
78int kgdb_port = 1; 78int kgdb_port = 1;
79#ifdef CONFIG_SIBYTE_SB1250_DUART 79#ifdef CONFIG_SERIAL_SB1250_DUART
80extern char sb1250_duart_present[]; 80extern char sb1250_duart_present[];
81#endif 81#endif
82#endif 82#endif
@@ -404,7 +404,7 @@ void __init arch_init_irq(void)
404 if (kgdb_flag) { 404 if (kgdb_flag) {
405 kgdb_irq = K_BCM1480_INT_UART_0 + kgdb_port; 405 kgdb_irq = K_BCM1480_INT_UART_0 + kgdb_port;
406 406
407#ifdef CONFIG_SIBYTE_SB1250_DUART 407#ifdef CONFIG_SERIAL_SB1250_DUART
408 sb1250_duart_present[kgdb_port] = 0; 408 sb1250_duart_present[kgdb_port] = 0;
409#endif 409#endif
410 /* Setup uart 1 settings, mapper */ 410 /* Setup uart 1 settings, mapper */
diff --git a/arch/mips/sibyte/cfe/console.c b/arch/mips/sibyte/cfe/console.c
index c6ec748175b0..4cec9d798d2f 100644
--- a/arch/mips/sibyte/cfe/console.c
+++ b/arch/mips/sibyte/cfe/console.c
@@ -46,7 +46,7 @@ static int cfe_console_setup(struct console *cons, char *str)
46 /* XXXKW think about interaction with 'console=' cmdline arg */ 46 /* XXXKW think about interaction with 'console=' cmdline arg */
47 /* If none of the console options are configured, the build will break. */ 47 /* If none of the console options are configured, the build will break. */
48 if (cfe_getenv("BOOT_CONSOLE", consdev, 32) >= 0) { 48 if (cfe_getenv("BOOT_CONSOLE", consdev, 32) >= 0) {
49#ifdef CONFIG_SIBYTE_SB1250_DUART 49#ifdef CONFIG_SERIAL_SB1250_DUART
50 if (!strcmp(consdev, "uart0")) { 50 if (!strcmp(consdev, "uart0")) {
51 setleds("u0cn"); 51 setleds("u0cn");
52 } else if (!strcmp(consdev, "uart1")) { 52 } else if (!strcmp(consdev, "uart1")) {
diff --git a/arch/mips/sibyte/sb1250/irq.c b/arch/mips/sibyte/sb1250/irq.c
index 0e6a13c0bd0e..ad593a6c20be 100644
--- a/arch/mips/sibyte/sb1250/irq.c
+++ b/arch/mips/sibyte/sb1250/irq.c
@@ -61,7 +61,7 @@ static int kgdb_irq;
61 61
62/* Default to UART1 */ 62/* Default to UART1 */
63int kgdb_port = 1; 63int kgdb_port = 1;
64#ifdef CONFIG_SIBYTE_SB1250_DUART 64#ifdef CONFIG_SERIAL_SB1250_DUART
65extern char sb1250_duart_present[]; 65extern char sb1250_duart_present[];
66#endif 66#endif
67#endif 67#endif
@@ -359,7 +359,7 @@ void __init arch_init_irq(void)
359 if (kgdb_flag) { 359 if (kgdb_flag) {
360 kgdb_irq = K_INT_UART_0 + kgdb_port; 360 kgdb_irq = K_INT_UART_0 + kgdb_port;
361 361
362#ifdef CONFIG_SIBYTE_SB1250_DUART 362#ifdef CONFIG_SERIAL_SB1250_DUART
363 sb1250_duart_present[kgdb_port] = 0; 363 sb1250_duart_present[kgdb_port] = 0;
364#endif 364#endif
365 /* Setup uart 1 settings, mapper */ 365 /* Setup uart 1 settings, mapper */