Ubuntu trivial powerpc patches
PATCH 1/1 Ubuntu trivial powerpc patches
Here's a couple of small patches I've got in the Ubuntu kernel tree for powerpc. They can be synced from:
git.kernel.org:/pub/scm/linux/kernel/git/bcollins/ubuntu-2.6#ubuntu-powerpc
The patch for prom init printf's disabling is just to make the boot a little cleaner.
Ben Collins:
[powerpc] Allow disabling of prom init messages. [powerpc] Make pSeries_init_panel message configurable.
arch/powerpc/Kconfig | 5 +++++ arch/powerpc/Kconfig.debug | 9 +++++++++ arch/powerpc/kernel/prom_init.c | 5 ++++- arch/powerpc/platforms/pseries/setup.c | 2 +- 4 files changed, 19 insertions(+), 2 deletions(-)
arch/powerpc/Kconfig +5 -0
@@ -371,6 +371,11 @@ config PPC_PSERIES select PPC_UDBG_16550 default y +config PPC_PSERIES_PANEL_MSG + depends on PPC_PSERIES + string "Message for pSeries progress panel" + default "Linux ppc64" + config PPC_ISERIES bool "IBM Legacy iSeries" depends on PPC_MULTIPLATFORM && PPC64
arch/powerpc/Kconfig.debug +9 -0
@@ -121,6 +121,15 @@ config BOOTX_TEXT Say Y here to see progress messages from the boot firmware in text mode. Requires either BootX or Open Firmware. +config EARLY_PROM_PRINT + bool "Support early messages from the kernel via the prom console" + depends PPC_OF + default y + help + Say Y here to see early messages from the kernel through the + prom console. These are usually only related to the prom init + and detection code. + config SERIAL_TEXT_DEBUG bool "Support for early boot texts over serial port" depends on 4xx || LOPEC || MV64X60 || PPLUS || PRPMC800 || \
arch/powerpc/kernel/prom_init.c +4 -1
@@ -297,7 +297,7 @@ static void __init prom_print(const char } } - +#ifdef CONFIG_EARLY_PROM_PRINT static void __init prom_print_hex (unsigned long val) {int i, nibbles =sizeof (val)*2 ;
@@ -356,6 +356,9 @@ #endif } } } +#else +#define prom_printf (fmt, ...) do {} while(0) +#endif static unsigned int __init prom_claim(unsigned long virt, unsigned long size,
arch/powerpc/platforms/pseries/setup.c +1 -1
@@ -340,7 +340,7 @@ static void __init pSeries_setup_arch(vostatic int __init pSeries_init_panel (void ) {/* Manually leave the kernel version on the panel. */ - ppc_md.progress ("Linux ppc64\n" ,0 ); + ppc_md.progress (CONFIG_PPC_PSERIES_PANEL_MSG "\n" ,0 ); ppc_md.progress (init_utsname ()->version,0 );return 0 ;
arch/powerpc/Kconfig.debug config BOOTX_TEXT · line 132
Quoted 9 lines · Ben Collins
arch/powerpc/Kconfig.debug +9
-0+config EARLY_PROM_PRINT + bool "Support early messages from the kernel via the prom console" + depends PPC_OF + default y + help + Say Y here to see early messages from the kernel through the + prom console. These are usually only related to the prom init + and detection code. +
The help text should probably be a little bit less cryptic :) Something like saying that those messages are displayed by the Open Firmware wrapper.
Ben.