Commit cd5357ca authored by Daniel Leung's avatar Daniel Leung Committed by Anas Nashif
Browse files

boards: qemu_x86: disable QEMU icount with shell and HPET timer 



For some unknown reasons, using the new modified HPET timer would
render shell unresponsive under QEMU. So for now, disable QEMU
icount when shell is enabled.

Fixes #37672

Signed-off-by: default avatarDaniel Leung <daniel.leung@intel.com>
parent 6de47479

boards/x86/qemu_x86/Kconfig.defconfig

+18 −0
Original line number Diff line number Diff line
@@ -24,6 +24,12 @@ config MULTIBOOT_INFO 
config MULTIBOOT_MEMMAP

	default y if MULTIBOOT



config QEMU_ICOUNT

	default n if HPET_TIMER && SHELL



config QEMU_ICOUNT_SHIFT

	default 5



endif # BOARD_QEMU_X86



if BOARD_QEMU_X86_64
@@ -55,6 +61,12 @@ config X86_PC_COMPATIBLE 
	# QEMU presents a PC-compatible machine

	default y



config QEMU_ICOUNT

	default n if HPET_TIMER && SHELL



config QEMU_ICOUNT_SHIFT

	default 5



endif # BOARD_QEMU_X86_LAKEMONT



if BOARD_QEMU_X86_TINY
@@ -76,6 +88,12 @@ config X86_PC_COMPATIBLE 
	# QEMU presents a PC-compatible machine

	default y



config QEMU_ICOUNT

	default n if HPET_TIMER && SHELL



config QEMU_ICOUNT_SHIFT

	default 5



config HAVE_CUSTOM_LINKER_SCRIPT

	default y

boards/x86/qemu_x86/qemu_x86_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -16,4 +16,3 @@ CONFIG_DEBUG_INFO=y 
CONFIG_SCHED_SCALABLE=y

CONFIG_WAITQ_SCALABLE=y

CONFIG_X86_VERY_EARLY_CONSOLE=y
 
CONFIG_QEMU_ICOUNT_SHIFT=5

boards/x86/qemu_x86/qemu_x86_lakemont_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -16,4 +16,3 @@ CONFIG_DEBUG_INFO=y 
CONFIG_SCHED_SCALABLE=y

CONFIG_WAITQ_SCALABLE=y

CONFIG_X86_VERY_EARLY_CONSOLE=y
 
CONFIG_QEMU_ICOUNT_SHIFT=5

boards/x86/qemu_x86/qemu_x86_nokpti_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -16,5 +16,4 @@ CONFIG_DEBUG_INFO=y 
CONFIG_SCHED_SCALABLE=y

CONFIG_WAITQ_SCALABLE=y

CONFIG_X86_VERY_EARLY_CONSOLE=y

CONFIG_QEMU_ICOUNT_SHIFT=5

CONFIG_X86_KPTI=n

boards/x86/qemu_x86/qemu_x86_nommu_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -12,4 +12,3 @@ CONFIG_UART_CONSOLE=y 
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000

CONFIG_TEST_RANDOM_GENERATOR=y

CONFIG_DEBUG_INFO=y
 
CONFIG_QEMU_ICOUNT_SHIFT=5

CRA Git | Maintained and supported by SUSTech CRA and CCSE