sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arch/x86: Fix the Kconfig warning

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arch/x86/Kconfig
View File

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

2
arch/x86/src/qemu/Kconfig
View File

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

4
arch/x86/src/qemu/chip.h
View File

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

2
boards/Kconfig
View File

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

2
boards/x86/qemu/qemu-i486/configs/nsh/defconfig
View File

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

2
boards/x86/qemu/qemu-i486/configs/ostest/defconfig
View File

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