Skip to content

Commit 05ad469

Browse files
tlauriontlaurion
authored
Merge pull request #1890 from tlaurion/v560tu_remove_debug
BUGFIX: v560tu: unify board config, remove debug cmdline passed from coreboot to linux kernel
2 parents 49e0849 + 0cb5f2f commit 05ad469

6 files changed

Lines changed: 29 additions & 30 deletions

File tree

‎boards/novacustom-v560tu/novacustom-v560tu.config‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,3 @@ export CONFIG_BOOT_KERNEL_ADD=""
7878
export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
7979
export CONFIG_BOARD_NAME="NovaCustom V560TU"
8080
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal --ifd -i bios -i me -i fd"
81-
export CONFIG_AUTO_BOOT_TIMEOUT=5

‎boards/qemu-coreboot-fbwhiptail-tpm1-hotp-prod/qemu-coreboot-fbwhiptail-tpm1-hotp-prod.config‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,6 @@ CONFIG_LINUX_CONFIG=config/linux-qemu.config
1818
#Enable HAVE_GPG_KEY_BACKUP to test GPG key backup drive (we cannot inject config under QEMU (no internal flashing))
1919
#export CONFIG_HAVE_GPG_KEY_BACKUP=y
2020

21-
#Enable DEBUG output
22-
#export CONFIG_DEBUG_OUTPUT=y
23-
#export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=y
24-
#Enable TPM2 pcap output under /tmp
25-
#export CONFIG_TPM2_CAPTURE_PCAP=y
26-
2721
#On-demand hardware support (modules.cpio)
2822
CONFIG_LINUX_USB=y
2923
CONFIG_LINUX_E1000=y
@@ -82,6 +76,13 @@ export CONFIG_AUTO_BOOT_TIMEOUT=5
8276
#export CONFIG_PRIMARY_KEY_TYPE=ecc
8377
#TPM1 requirements
8478
export CONFIG_TPM=y
79+
#Enable DEBUG output
80+
export CONFIG_DEBUG_OUTPUT=n
81+
export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=n
82+
#Enable TPM2 pcap output under /tmp
83+
export CONFIG_TPM2_CAPTURE_PCAP=n
84+
#Enable quiet mode: technical information logged under /tmp/debug.log
85+
export CONFIG_QUIET_MODE=n
8586
export CONFIG_BOOTSCRIPT=/bin/gui-init
8687
#text-based original init:
8788
#export CONFIG_BOOTSCRIPT=/bin/generic-init
@@ -92,6 +93,5 @@ export CONFIG_BOOT_KERNEL_ADD="console=ttyS0 console=tty systemd.zram=0"
9293
export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
9394
export CONFIG_BOARD_NAME="qemu-coreboot-fbwhiptail-tpm1-hotp"
9495
#export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
95-
export CONFIG_AUTO_BOOT_TIMEOUT=5
9696

9797
BOARD_TARGETS := qemu

‎boards/qemu-coreboot-fbwhiptail-tpm1-prod/qemu-coreboot-fbwhiptail-tpm1-prod.config‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@ CONFIG_LINUX_CONFIG=config/linux-qemu.config
1616
#Enable HAVE_GPG_KEY_BACKUP to test GPG key backup drive (we cannot inject config under QEMU (no internal flashing))
1717
#export CONFIG_HAVE_GPG_KEY_BACKUP=y
1818

19-
#Enable DEBUG output
20-
#export CONFIG_DEBUG_OUTPUT=y
21-
#export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=y
22-
#Enable TPM2 pcap output under /tmp
23-
#export CONFIG_TPM2_CAPTURE_PCAP=y
24-
2519
#On-demand hardware support (modules.cpio)
2620
CONFIG_LINUX_USB=y
2721
CONFIG_LINUX_E1000=y
@@ -80,6 +74,13 @@ export CONFIG_AUTO_BOOT_TIMEOUT=5
8074
#export CONFIG_PRIMARY_KEY_TYPE=ecc
8175
#TPM1 requirements
8276
export CONFIG_TPM=y
77+
#Enable DEBUG output
78+
export CONFIG_DEBUG_OUTPUT=n
79+
export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=n
80+
#Enable TPM2 pcap output under /tmp
81+
export CONFIG_TPM2_CAPTURE_PCAP=n
82+
#Enable quiet mode: technical information logged under /tmp/debug.log
83+
export CONFIG_QUIET_MODE=n
8384
export CONFIG_BOOTSCRIPT=/bin/gui-init
8485
#text-based original init:
8586
#export CONFIG_BOOTSCRIPT=/bin/generic-init
@@ -90,6 +91,5 @@ export CONFIG_BOOT_KERNEL_ADD="console=ttyS0 console=tty systemd.zram=0"
9091
export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
9192
export CONFIG_BOARD_NAME="qemu-coreboot-fbwhiptail-tpm1"
9293
#export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
93-
#export CONFIG_AUTO_BOOT_TIMEOUT=5
9494

9595
BOARD_TARGETS := qemu

‎boards/qemu-coreboot-whiptail-tpm1-hotp-prod/qemu-coreboot-whiptail-tpm1-hotp-prod.config‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,6 @@ CONFIG_LINUX_CONFIG=config/linux-qemu.config
1818
#Enable HAVE_GPG_KEY_BACKUP to test GPG key backup drive (we cannot inject config under QEMU (no internal flashing))
1919
#export CONFIG_HAVE_GPG_KEY_BACKUP=y
2020

21-
#Enable DEBUG output
22-
#export CONFIG_DEBUG_OUTPUT=y
23-
#export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=y
24-
#Enable TPM2 pcap output under /tmp
25-
#export CONFIG_TPM2_CAPTURE_PCAP=y
26-
2721
#On-demand hardware support (modules.cpio)
2822
CONFIG_LINUX_USB=y
2923
CONFIG_LINUX_E1000=y
@@ -82,6 +76,13 @@ export CONFIG_AUTO_BOOT_TIMEOUT=5
8276
#export CONFIG_PRIMARY_KEY_TYPE=ecc
8377
#TPM1 requirements
8478
export CONFIG_TPM=y
79+
#Enable DEBUG output
80+
export CONFIG_DEBUG_OUTPUT=n
81+
export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=n
82+
#Enable TPM2 pcap output under /tmp
83+
export CONFIG_TPM2_CAPTURE_PCAP=n
84+
#Enable quiet mode: technical information logged under /tmp/debug.log
85+
export CONFIG_QUIET_MODE=n
8586
export CONFIG_BOOTSCRIPT=/bin/gui-init
8687
#text-based original init:
8788
#export CONFIG_BOOTSCRIPT=/bin/generic-init
@@ -92,6 +93,5 @@ export CONFIG_BOOT_KERNEL_ADD="console=ttyS0 console=tty systemd.zram=0"
9293
export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
9394
export CONFIG_BOARD_NAME="qemu-coreboot-whiptail-tpm1-hotp"
9495
#export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
95-
export CONFIG_AUTO_BOOT_TIMEOUT=5
9696

9797
BOARD_TARGETS := qemu

‎boards/qemu-coreboot-whiptail-tpm1-prod/qemu-coreboot-whiptail-tpm1-prod.config‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@ CONFIG_LINUX_CONFIG=config/linux-qemu.config
1616
#Enable HAVE_GPG_KEY_BACKUP to test GPG key backup drive (we cannot inject config under QEMU (no internal flashing))
1717
#export CONFIG_HAVE_GPG_KEY_BACKUP=y
1818

19-
#Enable DEBUG output
20-
#export CONFIG_DEBUG_OUTPUT=y
21-
#export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=y
22-
#Enable TPM2 pcap output under /tmp
23-
#export CONFIG_TPM2_CAPTURE_PCAP=y
24-
2519
#On-demand hardware support (modules.cpio)
2620
CONFIG_LINUX_USB=y
2721
CONFIG_LINUX_E1000=y
@@ -80,6 +74,13 @@ export CONFIG_AUTO_BOOT_TIMEOUT=5
8074
#export CONFIG_PRIMARY_KEY_TYPE=ecc
8175
#TPM1 requirements
8276
export CONFIG_TPM=y
77+
#Enable DEBUG output
78+
export CONFIG_DEBUG_OUTPUT=n
79+
export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=n
80+
#Enable TPM2 pcap output under /tmp
81+
export CONFIG_TPM2_CAPTURE_PCAP=n
82+
#Enable quiet mode: technical information logged under /tmp/debug.log
83+
export CONFIG_QUIET_MODE=n
8384
export CONFIG_BOOTSCRIPT=/bin/gui-init
8485
#text-based original init:
8586
#export CONFIG_BOOTSCRIPT=/bin/generic-init
@@ -90,6 +91,5 @@ export CONFIG_BOOT_KERNEL_ADD="console=ttyS0 console=tty systemd.zram=0"
9091
export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
9192
export CONFIG_BOARD_NAME="qemu-coreboot-whiptail-tpm1"
9293
#export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
93-
#export CONFIG_AUTO_BOOT_TIMEOUT=5
9494

9595
BOARD_TARGETS := qemu

‎config/coreboot-novacustom-v560tu.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
216216
CONFIG_FSP_TEMP_RAM_SIZE=0x20000
217217
CONFIG_EC_GPE_SCI=0x50
218218
CONFIG_TPM_MEASURED_BOOT=y
219-
CONFIG_LINUX_COMMAND_LINE="debug"
219+
CONFIG_LINUX_COMMAND_LINE="quiet loglevel=2"
220220
CONFIG_BOARD_ROMSIZE_KB_32768=y
221221
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
222222
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set

0 commit comments

Comments
 (0)