[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>
This commit is contained in:
parent
7acae224a4
commit
477f949e0a
|
@ -663,8 +663,8 @@ CONFIG_MOXA_SMARTIO_NEW=m
|
||||||
# CONFIG_SX is not set
|
# CONFIG_SX is not set
|
||||||
# CONFIG_RIO is not set
|
# CONFIG_RIO is not set
|
||||||
# CONFIG_STALDRV is not set
|
# CONFIG_STALDRV is not set
|
||||||
CONFIG_SIBYTE_SB1250_DUART=y
|
CONFIG_SERIAL_SB1250_DUART=y
|
||||||
CONFIG_SIBYTE_SB1250_DUART_CONSOLE=y
|
CONFIG_SERIAL_SB1250_DUART_CONSOLE=y
|
||||||
|
|
||||||
#
|
#
|
||||||
# Serial drivers
|
# Serial drivers
|
||||||
|
|
|
@ -655,8 +655,8 @@ CONFIG_MOXA_SMARTIO_NEW=m
|
||||||
# CONFIG_SX is not set
|
# CONFIG_SX is not set
|
||||||
# CONFIG_RIO is not set
|
# CONFIG_RIO is not set
|
||||||
# CONFIG_STALDRV is not set
|
# CONFIG_STALDRV is not set
|
||||||
CONFIG_SIBYTE_SB1250_DUART=y
|
CONFIG_SERIAL_SB1250_DUART=y
|
||||||
CONFIG_SIBYTE_SB1250_DUART_CONSOLE=y
|
CONFIG_SERIAL_SB1250_DUART_CONSOLE=y
|
||||||
|
|
||||||
#
|
#
|
||||||
# Serial drivers
|
# Serial drivers
|
||||||
|
|
|
@ -76,7 +76,7 @@ __setup("nokgdb", nokgdb);
|
||||||
|
|
||||||
/* Default to UART1 */
|
/* Default to UART1 */
|
||||||
int kgdb_port = 1;
|
int kgdb_port = 1;
|
||||||
#ifdef CONFIG_SIBYTE_SB1250_DUART
|
#ifdef CONFIG_SERIAL_SB1250_DUART
|
||||||
extern char sb1250_duart_present[];
|
extern char sb1250_duart_present[];
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
@ -404,7 +404,7 @@ void __init arch_init_irq(void)
|
||||||
if (kgdb_flag) {
|
if (kgdb_flag) {
|
||||||
kgdb_irq = K_BCM1480_INT_UART_0 + kgdb_port;
|
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;
|
sb1250_duart_present[kgdb_port] = 0;
|
||||||
#endif
|
#endif
|
||||||
/* Setup uart 1 settings, mapper */
|
/* Setup uart 1 settings, mapper */
|
||||||
|
|
|
@ -46,7 +46,7 @@ static int cfe_console_setup(struct console *cons, char *str)
|
||||||
/* XXXKW think about interaction with 'console=' cmdline arg */
|
/* XXXKW think about interaction with 'console=' cmdline arg */
|
||||||
/* If none of the console options are configured, the build will break. */
|
/* If none of the console options are configured, the build will break. */
|
||||||
if (cfe_getenv("BOOT_CONSOLE", consdev, 32) >= 0) {
|
if (cfe_getenv("BOOT_CONSOLE", consdev, 32) >= 0) {
|
||||||
#ifdef CONFIG_SIBYTE_SB1250_DUART
|
#ifdef CONFIG_SERIAL_SB1250_DUART
|
||||||
if (!strcmp(consdev, "uart0")) {
|
if (!strcmp(consdev, "uart0")) {
|
||||||
setleds("u0cn");
|
setleds("u0cn");
|
||||||
} else if (!strcmp(consdev, "uart1")) {
|
} else if (!strcmp(consdev, "uart1")) {
|
||||||
|
|
|
@ -61,7 +61,7 @@ static int kgdb_irq;
|
||||||
|
|
||||||
/* Default to UART1 */
|
/* Default to UART1 */
|
||||||
int kgdb_port = 1;
|
int kgdb_port = 1;
|
||||||
#ifdef CONFIG_SIBYTE_SB1250_DUART
|
#ifdef CONFIG_SERIAL_SB1250_DUART
|
||||||
extern char sb1250_duart_present[];
|
extern char sb1250_duart_present[];
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
@ -359,7 +359,7 @@ void __init arch_init_irq(void)
|
||||||
if (kgdb_flag) {
|
if (kgdb_flag) {
|
||||||
kgdb_irq = K_INT_UART_0 + kgdb_port;
|
kgdb_irq = K_INT_UART_0 + kgdb_port;
|
||||||
|
|
||||||
#ifdef CONFIG_SIBYTE_SB1250_DUART
|
#ifdef CONFIG_SERIAL_SB1250_DUART
|
||||||
sb1250_duart_present[kgdb_port] = 0;
|
sb1250_duart_present[kgdb_port] = 0;
|
||||||
#endif
|
#endif
|
||||||
/* Setup uart 1 settings, mapper */
|
/* Setup uart 1 settings, mapper */
|
||||||
|
|
Loading…
Reference in a new issue