diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2021-02-26 09:03:26 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2021-02-26 12:13:57 +0100 |
| commit | e0f17777d6534b92128c18134c04b1e9af75ce9e (patch) | |
| tree | 86f08ad2fbdcd58018afe522a9c4b5f000f0335f /scripts | |
| parent | 71bf755bffd425605f8dc3ea4682201f820d69ee (diff) | |
| download | ptxdist-e0f17777d6534b92128c18134c04b1e9af75ce9e.tar.gz ptxdist-e0f17777d6534b92128c18134c04b1e9af75ce9e.tar.xz | |
ptxd_kconfig_update: add a check when looking for Kconfig
For legacy reasons, we allow Kconfig top-level in the BSP.
If the top layer has config Kconfig and a lower layer has a top-level
Kconfig then the wrong file (from the lower layer) is used.
Fix this by dropping support for the legacy location and fail with an error
is a file is found in that location.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/ptxd_lib_kconfig.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/lib/ptxd_lib_kconfig.sh b/scripts/lib/ptxd_lib_kconfig.sh index 2c51f0e2a..6ffdbf144 100644 --- a/scripts/lib/ptxd_lib_kconfig.sh +++ b/scripts/lib/ptxd_lib_kconfig.sh @@ -582,9 +582,11 @@ ptxd_kconfig_update() { esac case "${part}" in ptx) - if ! ptxd_in_path PTXDIST_PATH_LAYERS "Kconfig"; then - ptxd_in_path PTXDIST_PATH_LAYERS "config/Kconfig" + if ptxd_in_path PTXDIST_PATH_LAYERS "Kconfig"; then + ptxd_bailout "Legacy path '$(ptxd_print_path "${ptxd_reply}")' is no longer supported." \ + "It must be moved to '$(ptxd_print_path "${ptxd_reply%Kconfig}config/Kconfig")'." fi + ptxd_in_path PTXDIST_PATH_LAYERS "config/Kconfig" file_kconfig="${ptxd_reply}" ;; platform) |