diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-05-16 20:18:41 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-05-16 20:18:45 +0200 |
| commit | a8b834873d78015237089dca6bad11e456f5ccca (patch) | |
| tree | e0143831962775e84a8897517ae0010b4a543821 /scripts | |
| parent | 493ff3330e86472bcef25b7be10b4acbba227e71 (diff) | |
| download | ptxdist-a8b834873d78015237089dca6bad11e456f5ccca.tar.gz ptxdist-a8b834873d78015237089dca6bad11e456f5ccca.tar.xz | |
ptxd_lib_kconfig: fix boardsetup
This got broken in many ways with the layer rework.
- config/ was missing from the path to Kconfig
- it's a single file outside the BSP, similar to 'setup'
- the file may not exist when 'boardsetup' is called.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/ptxd_lib_kconfig.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/lib/ptxd_lib_kconfig.sh b/scripts/lib/ptxd_lib_kconfig.sh index 53428d301..7efb77a3f 100644 --- a/scripts/lib/ptxd_lib_kconfig.sh +++ b/scripts/lib/ptxd_lib_kconfig.sh @@ -525,7 +525,7 @@ ptxd_kconfig_update() { # nothing to do for PTXdist itself return fi - if [ "${config}" != dep -a "${part}" != user ]; then + if [ "${config}" != dep -a "${part}" != user -a "${part}" != board ]; then ( # call ptxd_kconfig_update() recursively after removing the last layer PTXDIST_LAYERS=( "${PTXDIST_LAYERS[@]:1}" ) @@ -558,7 +558,7 @@ ptxd_kconfig_update() { ;; esac case "${part}" in - user) + user|board) mode=single ;; collection) @@ -684,7 +684,7 @@ ptxd_kconfig() { file_dotconfig="${3}" ;; board) - ptxd_in_path PTXDIST_PATH_LAYERS "boardsetup/Kconfig" + ptxd_in_path PTXDIST_PATH_LAYERS "config/boardsetup/Kconfig" file_kconfig="${ptxd_reply}" file_dotconfig="${PTXDIST_BOARDSETUP}" ;; @@ -711,7 +711,7 @@ ptxd_kconfig() { fi ( - if [ "${part}" != user ]; then + if [ "${part}" != user -a "${part}" != board ]; then ptxd_normalize_config fi && ptxd_kconfig_update |