Merge branch 'linux-4.14-update'

linuxboot · Aug 13, 2018 · 2be492d · 2be492d
2 parents cc4976b + fb37c5d
commit 2be492d
Show file tree

Hide file tree

Showing 14 changed files with 74 additions and 12,365 deletions.
diff --git a/config/coreboot-qemu.config b/config/coreboot-qemu.config
@@ -137,7 +137,7 @@ CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
 CONFIG_DRIVERS_UART_8250IO=y
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="QEMU x86 q35/ich9"
 CONFIG_CPU_ADDR_BITS=36
-CONFIG_DEFAULT_CONSOLE_LOGLEVEL=4
+CONFIG_DEFAULT_CONSOLE_LOGLEVEL=6
 # CONFIG_USBDEBUG is not set
 CONFIG_MAINBOARD_VERSION="1.0"
 CONFIG_DRIVERS_PS2_KEYBOARD=y
@@ -480,9 +480,9 @@ CONFIG_CONSOLE_QEMU_DEBUGCON=y
 CONFIG_CONSOLE_QEMU_DEBUGCON_PORT=0x402
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
-# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
+CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5 is not set
-CONFIG_DEFAULT_CONSOLE_LOGLEVEL_4=y
+# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_4 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_3 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_2 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set