mirror of
https://github.com/torvalds/linux
synced 2024-10-06 19:34:19 +00:00
MIPS: Fix build error due to multiple prom_putchar() definitions.
This can happen if both the generic 8250 and another early console driver are enable. Fixed by using an auxilliary kconfig symbol to restrict that choice. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
parent
b098d6726b
commit
e60865572f
|
@ -123,7 +123,7 @@ config BCM47XX
|
||||||
select SYS_SUPPORTS_32BIT_KERNEL
|
select SYS_SUPPORTS_32BIT_KERNEL
|
||||||
select SYS_SUPPORTS_LITTLE_ENDIAN
|
select SYS_SUPPORTS_LITTLE_ENDIAN
|
||||||
select SYS_HAS_EARLY_PRINTK
|
select SYS_HAS_EARLY_PRINTK
|
||||||
select EARLY_PRINTK_8250 if EARLY_PRINTK
|
select USE_GENERIC_EARLY_PRINTK_8250
|
||||||
help
|
help
|
||||||
Support for BCM47XX based boards
|
Support for BCM47XX based boards
|
||||||
|
|
||||||
|
@ -150,7 +150,6 @@ config MIPS_COBALT
|
||||||
select CSRC_R4K
|
select CSRC_R4K
|
||||||
select CEVT_GT641XX
|
select CEVT_GT641XX
|
||||||
select DMA_NONCOHERENT
|
select DMA_NONCOHERENT
|
||||||
select EARLY_PRINTK_8250 if EARLY_PRINTK
|
|
||||||
select HW_HAS_PCI
|
select HW_HAS_PCI
|
||||||
select I8253
|
select I8253
|
||||||
select I8259
|
select I8259
|
||||||
|
@ -163,6 +162,7 @@ config MIPS_COBALT
|
||||||
select SYS_SUPPORTS_32BIT_KERNEL
|
select SYS_SUPPORTS_32BIT_KERNEL
|
||||||
select SYS_SUPPORTS_64BIT_KERNEL
|
select SYS_SUPPORTS_64BIT_KERNEL
|
||||||
select SYS_SUPPORTS_LITTLE_ENDIAN
|
select SYS_SUPPORTS_LITTLE_ENDIAN
|
||||||
|
select USE_GENERIC_EARLY_PRINTK_8250
|
||||||
|
|
||||||
config MACH_DECSTATION
|
config MACH_DECSTATION
|
||||||
bool "DECstations"
|
bool "DECstations"
|
||||||
|
@ -674,6 +674,7 @@ config SNI_RM
|
||||||
select SYS_SUPPORTS_BIG_ENDIAN
|
select SYS_SUPPORTS_BIG_ENDIAN
|
||||||
select SYS_SUPPORTS_HIGHMEM
|
select SYS_SUPPORTS_HIGHMEM
|
||||||
select SYS_SUPPORTS_LITTLE_ENDIAN
|
select SYS_SUPPORTS_LITTLE_ENDIAN
|
||||||
|
select USE_GENERIC_EARLY_PRINTK_8250
|
||||||
help
|
help
|
||||||
The SNI RM200/300/400 are MIPS-based machines manufactured by
|
The SNI RM200/300/400 are MIPS-based machines manufactured by
|
||||||
Siemens Nixdorf Informationssysteme (SNI), parent company of Pyramid
|
Siemens Nixdorf Informationssysteme (SNI), parent company of Pyramid
|
||||||
|
|
|
@ -21,13 +21,17 @@ config EARLY_PRINTK
|
||||||
unless you want to debug such a crash.
|
unless you want to debug such a crash.
|
||||||
|
|
||||||
config EARLY_PRINTK_8250
|
config EARLY_PRINTK_8250
|
||||||
bool "8250/16550 and compatible serial early printk driver"
|
bool
|
||||||
depends on EARLY_PRINTK
|
depends on EARLY_PRINTK && USE_GENERIC_EARLY_PRINTK_8250
|
||||||
default n
|
default y
|
||||||
help
|
help
|
||||||
|
"8250/16550 and compatible serial early printk driver"
|
||||||
If you say Y here, it will be possible to use a 8250/16550 serial
|
If you say Y here, it will be possible to use a 8250/16550 serial
|
||||||
port as the boot console.
|
port as the boot console.
|
||||||
|
|
||||||
|
config USE_GENERIC_EARLY_PRINTK_8250
|
||||||
|
bool
|
||||||
|
|
||||||
config CMDLINE_BOOL
|
config CMDLINE_BOOL
|
||||||
bool "Built-in kernel command line"
|
bool "Built-in kernel command line"
|
||||||
default n
|
default n
|
||||||
|
|
Loading…
Reference in a new issue