From 8b2af4d7fa9f4d89f5a0a040eae7db6527097187 Mon Sep 17 00:00:00 2001 From: Stefan Tauner Date: Sun, 15 Jan 2017 11:49:25 +0100 Subject: [PATCH] UPSTREAM: SeaBIOS: Add Kconfig option to set verbosity level Previously SeaBIOS's default was used (1). This patch defaults to coreboot's console level instead which is approximately the same verbosity as SeaBIOS and thus what a user would probably expect. BUG=none BRANCH=none TEST=none Change-Id: Ic99aad03d625b6d81ce0a047c35a39074985f3d6 Signed-off-by: Patrick Georgi Original-Commit-Id: c48d791506c07f8dafe6ae78305c384f19917e84 Original-Change-Id: If79e5f40c9380bb527f870eeb7d0cb43faf00beb Original-Signed-off-by: Stefan Tauner Original-Reviewed-on: https://review.coreboot.org/18051 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Nico Huber Reviewed-on: https://chromium-review.googlesource.com/430180 Reviewed-by: Stefan Reinauer --- payloads/external/Makefile.inc | 3 ++- payloads/external/SeaBIOS/Kconfig | 10 ++++++++++ payloads/external/SeaBIOS/Makefile | 7 +++++-- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index 29163d0161..078e63af87 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -86,7 +86,8 @@ payloads/external/SeaBIOS/seabios/out/bios.bin.elf seabios: $(DOTCONFIG) CONFIG_SEABIOS_VGA_COREBOOT=$(CONFIG_SEABIOS_VGA_COREBOOT) \ CONFIG_DRIVERS_UART_8250IO=$(CONFIG_DRIVERS_UART_8250IO) \ CONFIG_CONSOLE_SERIAL=$(CONFIG_CONSOLE_SERIAL) \ - CONFIG_TTYS0_BASE=$(CONFIG_TTYS0_BASE) + CONFIG_TTYS0_BASE=$(CONFIG_TTYS0_BASE) \ + CONFIG_SEABIOS_DEBUG_LEVEL=$(CONFIG_SEABIOS_DEBUG_LEVEL) payloads/external/SeaBIOS/seabios/out/vgabios.bin: seabios payloads/external/SeaBIOS/seabios/.config: payloads/external/SeaBIOS/seabios/out/bios.bin.elf diff --git a/payloads/external/SeaBIOS/Kconfig b/payloads/external/SeaBIOS/Kconfig index ac4f922f0b..276f75de34 100644 --- a/payloads/external/SeaBIOS/Kconfig +++ b/payloads/external/SeaBIOS/Kconfig @@ -94,4 +94,14 @@ config PAYLOAD_VGABIOS_FILE depends on SEABIOS_VGA_COREBOOT default "payloads/external/SeaBIOS/seabios/out/vgabios.bin" +config SEABIOS_DEBUG_LEVEL + prompt "SeaBIOS debug level (verbosity)" + default DEFAULT_CONSOLE_LOGLEVEL + int + help + The higher the number, the more verbose SeaBIOS will be. The range is + not well defined but the typical values range from 0 to about 9 inclusive + where 0 disables all output. Set this value to -1 to use SeaBIOS' default. + + The default is to use coreboot's loglevel. endif diff --git a/payloads/external/SeaBIOS/Makefile b/payloads/external/SeaBIOS/Makefile index 4b108d5715..98e4b1b2a4 100644 --- a/payloads/external/SeaBIOS/Makefile +++ b/payloads/external/SeaBIOS/Makefile @@ -60,8 +60,11 @@ else false endif endif - # This shows how to force a previously set .config option *off* - #echo "# CONFIG_SMBIOS is not set" >> seabios/.config +ifneq ($(CONFIG_SEABIOS_DEBUG_LEVEL),-1) + echo "CONFIG_DEBUG_LEVEL=$(CONFIG_SEABIOS_DEBUG_LEVEL)" >> seabios/.config +endif +# This shows how to force a previously set .config option *off* +# echo "# CONFIG_SMBIOS is not set" >> seabios/.config $(MAKE) -C seabios olddefconfig OUT=out/ build: config