diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2021-11-26 09:42:43 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2021-11-26 19:21:29 +0100 |
| commit | 3a9e9dfbd1e766fc32df4493a6898c58db367f6f (patch) | |
| tree | 894665aefae87d92ba0c586ce2cc3626eb658e1e | |
| parent | e8bc55fdb52f0152e4ce1fe55e3fe35820a090e6 (diff) | |
| download | ptxdist-3a9e9dfbd1e766fc32df4493a6898c58db367f6f.tar.gz ptxdist-3a9e9dfbd1e766fc32df4493a6898c58db367f6f.tar.xz | |
kernel: allow subdirectories in PTXCONF_KERNEL_DTS
For arm64 the device trees in the kernel are located in vendor
subdirectories. Adding all of those to PTXCONF_KERNEL_DTS_PATH would be
awkward. So relax the requirement for PTXCONF_KERNEL_DTS to allow
subdirectories but no absolute paths.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/kernel.make | 6 | ||||
| -rw-r--r-- | scripts/lib/ptxd_make_world_dtb.sh | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/rules/kernel.make b/rules/kernel.make index 9caff6779..3844b8a22 100644 --- a/rules/kernel.make +++ b/rules/kernel.make @@ -39,9 +39,9 @@ KERNEL_BUILD_OOT := KEEP $(call world/dts-cfghash-file, KERNEL) # in case we migrate some old syntax -ifneq ($(KERNEL_DTS),$(notdir $(KERNEL_DTS))) -$(call ptx/error, the device trees in PTXCONF_KERNEL_DTS must be specified without) -$(call ptx/error, directory. Use PTXCONF_KERNEL_DTS_PATH to provide a list of direcories) +ifneq ($(filter /%,$(KERNEL_DTS)),) +$(call ptx/error, the device trees in PTXCONF_KERNEL_DTS must be specified without an) +$(call ptx/error, absolute path. Use PTXCONF_KERNEL_DTS_PATH to provide a list of direcories) $(call ptx/error, that will be searched.) endif diff --git a/scripts/lib/ptxd_make_world_dtb.sh b/scripts/lib/ptxd_make_world_dtb.sh index 7b7de6e0f..f5e796b9d 100644 --- a/scripts/lib/ptxd_make_world_dtb.sh +++ b/scripts/lib/ptxd_make_world_dtb.sh @@ -9,8 +9,8 @@ ptxd_make_dtb() { local dtc dts tmp_dts dtb deps tmp_deps - if [ "$(basename "${dts_dts}")" != "${dts_dts}" ]; then - ptxd_bailout "'${dts_dts}' must not include directories!" \ + if [[ "${dts_dts}" =~ ^/.* ]]; then + ptxd_bailout "'${dts_dts}' must not be an absolute path!" \ "Use <PKG>_DTS_PATH to specify the search path." fi @@ -18,7 +18,7 @@ ptxd_make_dtb() { ptxd_bailout "Device-tree '${dts_dts}' not found in '${pkg_dts_path}'." fi dts="${ptxd_reply}" - dtb="${dtb_dir}/${dts_dts/%.dts/.dtb}" + dtb="${dtb_dir}/$(basename ${dts/%.dts/.dtb})" dtc="${pkg_build_dir}/scripts/dtc/dtc" if [ ! -x "${dtc}" ]; then |