Sync SiByte system code to the new DUART driver - try 2

Sync SiByte system code to the new DUART driver - try 2

[Imre Kaloz]

The new upstream SiByte DUART driver uses a different config option then
the old one, so the SiByte target doesn't compile currently.
This patch fixes the problem and also syncs the defconfig files.

Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

---

  arch/mips/configs/bigsur_defconfig       |    4 ++--
  arch/mips/configs/sb1250-swarm_defconfig |    4 ++--
  arch/mips/sibyte/bcm1480/irq.c           |    4 ++--
  arch/mips/sibyte/cfe/console.c           |    2 +-
  arch/mips/sibyte/sb1250/irq.c            |    4 ++--
  5 files changed, 9 insertions(+), 9 deletions(-)


diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig
index 67a80f4..700a3a2 100644
--- a/arch/mips/configs/bigsur_defconfig
+++ b/arch/mips/configs/bigsur_defconfig
@@ -663,8 +663,8 @@ CONFIG_MOXA_SMARTIO_NEW=m
  # CONFIG_SX is not set
  # CONFIG_RIO is not set
  # CONFIG_STALDRV is not set
-CONFIG_SIBYTE_SB1250_DUART=y
-CONFIG_SIBYTE_SB1250_DUART_CONSOLE=y
+CONFIG_SERIAL_SB1250_DUART=y
+CONFIG_SERIAL_SB1250_DUART_CONSOLE=y

  #
  # Serial drivers
diff --git a/arch/mips/configs/sb1250-swarm_defconfig b/arch/mips/configs/sb1250-swarm_defconfig
index e72fdf3..93f9e83 100644
--- a/arch/mips/configs/sb1250-swarm_defconfig
+++ b/arch/mips/configs/sb1250-swarm_defconfig
@@ -655,8 +655,8 @@ CONFIG_MOXA_SMARTIO_NEW=m
  # CONFIG_SX is not set
  # CONFIG_RIO is not set
  # CONFIG_STALDRV is not set
-CONFIG_SIBYTE_SB1250_DUART=y
-CONFIG_SIBYTE_SB1250_DUART_CONSOLE=y
+CONFIG_SERIAL_SB1250_DUART=y
+CONFIG_SERIAL_SB1250_DUART_CONSOLE=y

  #
  # Serial drivers
diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c
index ba0c4b7..79ae6ef 100644
--- a/arch/mips/sibyte/bcm1480/irq.c
+++ b/arch/mips/sibyte/bcm1480/irq.c
@@ -76,7 +76,7 @@ __setup("nokgdb", nokgdb);

  /* Default to UART1 */
  int kgdb_port = 1;
-#ifdef CONFIG_SIBYTE_SB1250_DUART
+#ifdef CONFIG_SERIAL_SB1250_DUART
  extern char sb1250_duart_present[];
  #endif
  #endif
@@ -404,7 +404,7 @@ void __init arch_init_irq(void)
  	if (kgdb_flag) {
  		kgdb_irq = K_BCM1480_INT_UART_0 + kgdb_port;

-#ifdef CONFIG_SIBYTE_SB1250_DUART
+#ifdef CONFIG_SERIAL_SB1250_DUART
  		sb1250_duart_present[kgdb_port] = 0;
  #endif
  		/* Setup uart 1 settings, mapper */
diff --git a/arch/mips/sibyte/cfe/console.c b/arch/mips/sibyte/cfe/console.c
index c6ec748..4cec9d7 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)
  	/* XXXKW think about interaction with 'console=' cmdline arg */
  	/* If none of the console options are configured, the build will break. */
  	if (cfe_getenv("BOOT_CONSOLE", consdev, 32) >= 0) {
-#ifdef CONFIG_SIBYTE_SB1250_DUART
+#ifdef CONFIG_SERIAL_SB1250_DUART
  		if (!strcmp(consdev, "uart0")) {
  			setleds("u0cn");
  		} else if (!strcmp(consdev, "uart1")) {
diff --git a/arch/mips/sibyte/sb1250/irq.c b/arch/mips/sibyte/sb1250/irq.c
index 0e6a13c..ad593a6 100644
--- a/arch/mips/sibyte/sb1250/irq.c
+++ b/arch/mips/sibyte/sb1250/irq.c
@@ -61,7 +61,7 @@ static int kgdb_irq;

  /* Default to UART1 */
  int kgdb_port = 1;
-#ifdef CONFIG_SIBYTE_SB1250_DUART
+#ifdef CONFIG_SERIAL_SB1250_DUART
  extern char sb1250_duart_present[];
  #endif
  #endif
@@ -359,7 +359,7 @@ void __init arch_init_irq(void)
  	if (kgdb_flag) {
  		kgdb_irq = K_INT_UART_0 + kgdb_port;

-#ifdef CONFIG_SIBYTE_SB1250_DUART
+#ifdef CONFIG_SERIAL_SB1250_DUART
  		sb1250_duart_present[kgdb_port] = 0;
  #endif
  		/* Setup uart 1 settings, mapper */

Re: Sync SiByte system code to the new DUART driver - try 2

[Ralf Baechle]

On Thu, Aug 02, 2007 at 01:23:30PM +0200, Imre Kaloz wrote:

> The new upstream SiByte DUART driver uses a different config option then
> the old one, so the SiByte target doesn't compile currently.
> This patch fixes the problem and also syncs the defconfig files.

Too late, already fixed that myself :)

  Ralf