qemu-coreboot-fbwhiptail-tpm1-hotp: Virtio video/storage, serial

Enable virtio video and storage.

Enable serial console and tweak kernel command line to show logs.

Signed-off-by: Jonathon Hall <jonathon.hall@puri.sm>
This commit is contained in:
Jonathon Hall 2022-08-17 10:28:19 -04:00
parent 64f194628f
commit ef3cd5c65f
No known key found for this signature in database
GPG Key ID: 1E9C3CA91AE25114
2 changed files with 16 additions and 7 deletions

View File

@ -6,7 +6,7 @@
# the VM. # the VM.
export CONFIG_COREBOOT=y export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=4.13 export CONFIG_COREBOOT_VERSION=4.13
export CONFIG_LINUX_VERSION=4.14.62 export CONFIG_LINUX_VERSION=5.10.5
CONFIG_COREBOOT_CONFIG=config/coreboot-qemu-fbwhiptail-tpm1-hotp.config CONFIG_COREBOOT_CONFIG=config/coreboot-qemu-fbwhiptail-tpm1-hotp.config
CONFIG_LINUX_CONFIG=config/linux-qemu.config CONFIG_LINUX_CONFIG=config/linux-qemu.config
@ -51,10 +51,14 @@ export CONFIG_BOOTSCRIPT=/bin/gui-init
# #
#text-based original init: #text-based original init:
#export CONFIG_BOOTSCRIPT=/bin/generic-init #export CONFIG_BOOTSCRIPT=/bin/generic-init
export CONFIG_BOOT_REQ_HASH=n
export CONFIG_BOOT_REQ_ROLLBACK=n
export CONFIG_BOOT_KERNEL_ADD="console=ttyS0 console=tty systemd.zram=0"
export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
export CONFIG_TPM=y export CONFIG_TPM=y
export CONFIG_BOOT_DEV="/dev/sda1" export CONFIG_BOOT_DEV="/dev/vda1"
export CONFIG_BOARD_NAME="qemu-coreboot-fbwhiptail-tpm1-hotp" export CONFIG_BOARD_NAME="qemu-coreboot-fbwhiptail-tpm1-hotp"
# Use the GPG-injected ROM if a key was given, since we can't reflash a GPG # Use the GPG-injected ROM if a key was given, since we can't reflash a GPG
@ -123,10 +127,14 @@ run: $(TPMDIR)/.manufacture $(ROOT_DISK_IMG) $(MEMORY_SIZE_FILE) $(USB_FD_IMG)
--ctrl type=unixio,path="$(TPMDIR)/sock" & --ctrl type=unixio,path="$(TPMDIR)/sock" &
sleep 0.5 sleep 0.5
-qemu-system-x86_64 "$(ROOT_DISK_IMG)" \ -qemu-system-x86_64 -drive file="$(ROOT_DISK_IMG)",if=virtio \
--machine q35,accel=kvm:tcg \ --machine q35,accel=kvm:tcg \
-rtc base=utc \
-smp "$$(nproc)" \
-vga virtio \
-full-screen \
-m "$$(cat "$(MEMORY_SIZE_FILE)")" \ -m "$$(cat "$(MEMORY_SIZE_FILE)")" \
--serial /dev/tty \ -serial stdio \
--bios "$(QEMU_BOOT_ROM)" \ --bios "$(QEMU_BOOT_ROM)" \
-object rng-random,filename=/dev/urandom,id=rng0 \ -object rng-random,filename=/dev/urandom,id=rng0 \
-device virtio-rng-pci,rng=rng0 \ -device virtio-rng-pci,rng=rng0 \

View File

@ -1,11 +1,12 @@
# CONFIG_INCLUDE_CONFIG_FILE is not set # CONFIG_INCLUDE_CONFIG_FILE is not set
CONFIG_CBFS_SIZE=0x780000 CONFIG_ONBOARD_VGA_IS_PRIMARY=y
CONFIG_CBFS_SIZE=0x980000
# CONFIG_POST_IO is not set # CONFIG_POST_IO is not set
# CONFIG_POST_DEVICE is not set # CONFIG_POST_DEVICE is not set
CONFIG_BOARD_EMULATION_QEMU_X86_Q35=y CONFIG_BOARD_EMULATION_QEMU_X86_Q35=y
# CONFIG_CONSOLE_SERIAL is not set # CONFIG_CONSOLE_SERIAL is not set
CONFIG_LINUX_COMMAND_LINE="debug" CONFIG_LINUX_COMMAND_LINE="debug console=ttyS0,115200 console=tty"
CONFIG_COREBOOT_ROMSIZE_KB_8192=y CONFIG_COREBOOT_ROMSIZE_KB_10240=y
CONFIG_PCIEXP_ASPM=y CONFIG_PCIEXP_ASPM=y
CONFIG_PCIEXP_COMMON_CLOCK=y CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_UART_PCI_ADDR=0 CONFIG_UART_PCI_ADDR=0