File tree 3 files changed +19
-8
lines changed
boards/qemu-coreboot-whiptail-tpm1
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
56
56
export CONFIG_BOOT_REQ_HASH=n
57
57
export CONFIG_BOOT_REQ_ROLLBACK=n
58
58
export 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"
60
60
export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
61
61
62
62
export CONFIG_TPM=y
Original file line number Diff line number Diff line change @@ -525,9 +525,9 @@ CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
525
525
# Firmware Drivers
526
526
#
527
527
# CONFIG_EDD is not set
528
- CONFIG_FIRMWARE_MEMMAP=y
528
+ # CONFIG_FIRMWARE_MEMMAP is not set
529
529
# CONFIG_DMIID is not set
530
- CONFIG_DMI_SYSFS=y
530
+ # CONFIG_DMI_SYSFS is not set
531
531
CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
532
532
# CONFIG_ISCSI_IBFT is not set
533
533
# CONFIG_FW_CFG_SYSFS is not set
@@ -536,8 +536,8 @@ CONFIG_GOOGLE_FIRMWARE=y
536
536
CONFIG_GOOGLE_COREBOOT_TABLE=y
537
537
CONFIG_GOOGLE_MEMCONSOLE=y
538
538
CONFIG_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
541
541
# CONFIG_GOOGLE_VPD is not set
542
542
543
543
#
@@ -1529,7 +1529,9 @@ CONFIG_DEVMEM=y
1529
1529
CONFIG_NVRAM=y
1530
1530
# CONFIG_RAW_DRIVER is not set
1531
1531
CONFIG_DEVPORT=y
1532
- # CONFIG_HPET is not set
1532
+ CONFIG_HPET=y
1533
+ CONFIG_HPET_MMAP=y
1534
+ CONFIG_HPET_MMAP_DEFAULT=y
1533
1535
# CONFIG_HANGCHECK_TIMER is not set
1534
1536
CONFIG_TCG_TPM=y
1535
1537
CONFIG_HW_RANDOM_TPM=y
Original file line number Diff line number Diff line change @@ -61,6 +61,10 @@ adjust_cmd_line() {
61
61
adjusted_cmd_line=" y"
62
62
}
63
63
64
+ if [ " $CONFIG_DEBUG_OUTPUT " = " y" ]; then
65
+ kexeccmd=" $kexeccmd -d"
66
+ fi
67
+
64
68
module_number=" 1"
65
69
while read line
66
70
do
80
84
elif [ " $kexectype " = " elf" ]; then
81
85
DEBUG " kexectype= $kexectype "
82
86
DEBUG " restval= $restval "
87
+ DEBUG " kexeccmd= $kexeccmd "
83
88
DEBUG " filepath= $filepath "
84
- # kexeccmd="$kexeccmd --noefi --console-vga -l $filepath"
89
+ kexeccmd=" $kexeccmd --reuse-video-type -l $filepath "
85
90
# kexeccmd="$kexeccmd --command-line \"$restval vga=current\""
86
91
# kexeccmd="$kexeccmd --noefi --reset-vga -l $filepath"
87
92
# kexeccmd="$kexeccmd --noefi --console-vga --reuse-video-type -l $filepath"
88
93
# kexeccmd="$kexeccmd --noefi --real-mode --console-vga --reuse-video-type -l $filepath"
89
94
# kexeccmd="$kexeccmd -l $filepath --command-line \"$restval vga=current\""
90
- kexeccmd=" $kexeccmd -l $filepath "
95
+ # kexeccmd="$kexeccmd -l $filepath"
91
96
else
97
+ DEBUG " unknown kexectype!!!!"
92
98
kexeccmd=" $kexeccmd -l $filepath "
93
99
fi
94
100
fi
@@ -152,4 +158,7 @@ if [ "$CONFIG_TPM" = "y" ]; then
152
158
fi
153
159
154
160
echo " Starting the new kernel"
161
+ if [ " $CONFIG_DEBUG_OUTPUT " = " y" ]; then
162
+ exec kexec -d -e
163
+ fi
155
164
exec kexec -e
You can’t perform that action at this time.
0 commit comments