Skip to content

[kconfig] choice语法块中不可再包含if语法块 #1580

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 17, 2023
Merged

[kconfig] choice语法块中不可再包含if语法块 #1580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
591c04a
[kconfig] choice语法块中不可再包含if语法块
mysterywolf Mar 16, 2023
5fcf17a
Update Kconfig
mysterywolf Mar 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions iot/netutils/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,6 @@ if PKG_USING_NETUTILS
prompt "Version"
help
Select the netutils version
default PKG_USING_NETUTILS_LATEST_VERSION if RT_VER_NUM = 0x40100
default PKG_USING_NETUTILS_V132

config PKG_USING_NETUTILS_LATEST_VERSION
bool "latest"
Expand Down
20 changes: 9 additions & 11 deletions iot/pahomqtt/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,19 +61,17 @@ if PKG_USING_PAHOMQTT

### Notice, the posix/libc had changed the structure of folder since RT-Thread V4.1.0.
### if the pahomqtt will release new tag, should add it here.
if RT_VER_NUM >= 0x40100
config PKG_USING_PAHOMQTT_LATEST
bool "latest"
endif
config PKG_USING_PAHOMQTT_LATEST
bool "latest"
depends on RT_VER_NUM >= 0x40100

if RT_VER_NUM < 0x40100
config PKG_USING_PAHOMQTT_V110
bool "v1.1.0"

config PKG_USING_PAHOMQTT_V100
bool "v1.0.0"
endif
config PKG_USING_PAHOMQTT_V110
bool "v1.1.0"
depends on RT_VER_NUM < 0x40100

config PKG_USING_PAHOMQTT_V100
bool "v1.0.0"
depends on RT_VER_NUM < 0x40100
endchoice

config PKG_PAHOMQTT_VER
Expand Down
35 changes: 19 additions & 16 deletions peripherals/kendryte-sdk/K210-SDK/kendryte-sdk/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,28 +15,31 @@ if PKG_USING_KENDRYTE_SDK
help
Select the package version

if RT_VER_NUM < 0x40004
config PKG_USING_KENDRYTE_SDK_V052
bool "v0.5.2"
config PKG_USING_KENDRYTE_SDK_LATEST_VERSION
bool "latest"

config PKG_USING_KENDRYTE_SDK_V053
bool "v0.5.3"
config PKG_USING_KENDRYTE_SDK_V057
bool "v0.5.7"

config PKG_USING_KENDRYTE_SDK_V054
bool "v0.5.4"
config PKG_USING_KENDRYTE_SDK_V056
bool "v0.5.6"
depends on RT_VER_NUM < 0x40004

config PKG_USING_KENDRYTE_SDK_V055
bool "v0.5.5"
config PKG_USING_KENDRYTE_SDK_V055
bool "v0.5.5"
depends on RT_VER_NUM < 0x40004

config PKG_USING_KENDRYTE_SDK_V056
bool "v0.5.6"
endif
config PKG_USING_KENDRYTE_SDK_V054
bool "v0.5.4"
depends on RT_VER_NUM < 0x40004

config PKG_USING_KENDRYTE_SDK_V057
bool "v0.5.7"
config PKG_USING_KENDRYTE_SDK_V053
bool "v0.5.3"
depends on RT_VER_NUM < 0x40004

config PKG_USING_KENDRYTE_SDK_LATEST_VERSION
bool "latest"
config PKG_USING_KENDRYTE_SDK_V052
bool "v0.5.2"
depends on RT_VER_NUM < 0x40004
endchoice

config PKG_KENDRYTE_SDK_VER
Expand Down
7 changes: 3 additions & 4 deletions peripherals/rc522/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,9 @@ if PKG_USING_RC522
config PKG_USING_RC522_V10410
bool "v1.4.10"

if RT_VER_NUM < 0x40101
config PKG_USING_RC522_V10405
bool "v1.4.5"
endif
config PKG_USING_RC522_V10405
bool "v1.4.5"
depends on RT_VER_NUM < 0x40101

config PKG_USING_RC522_LATEST_VERSION
bool "latest"
Expand Down
24 changes: 12 additions & 12 deletions peripherals/sensors/aht10/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,21 +41,21 @@ if PKG_USING_AHT10
help
Select the package version

if RT_VER_NUM >= 0x50000
config PKG_USING_AHT10_LATEST_VERSION
bool "latest"
endif
config PKG_USING_AHT10_LATEST_VERSION
bool "latest"
depends on RT_VER_NUM >= 0x50000

if RT_VER_NUM < 0x50000
config PKG_USING_AHT10_V210
bool "v2.1.0"
config PKG_USING_AHT10_V210
bool "v2.1.0"
depends on RT_VER_NUM < 0x50000

config PKG_USING_AHT10_V200
bool "v2.0.0"
config PKG_USING_AHT10_V200
bool "v2.0.0"
depends on RT_VER_NUM < 0x50000

config PKG_USING_AHT10_V100
bool "v1.0.0"
endif
config PKG_USING_AHT10_V100
bool "v1.0.0"
depends on RT_VER_NUM < 0x50000

endchoice

Expand Down
8 changes: 3 additions & 5 deletions peripherals/sensors/ap3216c/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,15 @@ if PKG_USING_AP3216C
help
Select the package version

if RT_VER_NUM >= 0x50000
config PKG_USING_AP3216C_LATEST_VERSION
bool "latest"
endif
config PKG_USING_AP3216C_LATEST_VERSION
bool "latest"
depends on RT_VER_NUM >= 0x50000

config PKG_USING_AP3216C_V200
bool "v2.0.0"

config PKG_USING_AP3216C_V100
bool "v1.0.0"

endchoice

config PKG_AP3216C_VER
Expand Down
25 changes: 12 additions & 13 deletions peripherals/sensors/mpu6xxx/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,21 @@ if PKG_USING_MPU6XXX
help
Select the package version

if RT_VER_NUM >= 0x50000
config PKG_USING_MPU6XXX_LATEST_VERSION
bool "latest"
endif
config PKG_USING_MPU6XXX_LATEST_VERSION
bool "latest"
depends on RT_VER_NUM >= 0x50000

if RT_VER_NUM < 0x50000
config PKG_USING_MPU6XXX_V111
bool "v1.1.1"
config PKG_USING_MPU6XXX_V111
bool "v1.1.1"
depends on RT_VER_NUM < 0x50000

config PKG_USING_MPU6XXX_V110
bool "v1.1.0"

config PKG_USING_MPU6XXX_V100
bool "v1.0.0"
endif
config PKG_USING_MPU6XXX_V110
bool "v1.1.0"
depends on RT_VER_NUM < 0x50000

config PKG_USING_MPU6XXX_V100
bool "v1.0.0"
depends on RT_VER_NUM < 0x50000
endchoice

config PKG_MPU6XXX_VER
Expand Down