michael/zephyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

boards: qemu_cortex_a53: Fix Kconfig warnings in SMP variant

Browse Source 
A combination of multiple defconfigs resulted in this:

   CONFIG_QEMU_ICOUNT=y
   CONFIG_QEMU_ICOUNT_SHIFT=4  # depends on QEMU_ICOUNT
   CONFIG_QEMU_ICOUNT_SLEEP=y  # depends on QEMU_ICOUNT
   CONFIG_QEMU_ICOUNT=n        # warning: unsatisfied dependencies

Fix this by setting the symbols in `Kconfig.defconfig` instead. Not only
does this allow for proper defconfig inheritance, it also allows samples
to control the value of QEMU_ICOUNT.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
This commit is contained in:
Grzegorz Swiderski
2024-02-09 13:29:12 +01:00
committed by Jamie McCrae
parent fa07bd9419
commit 66b0df5526
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
boards/qemu/qemu_cortex_a53/Kconfig.defconfig
View File

@@ -33,4 +33,14 @@ choice ARM64_PA_BITS
default ARM64_PA_BITS_40 if PCIE
endchoice
if QEMU_ICOUNT
config QEMU_ICOUNT_SHIFT
default 4
config QEMU_ICOUNT_SLEEP
default y
endif # QEMU_ICOUNT
endif # BOARD_QEMU_CORTEX_A53

2
boards/qemu/qemu_cortex_a53/qemu_cortex_a53_defconfig
View File

@@ -15,5 +15,3 @@ CONFIG_UART_INTERRUPT_DRIVEN=y
# Avoid timing skew in tests
CONFIG_QEMU_ICOUNT=y
CONFIG_QEMU_ICOUNT_SHIFT=4
CONFIG_QEMU_ICOUNT_SLEEP=y

2
boards/qemu/qemu_cortex_a53/qemu_cortex_a53_qemu_cortex_a53_xip_defconfig
View File

@@ -15,8 +15,6 @@ CONFIG_UART_INTERRUPT_DRIVEN=y
# Avoid timing skew in tests
CONFIG_QEMU_ICOUNT=y
CONFIG_QEMU_ICOUNT_SHIFT=4
CONFIG_QEMU_ICOUNT_SLEEP=y
# Enable XIP
CONFIG_XIP=y