Thanks, applied as 2fafa7c4308db8d1e79dc3b5d2c9cb3400a16ff8. Michael
[sent from post-receive hook] On Fri, 10 Dec 2021 14:07:26 +0100, Michael Riesch <[email protected]> wrote: > Make ptxd_make_dtb more general and provide suitable wrappers to > support the generation of device tree overlays. > > Signed-off-by: Michael Riesch <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/rules/post/ptxd_make_world_dtbo.make > b/rules/post/ptxd_make_world_dtbo.make > new file mode 100644 > index 000000000000..61babc653660 > --- /dev/null > +++ b/rules/post/ptxd_make_world_dtbo.make > @@ -0,0 +1,21 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2020 by Michael Tretter <[email protected]> > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +world/dtbo/env = \ > + $(call world/env, $(1)) \ > + pkg_dtso_path="$($(1)_DTSO_PATH)" \ > + pkg_dtso="$($(1)_DTSO)" \ > + pkg_dtbo_dir="$($(1)_DTBO_DIR)" \ > + pkg_kernel_src="$($(1)_KERNEL_DIR)" \ > + pkg_arch="$(GENERIC_KERNEL_ARCH)" > + > +world/dtbo = \ > + $(call world/dtbo/env,$(strip $(1))) \ > + ptxd_make_world_dtbo > + > +# vim: syntax=make > diff --git a/scripts/lib/ptxd_make_world_dtb.sh > b/scripts/lib/ptxd_make_world_dtb.sh > index f5e796b9d13d..f78d2f885114 100644 > --- a/scripts/lib/ptxd_make_world_dtb.sh > +++ b/scripts/lib/ptxd_make_world_dtb.sh > @@ -7,24 +7,22 @@ > # > > ptxd_make_dtb() { > - local dtc dts tmp_dts dtb deps tmp_deps > + local dtc dts tmp_dts dtb dtb_extra_args dtb_kernel_dir deps tmp_deps > > - if [[ "${dts_dts}" =~ ^/.* ]]; then > - ptxd_bailout "'${dts_dts}' must not be an absolute path!" \ > - "Use <PKG>_DTS_PATH to specify the search path." > - fi > + dts="${dtb_source}" > + dtb="${dtb_target}" > > - if ! ptxd_in_path pkg_dts_path "${dts_dts}"; then > - ptxd_bailout "Device-tree '${dts_dts}' not found in '${pkg_dts_path}'." > - fi > - dts="${ptxd_reply}" > - dtb="${dtb_dir}/$(basename ${dts/%.dts/.dtb})" > + dtb_kernel_dir="${pkg_kernel_src:-${pkg_dir}}" > > - dtc="${pkg_build_dir}/scripts/dtc/dtc" > + dtc="${dtb_kernel_dir}/scripts/dtc/dtc" > if [ ! -x "${dtc}" ]; then > dtc=dtc > fi > > + if [ "$(ptxd_get_ptxconf PTXCONF_KERNEL_DTS_SUPPORT_OVERLAYS)" == "y" ]; > then > + dtb_extra_args="-@" > + fi > + > tmp_dts="${ptx_state_dir}/${pkg_label}.$(basename "${dts}").tmp" > > deps="${ptx_state_dir}/${pkg_label}.$(basename "${dts}").deps" > @@ -39,16 +37,16 @@ ptxd_make_dtb() { > -Wp,-MT,${dtb_deps_target} \ > -nostdinc \ > -I"$(dirname "${dts}")" \ > - -I${pkg_dir}/arch/${pkg_arch}/boot/dts \ > - -I${pkg_dir}/arch/${pkg_arch}/boot/dts/include \ > - -I${pkg_dir}/scripts/dtc/include-prefixes \ > - -I${pkg_dir}/drivers/of/testcase-data \ > - -I${pkg_dir}/include \ > + -I${dtb_kernel_dir}/arch/${pkg_arch}/boot/dts \ > + -I${dtb_kernel_dir}/arch/${pkg_arch}/boot/dts/include \ > + -I${dtb_kernel_dir}/scripts/dtc/include-prefixes \ > + -I${dtb_kernel_dir}/drivers/of/testcase-data \ > + -I${dtb_kernel_dir}/include \ > -undef -D__DTS__ -x assembler-with-cpp \ > -o ${tmp_dts} \ > ${dts} && > > - sed -e "\;^ ${pkg_dir}[^ ]*;d" \ > + sed -e "\;^ ${dtb_kernel_dir}[^ ]*;d" \ > -e 's;^ \([^ \]*\); $(wildcard \1);' "${tmp_deps}" > "${deps}" && > # empty line in case all dependencies were removed > echo >> "${deps}" && > @@ -57,9 +55,9 @@ ptxd_make_dtb() { > echo "DTC $(ptxd_print_path "${dtb}")" && > ptxd_eval \ > "${dtc}" \ > - $(ptxd_get_ptxconf PTXCONF_DTC_EXTRA_ARGS) \ > + "${dtb_extra_args}" \ > -i "$(dirname "${dts}")" \ > - -i "${pkg_dir}/arch/${pkg_arch}/boot/dts" \ > + -i "${dtb_kernel_dir}/arch/${pkg_arch}/boot/dts" \ > -d "${tmp_deps}" \ > -I dts -O dtb -b 0 \ > -o "${dtb}" "${tmp_dts}" && > @@ -81,17 +79,54 @@ ptxd_make_dtb() { > export -f ptxd_make_dtb > > > +ptxd_make_world_dtbo() { > + local dtb_deps_target dtb_source dtb_target > + > + ptxd_make_world_init || break > + > + dtb_deps_target="${ptx_state_dir}/${pkg_stamp}" > + > + echo -e "\nBuilding device tree overlays..." > + > + for overlay in ${pkg_dtso}; do > + if [[ "${overlay}" =~ ^/.* ]]; then > + ptxd_bailout "'${overlay}' must not be an absolute path!" \ > + "Use <PKG>_DTSO_PATH to specify the search path." > + fi > + > + if ! ptxd_in_path pkg_dtso_path "${overlay}"; then > + ptxd_bailout "Overlay '${overlay}' not found in '${pkg_dtso_path}'." > + fi > + dtb_source="${ptxd_reply}" > + dtb_target="${pkg_pkg_dir}/${pkg_dtbo_dir}/$(basename > ${overlay/%.dts*/.dtbo})" > + > + ptxd_make_dtb || break > + done > +} > +export -f ptxd_make_world_dtbo > + > + > ptxd_make_world_dtb() { > - local dtb_deps_target dtb_dir > + local dtb_deps_target dtb_source dtb_target > > ptxd_make_world_init || break > > dtb_deps_target="${ptx_state_dir}/${pkg_stamp}" > - dtb_dir="${pkg_pkg_dir}/boot" > > - echo -e "\nBuilding Device trees..." > + echo -e "\nBuilding device trees..." > > for dts_dts in ${pkg_dts}; do > + if [[ "${dts_dts}" =~ ^/.* ]]; then > + ptxd_bailout "'${dts_dts}' must not be an absolute path!" \ > + "Use <PKG>_DTS_PATH to specify the search path." > + fi > + > + if ! ptxd_in_path pkg_dts_path "${dts_dts}"; then > + ptxd_bailout "Device tree '${dts_dts}' not found in > '${pkg_dts_path}'." > + fi > + dtb_source="${ptxd_reply}" > + dtb_target="${pkg_pkg_dir}/boot/$(basename ${dts_dts/%.dts/.dtb})" > + > ptxd_make_dtb || break > done > } _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
