* [Buildroot] [PATCH] linux.mk: Allow wildcards in BR2_LINUX_KERNEL_CUSTOM_DTS_PATH.
[not found] <2419e302d2201270df70f0f2033fff876168332b.camel@gmail.com>
@ 2024-01-30 21:05 ` gsmecher
2024-01-30 21:11 ` Alexander Sverdlin
0 siblings, 1 reply; 3+ messages in thread
From: gsmecher @ 2024-01-30 21:05 UTC (permalink / raw)
To: buildroot; +Cc: Graeme Smecher, alexander.sverdlin, thomas.petazzoni
From: Graeme Smecher <gsmecher@threespeedlogic.com>
There are a few config/ entries where wildcards are already present:
$ grep -rle 'BR2_LINUX_KERNEL_CUSTOM_DTS_PATH=.*\*' configs/
configs/octavo_osd32mp1_brk_defconfig
configs/octavo_osd32mp1_red_defconfig
...however, while the copy-in step of device tree compilation works
correctly, these wildcards are not converted to DTC build targets in the
kernel build. As a result, this configuration line alone is not enough
to generate DTCs. It should be.
This patch adds a $(wildcard) expansion step into generation of DTB
compilation targets (the LINUX_DTB_NAME variable). As a result,
wildcards behave correctly.
Signed-off-by: Graeme Smecher <gsmecher@threespeedlogic.com>
---
linux/linux.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/linux/linux.mk b/linux/linux.mk
index 1db5c6046d..80881597ad 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -195,7 +195,7 @@ LINUX_DTS_NAME += $(call qstrip,$(BR2_LINUX_KERNEL_INTREE_DTS_NAME))
# and .dtsi files in BR2_LINUX_KERNEL_CUSTOM_DTS_PATH. Both will be
# copied to arch/<arch>/boot/dts, but only the .dts files will
# actually be generated as .dtb.
-LINUX_DTS_NAME += $(basename $(filter %.dts,$(notdir $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)))))
+LINUX_DTS_NAME += $(basename $(filter %.dts,$(notdir $(wildcard $(call qstrip, $(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH))))))
LINUX_DTBS = $(addsuffix .dtb,$(LINUX_DTS_NAME))
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH] linux.mk: Allow wildcards in BR2_LINUX_KERNEL_CUSTOM_DTS_PATH.
2024-01-30 21:05 ` [Buildroot] [PATCH] linux.mk: Allow wildcards in BR2_LINUX_KERNEL_CUSTOM_DTS_PATH gsmecher
@ 2024-01-30 21:11 ` Alexander Sverdlin
2024-02-29 16:53 ` [Buildroot] [PATCH v2] " Graeme Smecher
0 siblings, 1 reply; 3+ messages in thread
From: Alexander Sverdlin @ 2024-01-30 21:11 UTC (permalink / raw)
To: gsmecher, buildroot; +Cc: thomas.petazzoni
Hi Graeme!
On Tue, 2024-01-30 at 13:05 -0800, gsmecher@threespeedlogic.com wrote:
> From: Graeme Smecher <gsmecher@threespeedlogic.com>
>
> There are a few config/ entries where wildcards are already present:
>
> $ grep -rle 'BR2_LINUX_KERNEL_CUSTOM_DTS_PATH=.*\*' configs/
> configs/octavo_osd32mp1_brk_defconfig
> configs/octavo_osd32mp1_red_defconfig
>
> ...however, while the copy-in step of device tree compilation works
> correctly, these wildcards are not converted to DTC build targets in the
> kernel build. As a result, this configuration line alone is not enough
> to generate DTCs. It should be.
>
> This patch adds a $(wildcard) expansion step into generation of DTB
> compilation targets (the LINUX_DTB_NAME variable). As a result,
> wildcards behave correctly.
>
> Signed-off-by: Graeme Smecher <gsmecher@threespeedlogic.com>
Makes sense to me (except a dot in the commit Subject),
Reviewed-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>
> ---
> linux/linux.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/linux/linux.mk b/linux/linux.mk
> index 1db5c6046d..80881597ad 100644
> --- a/linux/linux.mk
> +++ b/linux/linux.mk
> @@ -195,7 +195,7 @@ LINUX_DTS_NAME += $(call qstrip,$(BR2_LINUX_KERNEL_INTREE_DTS_NAME))
> # and .dtsi files in BR2_LINUX_KERNEL_CUSTOM_DTS_PATH. Both will be
> # copied to arch/<arch>/boot/dts, but only the .dts files will
> # actually be generated as .dtb.
> -LINUX_DTS_NAME += $(basename $(filter %.dts,$(notdir $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)))))
> +LINUX_DTS_NAME += $(basename $(filter %.dts,$(notdir $(wildcard $(call qstrip, $(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH))))))
>
> LINUX_DTBS = $(addsuffix .dtb,$(LINUX_DTS_NAME))
>
--
Alexander Sverdlin.
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH v2] linux.mk: Allow wildcards in BR2_LINUX_KERNEL_CUSTOM_DTS_PATH
2024-01-30 21:11 ` Alexander Sverdlin
@ 2024-02-29 16:53 ` Graeme Smecher
0 siblings, 0 replies; 3+ messages in thread
From: Graeme Smecher @ 2024-02-29 16:53 UTC (permalink / raw)
To: buildroot; +Cc: gsmecher, alexander.sverdlin, thomas.petazzoni
There are a few config/ entries where wildcards are already present:
$ grep -rle 'BR2_LINUX_KERNEL_CUSTOM_DTS_PATH=.*\*' configs/
configs/octavo_osd32mp1_brk_defconfig
configs/octavo_osd32mp1_red_defconfig
...however, while the copy-in step of device tree compilation works
correctly, these wildcards are not converted to DTC build targets in the
kernel build. As a result, this configuration line alone is not enough
to generate DTCs. It should be.
This patch adds a $(wildcard) expansion step into generation of DTB
compilation targets (the LINUX_DTB_NAME variable). As a result,
wildcards behave correctly.
Signed-off-by: Graeme Smecher <gsmecher@threespeedlogic.com>
Reviewed-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>
---
linux/linux.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/linux/linux.mk b/linux/linux.mk
index 1db5c6046d..80881597ad 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -195,7 +195,7 @@ LINUX_DTS_NAME += $(call qstrip,$(BR2_LINUX_KERNEL_INTREE_DTS_NAME))
# and .dtsi files in BR2_LINUX_KERNEL_CUSTOM_DTS_PATH. Both will be
# copied to arch/<arch>/boot/dts, but only the .dts files will
# actually be generated as .dtb.
-LINUX_DTS_NAME += $(basename $(filter %.dts,$(notdir $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)))))
+LINUX_DTS_NAME += $(basename $(filter %.dts,$(notdir $(wildcard $(call qstrip, $(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH))))))
LINUX_DTBS = $(addsuffix .dtb,$(LINUX_DTS_NAME))
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-02-29 16:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <2419e302d2201270df70f0f2033fff876168332b.camel@gmail.com>
2024-01-30 21:05 ` [Buildroot] [PATCH] linux.mk: Allow wildcards in BR2_LINUX_KERNEL_CUSTOM_DTS_PATH gsmecher
2024-01-30 21:11 ` Alexander Sverdlin
2024-02-29 16:53 ` [Buildroot] [PATCH v2] " Graeme Smecher
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.