This patch makes the kernel configuration option "Support for early boot text console (BootX or OpenFirmware only)" an exclusive choice under the "Early debugging" menu. This prevents selection of two early debug consoles simultaneously which does not appear to be supported by the code in arch/powerpc/kernel/udbg.c.
Currently if two consoles are enabled the code in udbg.c selects one based on the order in which initialisation functions are called which seems fairly arbitrary. For example if both CONFIG_BOOTX_TEXT and CONFIG_PPC_EARLY_DEBUG_LPAR are enabled then the BootX console will be used. However if both CONFIG_BOOTX_TEXT and CONFIG_PPC_EARLY_DEBUG_PS3GELIC are selected then the latter will be used. Signed-off-by: Alistair Popple <alist...@popple.id.au> --- diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug index 5416e28..659120c 100644 --- a/arch/powerpc/Kconfig.debug +++ b/arch/powerpc/Kconfig.debug @@ -122,13 +122,6 @@ config BDI_SWITCH Unless you are intending to debug the kernel with one of these machines, say N here. -config BOOTX_TEXT - bool "Support for early boot text console (BootX or OpenFirmware only)" - depends on PPC_OF && PPC_BOOK3S - help - Say Y here to see progress messages from the boot firmware in text - mode. Requires either BootX or Open Firmware. - config PPC_EARLY_DEBUG bool "Early debugging (dangerous)" help @@ -147,6 +140,13 @@ choice enable debugging for the wrong type of machine your kernel _will not boot_. +config BOOTX_TEXT + bool "Support for early boot text console (BootX or OpenFirmware only)" + depends on PPC_OF && PPC_BOOK3S + help + Say Y here to see progress messages from the boot firmware in text + mode. Requires either BootX or Open Firmware. + config PPC_EARLY_DEBUG_LPAR bool "LPAR HV Console" depends on PPC_PSERIES _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev