mirror of
https://github.com/linuxboot/heads.git
synced 2025-01-19 03:06:56 +00:00
BUGFIX: v560tu: unify board config, remove debug cmdline passed from coreboot to linux kernel
Note: qemu coreboot config still pass debug (non quiet, non prod board = debug) config/coreboot-qemu-tpm1.config:173:CONFIG_LINUX_COMMAND_LINE="debug console=ttyS0,115200 console=tty" config/coreboot-qemu-tpm2.config:170:CONFIG_LINUX_COMMAND_LINE="debug console=ttyS0,115200 console=tty" Signed-off-by: Thierry Laurion <insurgo@riseup.net>
This commit is contained in:
Thierry Laurion
parent
49e0849d98
commit
0cb5f2faa8
@ -78,4 +78,3 @@ export CONFIG_BOOT_KERNEL_ADD=""
|
||||
export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
|
||||
export CONFIG_BOARD_NAME="NovaCustom V560TU"
|
||||
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal --ifd -i bios -i me -i fd"
|
||||
export CONFIG_AUTO_BOOT_TIMEOUT=5
|
||||
|
||||
@ -18,12 +18,6 @@ CONFIG_LINUX_CONFIG=config/linux-qemu.config
|
||||
#Enable HAVE_GPG_KEY_BACKUP to test GPG key backup drive (we cannot inject config under QEMU (no internal flashing))
|
||||
#export CONFIG_HAVE_GPG_KEY_BACKUP=y
|
||||
|
||||
#Enable DEBUG output
|
||||
#export CONFIG_DEBUG_OUTPUT=y
|
||||
#export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=y
|
||||
#Enable TPM2 pcap output under /tmp
|
||||
#export CONFIG_TPM2_CAPTURE_PCAP=y
|
||||
|
||||
#On-demand hardware support (modules.cpio)
|
||||
CONFIG_LINUX_USB=y
|
||||
CONFIG_LINUX_E1000=y
|
||||
@ -82,6 +76,13 @@ export CONFIG_AUTO_BOOT_TIMEOUT=5
|
||||
#export CONFIG_PRIMARY_KEY_TYPE=ecc
|
||||
#TPM1 requirements
|
||||
export CONFIG_TPM=y
|
||||
#Enable DEBUG output
|
||||
export CONFIG_DEBUG_OUTPUT=n
|
||||
export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=n
|
||||
#Enable TPM2 pcap output under /tmp
|
||||
export CONFIG_TPM2_CAPTURE_PCAP=n
|
||||
#Enable quiet mode: technical information logged under /tmp/debug.log
|
||||
export CONFIG_QUIET_MODE=n
|
||||
export CONFIG_BOOTSCRIPT=/bin/gui-init
|
||||
#text-based original init:
|
||||
#export CONFIG_BOOTSCRIPT=/bin/generic-init
|
||||
@ -92,6 +93,5 @@ export CONFIG_BOOT_KERNEL_ADD="console=ttyS0 console=tty systemd.zram=0"
|
||||
export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
|
||||
export CONFIG_BOARD_NAME="qemu-coreboot-fbwhiptail-tpm1-hotp"
|
||||
#export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
|
||||
export CONFIG_AUTO_BOOT_TIMEOUT=5
|
||||
|
||||
BOARD_TARGETS := qemu
|
||||
|
||||
@ -16,12 +16,6 @@ CONFIG_LINUX_CONFIG=config/linux-qemu.config
|
||||
#Enable HAVE_GPG_KEY_BACKUP to test GPG key backup drive (we cannot inject config under QEMU (no internal flashing))
|
||||
#export CONFIG_HAVE_GPG_KEY_BACKUP=y
|
||||
|
||||
#Enable DEBUG output
|
||||
#export CONFIG_DEBUG_OUTPUT=y
|
||||
#export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=y
|
||||
#Enable TPM2 pcap output under /tmp
|
||||
#export CONFIG_TPM2_CAPTURE_PCAP=y
|
||||
|
||||
#On-demand hardware support (modules.cpio)
|
||||
CONFIG_LINUX_USB=y
|
||||
CONFIG_LINUX_E1000=y
|
||||
@ -80,6 +74,13 @@ export CONFIG_AUTO_BOOT_TIMEOUT=5
|
||||
#export CONFIG_PRIMARY_KEY_TYPE=ecc
|
||||
#TPM1 requirements
|
||||
export CONFIG_TPM=y
|
||||
#Enable DEBUG output
|
||||
export CONFIG_DEBUG_OUTPUT=n
|
||||
export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=n
|
||||
#Enable TPM2 pcap output under /tmp
|
||||
export CONFIG_TPM2_CAPTURE_PCAP=n
|
||||
#Enable quiet mode: technical information logged under /tmp/debug.log
|
||||
export CONFIG_QUIET_MODE=n
|
||||
export CONFIG_BOOTSCRIPT=/bin/gui-init
|
||||
#text-based original init:
|
||||
#export CONFIG_BOOTSCRIPT=/bin/generic-init
|
||||
@ -90,6 +91,5 @@ export CONFIG_BOOT_KERNEL_ADD="console=ttyS0 console=tty systemd.zram=0"
|
||||
export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
|
||||
export CONFIG_BOARD_NAME="qemu-coreboot-fbwhiptail-tpm1"
|
||||
#export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
|
||||
#export CONFIG_AUTO_BOOT_TIMEOUT=5
|
||||
|
||||
BOARD_TARGETS := qemu
|
||||
|
||||
@ -18,12 +18,6 @@ CONFIG_LINUX_CONFIG=config/linux-qemu.config
|
||||
#Enable HAVE_GPG_KEY_BACKUP to test GPG key backup drive (we cannot inject config under QEMU (no internal flashing))
|
||||
#export CONFIG_HAVE_GPG_KEY_BACKUP=y
|
||||
|
||||
#Enable DEBUG output
|
||||
#export CONFIG_DEBUG_OUTPUT=y
|
||||
#export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=y
|
||||
#Enable TPM2 pcap output under /tmp
|
||||
#export CONFIG_TPM2_CAPTURE_PCAP=y
|
||||
|
||||
#On-demand hardware support (modules.cpio)
|
||||
CONFIG_LINUX_USB=y
|
||||
CONFIG_LINUX_E1000=y
|
||||
@ -82,6 +76,13 @@ export CONFIG_AUTO_BOOT_TIMEOUT=5
|
||||
#export CONFIG_PRIMARY_KEY_TYPE=ecc
|
||||
#TPM1 requirements
|
||||
export CONFIG_TPM=y
|
||||
#Enable DEBUG output
|
||||
export CONFIG_DEBUG_OUTPUT=n
|
||||
export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=n
|
||||
#Enable TPM2 pcap output under /tmp
|
||||
export CONFIG_TPM2_CAPTURE_PCAP=n
|
||||
#Enable quiet mode: technical information logged under /tmp/debug.log
|
||||
export CONFIG_QUIET_MODE=n
|
||||
export CONFIG_BOOTSCRIPT=/bin/gui-init
|
||||
#text-based original init:
|
||||
#export CONFIG_BOOTSCRIPT=/bin/generic-init
|
||||
@ -92,6 +93,5 @@ export CONFIG_BOOT_KERNEL_ADD="console=ttyS0 console=tty systemd.zram=0"
|
||||
export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
|
||||
export CONFIG_BOARD_NAME="qemu-coreboot-whiptail-tpm1-hotp"
|
||||
#export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
|
||||
export CONFIG_AUTO_BOOT_TIMEOUT=5
|
||||
|
||||
BOARD_TARGETS := qemu
|
||||
|
||||
@ -16,12 +16,6 @@ CONFIG_LINUX_CONFIG=config/linux-qemu.config
|
||||
#Enable HAVE_GPG_KEY_BACKUP to test GPG key backup drive (we cannot inject config under QEMU (no internal flashing))
|
||||
#export CONFIG_HAVE_GPG_KEY_BACKUP=y
|
||||
|
||||
#Enable DEBUG output
|
||||
#export CONFIG_DEBUG_OUTPUT=y
|
||||
#export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=y
|
||||
#Enable TPM2 pcap output under /tmp
|
||||
#export CONFIG_TPM2_CAPTURE_PCAP=y
|
||||
|
||||
#On-demand hardware support (modules.cpio)
|
||||
CONFIG_LINUX_USB=y
|
||||
CONFIG_LINUX_E1000=y
|
||||
@ -80,6 +74,13 @@ export CONFIG_AUTO_BOOT_TIMEOUT=5
|
||||
#export CONFIG_PRIMARY_KEY_TYPE=ecc
|
||||
#TPM1 requirements
|
||||
export CONFIG_TPM=y
|
||||
#Enable DEBUG output
|
||||
export CONFIG_DEBUG_OUTPUT=n
|
||||
export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=n
|
||||
#Enable TPM2 pcap output under /tmp
|
||||
export CONFIG_TPM2_CAPTURE_PCAP=n
|
||||
#Enable quiet mode: technical information logged under /tmp/debug.log
|
||||
export CONFIG_QUIET_MODE=n
|
||||
export CONFIG_BOOTSCRIPT=/bin/gui-init
|
||||
#text-based original init:
|
||||
#export CONFIG_BOOTSCRIPT=/bin/generic-init
|
||||
@ -90,6 +91,5 @@ export CONFIG_BOOT_KERNEL_ADD="console=ttyS0 console=tty systemd.zram=0"
|
||||
export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
|
||||
export CONFIG_BOARD_NAME="qemu-coreboot-whiptail-tpm1"
|
||||
#export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
|
||||
#export CONFIG_AUTO_BOOT_TIMEOUT=5
|
||||
|
||||
BOARD_TARGETS := qemu
|
||||
|
||||
@ -216,7 +216,7 @@ CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
|
||||
CONFIG_FSP_TEMP_RAM_SIZE=0x20000
|
||||
CONFIG_EC_GPE_SCI=0x50
|
||||
CONFIG_TPM_MEASURED_BOOT=y
|
||||
CONFIG_LINUX_COMMAND_LINE="debug"
|
||||
CONFIG_LINUX_COMMAND_LINE="quiet loglevel=2"
|
||||
CONFIG_BOARD_ROMSIZE_KB_32768=y
|
||||
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
|
||||
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
|
||||
|
||||
Loading…
Reference in New Issue
Block a user