mirror of
https://github.com/u-boot/u-boot.git
synced 2025-04-16 09:54:35 +00:00
5f04493241
The commit mentioned in Fixes broke the
CONFIG_DEVICE_TREE_INCLUDES feature, with the result that any board
setting any non-empty value for that fails to build.
The parent of the mentioned commit refactoring a bit by introducing
the dtsi_include_list variable and changing cmd_dtc to loop over that
was fine.
However, the .dtsi files mentioned in CONFIG_DEVICE_TREE_INCLUDES are
not supposed to be generated via the build system. They are meant for
e.g. including a public key for verified boot (generated with the
key2dtsi script), or for injecting some stuff to the /config
node (say, a bootcmd or a load-environment setting or things like
that). The files can either live in-tree in a private branch or
completely outside, e.g. in some Yocto metadata.
But regardless, U-Boot's build system will never know anything about
them, so when the mentioned commit did
dtsi_include_list_deps = $(addprefix $(obj)/,$(subst $(quote),,$(dtsi_include_list)))
things broke, because if CONFIG_DEVICE_TREE_INCLUDES is for example
"/path/to/public_key.dtsi", this would add a dependency on
$(obj)//path/to/public_key.dtsi to each $(obj)/*.dtb target, yielding
make[3]: *** No rule to make target 'arch/arm/dts/imx6dl-aristainetos2c_7.dtb', needed by 'dtbs'. Stop.
To fix that while preserving the introduced
CONFIG_EFI_CAPSULE_ESL_FILE behaviour, disentangle
CONFIG_DEVICE_TREE_INCLUDES from dtsi_include_list from which
dtsi_include_list_deps is built, and instead just add the items
directly to the $(foreach) loop.
Fixes:
|
||
|---|---|---|
| .. | ||
| basic | ||
| coccinelle | ||
| dtc | ||
| kconfig | ||
| .gitignore | ||
| bin2c.c | ||
| binutils-version.sh | ||
| build-cb.sh | ||
| build-efi.sh | ||
| build_OID_registry | ||
| check-of.sh | ||
| checkpatch.pl | ||
| checkstack.pl | ||
| clang-version.sh | ||
| cleanpatch | ||
| coccicheck | ||
| config | ||
| const_structs.checkpatch | ||
| coreboot.sed | ||
| decodecode | ||
| documentation-file-ref-check | ||
| dtc-version.sh | ||
| env2string.awk | ||
| event_dump.py | ||
| gcc-stack-usage.sh | ||
| gcc-version.sh | ||
| gen_compile_commands.py | ||
| gen_ll_addressable_symbols.sh | ||
| get_default_envs.sh | ||
| get_maintainer.pl | ||
| Kbuild.include | ||
| Kconfig.include | ||
| kernel-doc | ||
| ld-version.sh | ||
| Lindent | ||
| mailmapper | ||
| make_pip.sh | ||
| Makefile | ||
| Makefile.autoconf | ||
| Makefile.build | ||
| Makefile.clean | ||
| Makefile.dts | ||
| Makefile.extrawarn | ||
| Makefile.host | ||
| Makefile.lib | ||
| Makefile.spl | ||
| mkmakefile | ||
| objdiff | ||
| of_allowlist.txt | ||
| pylint.base | ||
| setlocalversion | ||
| show-gnu-make | ||
| spdxcheck.py | ||
| spelling.txt | ||
| style.py | ||
| u-boot.supp | ||