diff --git a/boards/qemu-coreboot-whiptail-tpm1/qemu-coreboot-whiptail-tpm1.config b/boards/qemu-coreboot-whiptail-tpm1/qemu-coreboot-whiptail-tpm1.config index 37ae90a5d..df02bebb6 100644 --- a/boards/qemu-coreboot-whiptail-tpm1/qemu-coreboot-whiptail-tpm1.config +++ b/boards/qemu-coreboot-whiptail-tpm1/qemu-coreboot-whiptail-tpm1.config @@ -56,7 +56,7 @@ export CONFIG_BOOTSCRIPT=/bin/gui-init export CONFIG_BOOT_REQ_HASH=n export CONFIG_BOOT_REQ_ROLLBACK=n export CONFIG_BOOT_RECOVERY_SERIAL="/dev/ttyS0" -export CONFIG_BOOT_KERNEL_ADD="console=ttyS0 console=tty systemd.zram=0" +export CONFIG_BOOT_KERNEL_ADD="nosmp debug console=ttyS0,115200 console=tty systemd.zram=0" export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash" export CONFIG_TPM=y diff --git a/config/linux-qemu.config b/config/linux-qemu.config index ff65fb65a..9950cc1f3 100644 --- a/config/linux-qemu.config +++ b/config/linux-qemu.config @@ -525,9 +525,9 @@ CONFIG_COMPAT_FOR_U64_ALIGNMENT=y # Firmware Drivers # # CONFIG_EDD is not set -CONFIG_FIRMWARE_MEMMAP=y +# CONFIG_FIRMWARE_MEMMAP is not set # CONFIG_DMIID is not set -CONFIG_DMI_SYSFS=y +# CONFIG_DMI_SYSFS is not set CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y # CONFIG_ISCSI_IBFT is not set # CONFIG_FW_CFG_SYSFS is not set @@ -536,8 +536,8 @@ CONFIG_GOOGLE_FIRMWARE=y CONFIG_GOOGLE_COREBOOT_TABLE=y CONFIG_GOOGLE_MEMCONSOLE=y CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY=y -# CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT is not set -# CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set +CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=y +CONFIG_GOOGLE_MEMCONSOLE_COREBOOT=y # CONFIG_GOOGLE_VPD is not set # @@ -1529,7 +1529,9 @@ CONFIG_DEVMEM=y CONFIG_NVRAM=y # CONFIG_RAW_DRIVER is not set CONFIG_DEVPORT=y -# CONFIG_HPET is not set +CONFIG_HPET=y +CONFIG_HPET_MMAP=y +CONFIG_HPET_MMAP_DEFAULT=y # CONFIG_HANGCHECK_TIMER is not set CONFIG_TCG_TPM=y CONFIG_HW_RANDOM_TPM=y diff --git a/initrd/bin/kexec-boot b/initrd/bin/kexec-boot index 86aa651e0..7c1becd28 100755 --- a/initrd/bin/kexec-boot +++ b/initrd/bin/kexec-boot @@ -80,6 +80,7 @@ do elif [ "$kexectype" = "elf" ]; then DEBUG "kexectype= $kexectype" DEBUG "restval= $restval" + DEBUG "kexeccmd= $kexeccmd" DEBUG "filepath= $filepath" #kexeccmd="$kexeccmd --noefi --console-vga -l $filepath" #kexeccmd="$kexeccmd --command-line \"$restval vga=current\"" @@ -87,8 +88,9 @@ do #kexeccmd="$kexeccmd --noefi --console-vga --reuse-video-type -l $filepath" #kexeccmd="$kexeccmd --noefi --real-mode --console-vga --reuse-video-type -l $filepath" #kexeccmd="$kexeccmd -l $filepath --command-line \"$restval vga=current\"" - kexeccmd="$kexeccmd -l $filepath" + kexeccmd="$kexeccmd -d -l $filepath" else + DEBUG "unknown kexectype!!!!" kexeccmd="$kexeccmd -l $filepath" fi fi @@ -152,4 +154,4 @@ if [ "$CONFIG_TPM" = "y" ]; then fi echo "Starting the new kernel" -exec kexec -e +exec kexec -d -e