* [Buildroot] [PATCH 1/1] package/linux: fix custom dts files handling
@ 2018-03-12 21:35 Rafal Susz
2018-03-13 11:32 ` Rafal Susz
0 siblings, 1 reply; 12+ messages in thread
From: Rafal Susz @ 2018-03-12 21:35 UTC (permalink / raw)
To: buildroot
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 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/linux/linux.mk b/linux/linux.mk
index e98b25cb72..a69cb3ee51 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -370,8 +370,8 @@ 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/)
+ $(foreach dts, $(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH),
+ cp -f $(call qstrip,$(dts)) $(KERNEL_ARCH_PATH)/boot/dts/)
$(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 ; \
--
2.16.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 1/1] package/linux: fix custom dts files handling
2018-03-12 21:35 [Buildroot] [PATCH 1/1] package/linux: fix custom dts files handling Rafal Susz
@ 2018-03-13 11:32 ` Rafal Susz
2018-03-13 11:49 ` Baruch Siach
2018-03-13 14:26 ` Rafal Susz
0 siblings, 2 replies; 12+ messages in thread
From: Rafal Susz @ 2018-03-13 11:32 UTC (permalink / raw)
To: buildroot
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 | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/linux/linux.mk b/linux/linux.mk
index e98b25cb72..12f0b03dbc 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 ; \
--
2.16.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 1/1] package/linux: fix custom dts files handling
2018-03-13 11:32 ` Rafal Susz
@ 2018-03-13 11:49 ` Baruch Siach
2018-03-13 12:31 ` Rafał Susz
2018-03-13 14:26 ` Rafal Susz
1 sibling, 1 reply; 12+ messages in thread
From: Baruch Siach @ 2018-03-13 11:49 UTC (permalink / raw)
To: buildroot
Hi Rafal,
On Tue, Mar 13, 2018 at 12:32:17PM +0100, 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>
> ---
> linux/linux.mk | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/linux/linux.mk b/linux/linux.mk
> index e98b25cb72..12f0b03dbc 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/)
Commit f142f23ecf9ee (package/linux: drop useless intermediate DTS booleans)
should have removed BR2_LINUX_KERNEL_USE_CUSTOM_DTS. There is another
reference to this symbol below.
> + @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 ; \
baruch
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 1/1] package/linux: fix custom dts files handling
2018-03-13 11:49 ` Baruch Siach
@ 2018-03-13 12:31 ` Rafał Susz
2018-03-13 12:45 ` Baruch Siach
0 siblings, 1 reply; 12+ messages in thread
From: Rafał Susz @ 2018-03-13 12:31 UTC (permalink / raw)
To: buildroot
Hello Baruch,
could you point where is "another reference" to this bool. I grepped br and
did not find any other files.
In general it was good idea to drop these booleans and basing on
user-entered strings take do some action or not.
best regards,
Rafal
2018-03-13 12:49 GMT+01:00 Baruch Siach <baruch@tkos.co.il>:
> Hi Rafal,
>
> On Tue, Mar 13, 2018 at 12:32:17PM +0100, 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>
> > ---
> > linux/linux.mk | 5 +++--
> > 1 file changed, 3 insertions(+), 2 deletions(-)
> >
> > diff --git a/linux/linux.mk b/linux/linux.mk
> > index e98b25cb72..12f0b03dbc 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/)
>
> Commit f142f23ecf9ee (package/linux: drop useless intermediate DTS
> booleans)
> should have removed BR2_LINUX_KERNEL_USE_CUSTOM_DTS. There is another
> reference to this symbol below.
>
> > + @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 ; \
>
> baruch
>
> --
> http://baruch.siach.name/blog/ ~. .~ Tk Open
> Systems
> =}------------------------------------------------ooO--U--
> Ooo------------{=
> - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20180313/ebb09479/attachment.html>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 1/1] package/linux: fix custom dts files handling
2018-03-13 12:31 ` Rafał Susz
@ 2018-03-13 12:45 ` Baruch Siach
0 siblings, 0 replies; 12+ messages in thread
From: Baruch Siach @ 2018-03-13 12:45 UTC (permalink / raw)
To: buildroot
Hi Rafa?,
On Tue, Mar 13, 2018 at 01:31:36PM +0100, Rafa? Susz wrote:
> could you point where is "another reference" to this bool. I grepped br and
> did not find any other files.
> In general it was good idea to drop these booleans and basing on
> user-entered strings take do some action or not.
Here is what I get for current git master:
$ git grep KERNEL_USE_CUSTOM_DTS origin/master
origin/master:configs/s6lx9_microboard_defconfig:BR2_LINUX_KERNEL_USE_CUSTOM_DTS=y
origin/master:linux/linux.mk: $(if $(BR2_LINUX_KERNEL_USE_CUSTOM_DTS),
origin/master:linux/linux.mk:BR2_LINUX_KERNEL_USE_INTREE_DTS / BR2_LINUX_KERNEL_USE_CUSTOM_DTS settings)
Your patch only removes the second reference. There a two more to be
converted/removed.
baruch
> 2018-03-13 12:49 GMT+01:00 Baruch Siach <baruch@tkos.co.il>:
> > On Tue, Mar 13, 2018 at 12:32:17PM +0100, 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>
> > > ---
> > > linux/linux.mk | 5 +++--
> > > 1 file changed, 3 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/linux/linux.mk b/linux/linux.mk
> > > index e98b25cb72..12f0b03dbc 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/)
> >
> > Commit f142f23ecf9ee (package/linux: drop useless intermediate DTS
> > booleans)
> > should have removed BR2_LINUX_KERNEL_USE_CUSTOM_DTS. There is another
> > reference to this symbol below.
> >
> > > + @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 ; \
> >
> > baruch
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 1/1] package/linux: fix custom dts files handling
2018-03-13 11:32 ` Rafal Susz
2018-03-13 11:49 ` Baruch Siach
@ 2018-03-13 14:26 ` Rafal Susz
2018-03-13 17:21 ` Yann E. MORIN
2018-03-13 18:00 ` [Buildroot] [PATCH 1/2] " Rafal Susz
1 sibling, 2 replies; 12+ messages in thread
From: Rafal Susz @ 2018-03-13 14:26 UTC (permalink / raw)
To: buildroot
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>
---
configs/s6lx9_microboard_defconfig | 1 -
linux/linux.mk | 9 +++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/configs/s6lx9_microboard_defconfig b/configs/s6lx9_microboard_defconfig
index f77c80ba87..97b2d3fe79 100644
--- a/configs/s6lx9_microboard_defconfig
+++ b/configs/s6lx9_microboard_defconfig
@@ -10,5 +10,4 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.7"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/avnet/s6lx9_microboard/lx9_mmu_defconfig"
-BR2_LINUX_KERNEL_USE_CUSTOM_DTS=y
BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/avnet/s6lx9_microboard/lx9_mmu.dts"
diff --git a/linux/linux.mk b/linux/linux.mk
index e98b25cb72..94bfb9661a 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 ($(strip $(BR2_LINUX_KERNEL_DTS_SUPPORT)$(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
--
2.16.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 1/1] package/linux: fix custom dts files handling
2018-03-13 14:26 ` Rafal Susz
@ 2018-03-13 17:21 ` Yann E. MORIN
2018-03-13 18:00 ` [Buildroot] [PATCH 1/2] " Rafal Susz
1 sibling, 0 replies; 12+ messages in thread
From: Yann E. MORIN @ 2018-03-13 17:21 UTC (permalink / raw)
To: buildroot
Rafal, All,
On 2018-03-13 15:26 +0100, Rafal Susz spake thusly:
> 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>
> ---
> configs/s6lx9_microboard_defconfig | 1 -
> linux/linux.mk | 9 +++++----
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/configs/s6lx9_microboard_defconfig b/configs/s6lx9_microboard_defconfig
> index f77c80ba87..97b2d3fe79 100644
> --- a/configs/s6lx9_microboard_defconfig
> +++ b/configs/s6lx9_microboard_defconfig
> @@ -10,5 +10,4 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y
> BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.7"
> BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
> BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/avnet/s6lx9_microboard/lx9_mmu_defconfig"
> -BR2_LINUX_KERNEL_USE_CUSTOM_DTS=y
> BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/avnet/s6lx9_microboard/lx9_mmu.dts"
I would prefer if it were two patches:
- one to fix linux.mk
- another to fix the defconfig
> diff --git a/linux/linux.mk b/linux/linux.mk
> index e98b25cb72..94bfb9661a 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 ($(strip $(BR2_LINUX_KERNEL_DTS_SUPPORT)$(KERNEL_DTS_NAME)),y)
Only $(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH) should be stripped, while the
boolean $(BR2_LINUX_KERNEL_DTS_SUPPORT) needs not. Also, I'd prefer if
there was a separator between the boolean and the free-form string:
ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT):$(strip $(KERNEL_DTS_NAME)),y:)
Regards,
Yann E. MORIN.
> endif
>
> endif # BR_BUILDING
> --
> 2.16.1
>
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 1/2] package/linux: fix custom dts files handling
2018-03-13 14:26 ` Rafal Susz
2018-03-13 17:21 ` Yann E. MORIN
@ 2018-03-13 18:00 ` Rafal Susz
2018-03-13 18:00 ` [Buildroot] [PATCH 2/2] configs/s6lx9_microboard_defconfig: purge custom dts boolean Rafal Susz
` (2 more replies)
1 sibling, 3 replies; 12+ messages in thread
From: Rafal Susz @ 2018-03-13 18:00 UTC (permalink / raw)
To: buildroot
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(-)
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
--
2.16.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 2/2] configs/s6lx9_microboard_defconfig: purge custom dts boolean
2018-03-13 18:00 ` [Buildroot] [PATCH 1/2] " Rafal Susz
@ 2018-03-13 18:00 ` Rafal Susz
2018-03-31 20:59 ` Peter Korsgaard
2018-03-14 15:20 ` [Buildroot] [PATCH 1/2] package/linux: fix custom dts files handling Jan Kundrát
2018-03-31 20:59 ` Peter Korsgaard
2 siblings, 1 reply; 12+ messages in thread
From: Rafal Susz @ 2018-03-13 18:00 UTC (permalink / raw)
To: buildroot
Since custom dts files are unconditionally handled *KERNEL_USE_CUSTOM_DTS
is no longer available/needed.
Signed-off-by: Rafal Susz <rafal.susz@gmail.com>
---
configs/s6lx9_microboard_defconfig | 1 -
1 file changed, 1 deletion(-)
diff --git a/configs/s6lx9_microboard_defconfig b/configs/s6lx9_microboard_defconfig
index f77c80ba87..97b2d3fe79 100644
--- a/configs/s6lx9_microboard_defconfig
+++ b/configs/s6lx9_microboard_defconfig
@@ -10,5 +10,4 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.7"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/avnet/s6lx9_microboard/lx9_mmu_defconfig"
-BR2_LINUX_KERNEL_USE_CUSTOM_DTS=y
BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/avnet/s6lx9_microboard/lx9_mmu.dts"
--
2.16.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 1/2] package/linux: fix custom dts files handling
2018-03-13 18:00 ` [Buildroot] [PATCH 1/2] " Rafal Susz
2018-03-13 18:00 ` [Buildroot] [PATCH 2/2] configs/s6lx9_microboard_defconfig: purge custom dts boolean Rafal Susz
@ 2018-03-14 15:20 ` Jan Kundrát
2018-03-31 20:59 ` Peter Korsgaard
2 siblings, 0 replies; 12+ messages in thread
From: Jan Kundrát @ 2018-03-14 15:20 UTC (permalink / raw)
To: buildroot
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
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 1/2] package/linux: fix custom dts files handling
2018-03-13 18:00 ` [Buildroot] [PATCH 1/2] " Rafal Susz
2018-03-13 18:00 ` [Buildroot] [PATCH 2/2] configs/s6lx9_microboard_defconfig: purge custom dts boolean Rafal Susz
2018-03-14 15:20 ` [Buildroot] [PATCH 1/2] package/linux: fix custom dts files handling Jan Kundrát
@ 2018-03-31 20:59 ` Peter Korsgaard
2 siblings, 0 replies; 12+ messages in thread
From: Peter Korsgaard @ 2018-03-31 20:59 UTC (permalink / raw)
To: buildroot
>>>>> "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.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 2/2] configs/s6lx9_microboard_defconfig: purge custom dts boolean
2018-03-13 18:00 ` [Buildroot] [PATCH 2/2] configs/s6lx9_microboard_defconfig: purge custom dts boolean Rafal Susz
@ 2018-03-31 20:59 ` Peter Korsgaard
0 siblings, 0 replies; 12+ messages in thread
From: Peter Korsgaard @ 2018-03-31 20:59 UTC (permalink / raw)
To: buildroot
>>>>> "Rafal" == Rafal Susz <rafal.susz@gmail.com> writes:
> Since custom dts files are unconditionally handled *KERNEL_USE_CUSTOM_DTS
> is no longer available/needed.
> Signed-off-by: Rafal Susz <rafal.susz@gmail.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2018-03-31 20:59 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-12 21:35 [Buildroot] [PATCH 1/1] package/linux: fix custom dts files handling Rafal Susz
2018-03-13 11:32 ` Rafal Susz
2018-03-13 11:49 ` Baruch Siach
2018-03-13 12:31 ` Rafał Susz
2018-03-13 12:45 ` Baruch Siach
2018-03-13 14:26 ` Rafal Susz
2018-03-13 17:21 ` Yann E. MORIN
2018-03-13 18:00 ` [Buildroot] [PATCH 1/2] " Rafal Susz
2018-03-13 18:00 ` [Buildroot] [PATCH 2/2] configs/s6lx9_microboard_defconfig: purge custom dts boolean Rafal Susz
2018-03-31 20:59 ` Peter Korsgaard
2018-03-14 15:20 ` [Buildroot] [PATCH 1/2] package/linux: fix custom dts files handling Jan Kundrát
2018-03-31 20:59 ` Peter Korsgaard
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.