| Message ID | 20180313180006.5364-1-rafal.susz@gmail.com |
|---|---|
| State | Accepted |
| Commit | 54157c6c2d9fba5ad230294ae1c7dfc0032b1ede |
| Headers | show |
| Series | [1/2] package/linux: fix custom dts files handling | expand |
On úterý 13. března 2018 19:00:05 CET, Rafal Susz wrote: > Custom dts files are still conditionally copied based on non existing > boolean. So it is currently not possible to use custom dts file(s) at all. > > List of dts files is now iterated and files are copied into > dedicated kernel arch dir. > > Signed-off-by: Rafal Susz <rafal.susz@gmail.com> Tested-by: Jan Kundrát <jan.kundrat@cesnet.cz> Tested on a config which uses two out-of-tree DTS files. Without this patch, the current master fails. With kind regards, Jan
>>>>> "Rafal" == Rafal Susz <rafal.susz@gmail.com> writes: > Custom dts files are still conditionally copied based on non existing > boolean. So it is currently not possible to use custom dts file(s) at all. > List of dts files is now iterated and files are copied into dedicated kernel arch dir. > Signed-off-by: Rafal Susz <rafal.susz@gmail.com> Committed, thanks.
diff --git a/linux/linux.mk b/linux/linux.mk index e98b25cb72..cf1cae7cc0 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -370,8 +370,9 @@ endif # Compilation. We make sure the kernel gets rebuilt when the # configuration has changed. define LINUX_BUILD_CMDS - $(if $(BR2_LINUX_KERNEL_USE_CUSTOM_DTS), - cp -f $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)) $(KERNEL_ARCH_PATH)/boot/dts/) + @for dts in $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)); do \ + cp -f $${dts} $(KERNEL_ARCH_PATH)/boot/dts/ ; \ + done $(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_TARGET_NAME) @if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \ $(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) modules ; \ @@ -482,9 +483,9 @@ $(error No kernel configuration file specified, check your BR2_LINUX_KERNEL_CUST endif endif -ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT)$(KERNEL_DTS_NAME),y) +ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT):$(strip $(KERNEL_DTS_NAME)),y:) $(error No kernel device tree source specified, check your \ -BR2_LINUX_KERNEL_USE_INTREE_DTS / BR2_LINUX_KERNEL_USE_CUSTOM_DTS settings) +BR2_LINUX_KERNEL_INTREE_DTS_NAME / BR2_LINUX_KERNEL_CUSTOM_DTS_PATH settings) endif endif # BR_BUILDING
Custom dts files are still conditionally copied based on non existing boolean. So it is currently not possible to use custom dts file(s) at all. List of dts files is now iterated and files are copied into dedicated kernel arch dir. Signed-off-by: Rafal Susz <rafal.susz@gmail.com> --- linux/linux.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)