Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6086557 authored by Ralf Baechle's avatar Ralf Baechle
Browse files

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: default avatarRalf Baechle <ralf@linux-mips.org>
parent b098d672

arch/mips/Kconfig

+3 −2
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ config BCM47XX 
	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_HAS_EARLY_PRINTK

	select EARLY_PRINTK_8250 if EARLY_PRINTK

	select USE_GENERIC_EARLY_PRINTK_8250

	help

	 Support for BCM47XX based boards
@@ -150,7 +150,6 @@ config MIPS_COBALT 
	select CSRC_R4K

	select CEVT_GT641XX

	select DMA_NONCOHERENT

	select EARLY_PRINTK_8250 if EARLY_PRINTK

	select HW_HAS_PCI

	select I8253

	select I8259
@@ -163,6 +162,7 @@ config MIPS_COBALT 
	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select USE_GENERIC_EARLY_PRINTK_8250



config MACH_DECSTATION

	bool "DECstations"
@@ -674,6 +674,7 @@ config SNI_RM 
	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_HIGHMEM

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select USE_GENERIC_EARLY_PRINTK_8250

	help

	  The SNI RM200/300/400 are MIPS-based machines manufactured by

	  Siemens Nixdorf Informationssysteme (SNI), parent company of Pyramid

arch/mips/Kconfig.debug

+7 −3
Original line number Diff line number Diff line
@@ -21,13 +21,17 @@ config EARLY_PRINTK 
	  unless you want to debug such a crash.



config EARLY_PRINTK_8250

	bool "8250/16550 and compatible serial early printk driver"

	depends on EARLY_PRINTK

	default n

	bool

	depends on EARLY_PRINTK && USE_GENERIC_EARLY_PRINTK_8250

	default y

	help

	  "8250/16550 and compatible serial early printk driver"

	  If you say Y here, it will be possible to use a 8250/16550 serial

	  port as the boot console.



config USE_GENERIC_EARLY_PRINTK_8250

	bool



config CMDLINE_BOOL

	bool "Built-in kernel command line"

	default n