Move SRC_CUSTOM inside choice

Prior to commit 30bffa96 SRC_CUSTOM was inside the choice with
SRC_RELEASE and SRC_DEVEL making the 3 options mutually exclusive.
Restore this behaviour keeping the "fix" to keep kconfig happy.

Fixes #1151
Fixes: 30bffa96 ("don't nest choices")
Signed-off-by: Chris Packham <judge.packham@gmail.com>
This commit is contained in:
Chris Packham 2021-06-09 20:35:53 +12:00
parent 21c6818126
commit f17fba6080

View File

@ -68,6 +68,12 @@ config @@fork|@@_SRC_DEVEL
Default is the vendor repository at @@repository_url@@
#!end-if
config @@fork|@@_SRC_CUSTOM
bool "Custom location"
depends on EXPERIMENTAL
help
Custom directory or tarball.
endchoice
if @@fork|@@_SRC_DEVEL
@ -163,12 +169,6 @@ config @@fork|@@_DEVEL_BOOTSTRAP
endif
config @@fork|@@_SRC_CUSTOM
bool "Custom location"
depends on EXPERIMENTAL
help
Custom directory or tarball.
if @@fork|@@_SRC_CUSTOM
config @@fork|@@_CUSTOM_LOCATION