File tree Expand file tree Collapse file tree 3 files changed +19
-8
lines changed
boards/qemu-coreboot-whiptail-tpm1 Expand file tree Collapse file tree 3 files changed +19
-8
lines changed Original file line number Diff line number Diff line change @@ -56,7 +56,7 @@ export CONFIG_BOOTSCRIPT=/bin/gui-init
5656export CONFIG_BOOT_REQ_HASH=n
5757export CONFIG_BOOT_REQ_ROLLBACK=n
5858export CONFIG_BOOT_RECOVERY_SERIAL="/dev/ttyS0"
59- export CONFIG_BOOT_KERNEL_ADD="console=ttyS0 console=tty systemd.zram=0"
59+ export CONFIG_BOOT_KERNEL_ADD="nosmp debug console=ttyS0,115200 console=tty systemd.zram=0"
6060export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
6161
6262export CONFIG_TPM=y
Original file line number Diff line number Diff line change @@ -525,9 +525,9 @@ CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
525525# Firmware Drivers
526526#
527527# CONFIG_EDD is not set
528- CONFIG_FIRMWARE_MEMMAP=y
528+ # CONFIG_FIRMWARE_MEMMAP is not set
529529# CONFIG_DMIID is not set
530- CONFIG_DMI_SYSFS=y
530+ # CONFIG_DMI_SYSFS is not set
531531CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
532532# CONFIG_ISCSI_IBFT is not set
533533# CONFIG_FW_CFG_SYSFS is not set
@@ -536,8 +536,8 @@ CONFIG_GOOGLE_FIRMWARE=y
536536CONFIG_GOOGLE_COREBOOT_TABLE=y
537537CONFIG_GOOGLE_MEMCONSOLE=y
538538CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY=y
539- # CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT is not set
540- # CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set
539+ CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=y
540+ CONFIG_GOOGLE_MEMCONSOLE_COREBOOT=y
541541# CONFIG_GOOGLE_VPD is not set
542542
543543#
@@ -1529,7 +1529,9 @@ CONFIG_DEVMEM=y
15291529CONFIG_NVRAM=y
15301530# CONFIG_RAW_DRIVER is not set
15311531CONFIG_DEVPORT=y
1532- # CONFIG_HPET is not set
1532+ CONFIG_HPET=y
1533+ CONFIG_HPET_MMAP=y
1534+ CONFIG_HPET_MMAP_DEFAULT=y
15331535# CONFIG_HANGCHECK_TIMER is not set
15341536CONFIG_TCG_TPM=y
15351537CONFIG_HW_RANDOM_TPM=y
Original file line number Diff line number Diff line change @@ -61,6 +61,10 @@ adjust_cmd_line() {
6161 adjusted_cmd_line=" y"
6262}
6363
64+ if [ " $CONFIG_DEBUG_OUTPUT " = " y" ]; then
65+ kexeccmd=" $kexeccmd -d"
66+ fi
67+
6468module_number=" 1"
6569while read line
6670do
8084 elif [ " $kexectype " = " elf" ]; then
8185 DEBUG " kexectype= $kexectype "
8286 DEBUG " restval= $restval "
87+ DEBUG " kexeccmd= $kexeccmd "
8388 DEBUG " filepath= $filepath "
84- # kexeccmd="$kexeccmd --noefi --console-vga -l $filepath"
89+ kexeccmd=" $kexeccmd --reuse-video-type -l $filepath "
8590 # kexeccmd="$kexeccmd --command-line \"$restval vga=current\""
8691 # kexeccmd="$kexeccmd --noefi --reset-vga -l $filepath"
8792 # kexeccmd="$kexeccmd --noefi --console-vga --reuse-video-type -l $filepath"
8893 # kexeccmd="$kexeccmd --noefi --real-mode --console-vga --reuse-video-type -l $filepath"
8994 # kexeccmd="$kexeccmd -l $filepath --command-line \"$restval vga=current\""
90- kexeccmd=" $kexeccmd -l $filepath "
95+ # kexeccmd="$kexeccmd -l $filepath"
9196 else
97+ DEBUG " unknown kexectype!!!!"
9298 kexeccmd=" $kexeccmd -l $filepath "
9399 fi
94100 fi
@@ -152,4 +158,7 @@ if [ "$CONFIG_TPM" = "y" ]; then
152158fi
153159
154160echo " Starting the new kernel"
161+ if [ " $CONFIG_DEBUG_OUTPUT " = " y" ]; then
162+ exec kexec -d -e
163+ fi
155164exec kexec -e
You can’t perform that action at this time.
0 commit comments