arch/x86: Fix the Kconfig warning

arch/x86/Kconfig:28:warning: choice value used outside its choice group
arch/x86/Kconfig:29:warning: defaults for choice values not supported

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2022-06-06 23:51:48 +08:00 committed by Masayuki Ishikawa
parent 4058f01faf
commit 5509f8f4ba
6 changed files with 16 additions and 16 deletions

View File

@ -8,11 +8,11 @@ comment "x86 Configuration Options"
choice
prompt "x86 chip selection"
default ARCH_I486
default ARCH_CHIP_QEMU_I486
config ARCH_I486
bool "i486"
select ARCH_X86_HAVE_32BIT
config ARCH_CHIP_QEMU_I486
bool "Qemu x86 emulation"
select ARCH_I486
---help---
Intel i486 architecture
@ -24,15 +24,15 @@ config ARCH_CHIP_X86_CUSTOM
endchoice
config ARCH_CHIP_QEMU
bool "Qemu x86 emulation"
default n
config ARCH_I486
bool
select ARCH_X86_HAVE_32BIT
---help---
Intel i486 architecture
config ARCH_CHIP
string
default "qemu" if ARCH_CHIP_QEMU
default "qemu" if ARCH_CHIP_QEMU_I486
config ARCH_X86_HAVE_32BIT
bool
@ -52,7 +52,7 @@ source "arch/x86/src/common/Kconfig"
if ARCH_I486
source "arch/x86/src/i486/Kconfig"
endif # ARCH_I486
if ARCH_CHIP_QEMU
if ARCH_CHIP_QEMU_I486
source "arch/x86/src/qemu/Kconfig"
endif # ARCH_CHIP_QEMU
endif # ARCH_CHIP_QEMU_I486
endif # ARCH_X86

View File

@ -3,7 +3,7 @@
# see the file kconfig-language.txt in the NuttX tools repository.
#
if ARCH_CHIP_QEMU
if ARCH_CHIP_QEMU_I486
comment "QEMU Configuration Options"
config QEMU_KEYPAD

View File

@ -29,9 +29,9 @@
/* Get customizations for each supported QEMU emulation */
#ifdef CONFIG_ARCH_CHIP_QEMU
#ifdef CONFIG_ARCH_CHIP_QEMU_I486
#else
# error "Unsupported STM32 chip"
# error "Unsupported I486 chip"
#endif
/* Include only the memory map. Other chip hardware files should then include this

View File

@ -1399,7 +1399,7 @@ config ARCH_BOARD_NUCLEO_L552ZE
config ARCH_BOARD_QEMU_I486
bool "Qemu i486 Mode"
depends on ARCH_X86 || ARCH_I486
depends on ARCH_CHIP_QEMU_I486
---help---
Port of NuttX to QEMU in i486 mode. This port will also run on real i486
hardware (Google the Bifferboard).

View File

@ -18,7 +18,7 @@ CONFIG_ARCH="x86"
CONFIG_ARCH_BOARD="qemu-i486"
CONFIG_ARCH_BOARD_QEMU_I486=y
CONFIG_ARCH_CHIP="qemu"
CONFIG_ARCH_CHIP_QEMU=y
CONFIG_ARCH_CHIP_QEMU_I486=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH_X86=y
CONFIG_ARCH_X86_M32=y

View File

@ -9,7 +9,7 @@ CONFIG_ARCH="x86"
CONFIG_ARCH_BOARD="qemu-i486"
CONFIG_ARCH_BOARD_QEMU_I486=y
CONFIG_ARCH_CHIP="qemu"
CONFIG_ARCH_CHIP_QEMU=y
CONFIG_ARCH_CHIP_QEMU_I486=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH_X86=y
CONFIG_ARCH_X86_M32=y