src/coreboot: add console-loglevel parameter

src/coreboot/default.nix

@@ -5,6 +5,7 @@
 , config             ? throw "you must provide a coreboot .config file"
 , initramfs_image    # path to the initramfs `cpio` archive
 , iasl               ? null # a specific iasl to use, if needed
+, console_loglevel   ? "7"
 }:
 let
   version = "4.9";
@@ -78,6 +79,9 @@ stdenv.mkDerivation {
     runHook preConfigure
     cp ${config} .config
     chmod +w .config
+    sed -i 's/^CONFIG_DEFAULT_CONSOLE_LOGLEVEL//' .config
+    echo 'CONFIG_DEFAULT_CONSOLE_LOGLEVEL_${console_loglevel}=y' >> .config
+    echo 'CONFIG_DEFAULT_CONSOLE_LOGLEVEL=${console_loglevel}' >> .config
     sed -i 's/^CONFIG_FMDFILE=.*//' .config
     echo 'CONFIG_FMDFILE="${fmap}"' >> .config
     sed -i 's/^CONFIG_PAYLOAD_FILE=.*//' .config

src/platform/am1i/coreboot.config

@@ -152,7 +152,6 @@ CONFIG_TTYS0_LCS=3
 CONFIG_UDELAY_LAPIC_FIXED_FSB=200
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="AM1I-A"
 CONFIG_CPU_ADDR_BITS=40
-CONFIG_DEFAULT_CONSOLE_LOGLEVEL=7
 # CONFIG_USBDEBUG is not set
 CONFIG_MAINBOARD_VERSION="1.0"
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
@@ -586,15 +585,6 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 # CONFIG_CONSOLE_SPI_FLASH is not set
-# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8 is not set
-CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7=y
-# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
-# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5 is not set
-# 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
-# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
 # CONFIG_CMOS_POST is not set
 # CONFIG_CONSOLE_POST is not set
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set

src/platform/kevin/coreboot.config

@@ -290,7 +290,6 @@ CONFIG_EC_GOOGLE_CHROMEEC_SPI_WAKEUP_DELAY_US=0
 CONFIG_PMIC_BUS=-1
 # CONFIG_BOARD_GOOGLE_BASEBOARD_ZOOMBINI is not set
 CONFIG_CPU_ADDR_BITS=36
-CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -648,15 +647,6 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
 # CONFIG_CONSOLE_SPI_FLASH is not set
-CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
-# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
-# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
-# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5 is not set
-# 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
-# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
 # CONFIG_CONSOLE_POST is not set
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set

src/platform/kgpe/coreboot.config

@@ -143,7 +143,6 @@ CONFIG_TTYS0_LCS=3
 CONFIG_UDELAY_LAPIC_FIXED_FSB=200
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="KGPE-D16"
 CONFIG_CPU_ADDR_BITS=48
-CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
 CONFIG_MAINBOARD_VERSION="1.0"
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
@@ -591,16 +590,6 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 # CONFIG_CONSOLE_SPI_FLASH is not set
-CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
-# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
-# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
-# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5 is not set
-# 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
-# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
 CONFIG_HWBASE_DEBUG_CB=y
 CONFIG_HAVE_ACPI_RESUME=y
 CONFIG_ACPI_HUGE_LOWMEM_BACKUP=y