| Message ID | 20180226174721.5785-1-yann.morin.1998@free.fr |
|---|---|
| State | Accepted |
| Commit | f142f23ecf9ee69326fd6a4387133443513afdd2 |
| Headers | show |
| Series | [RFC,next] package/linux: drop useless intermediate DTS booleans | expand |
Hello, On Mon, 26 Feb 2018 18:47:21 +0100, Yann E. MORIN wrote: > Just use whatever the user specified in the list. An empty list means no > DTS was specified. > > No need to add legacy option, as the behaviour does not change. > > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> > Cc: Simon van der Veldt <simon.vanderveldt@gmail.com> > Cc: Arnout Vandecappelle <arnout@mind.be> > Cc: Peter Korsgaard <peter@korsgaard.com> > Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com> > > --- > This is an RFC patch, totally untested, as an attempt to fix the fallout > of allowing both in-tree and out-of-tree DTS files at the same time. > It's here just to kickstart a discussion, especially about the help > texts... ;-) Yes, I agree with this direction. When I saw the patch allowing to generate both in-tree and out of tree DTS, I also thought "but why do we keep those booleans". Next time I should not only "think" but also write it in an e-mail as a reply to the patch :-) Thomas
All, > -----Original Message----- > From: buildroot [mailto:buildroot-bounces@busybox.net] On Behalf Of Yann > E. MORIN > Sent: Monday, February 26, 2018 10:47 AM > To: buildroot@buildroot.org > Cc: Yann E. MORIN <yann.morin.1998@free.fr>; Thomas Petazzoni > <thomas.petazzoni@bootlin.com>; Simon van der Veldt > <simon.vanderveldt@gmail.com> > Subject: [Buildroot] [PATCH RFC next] package/linux: drop useless > intermediate DTS booleans > > Just use whatever the user specified in the list. An empty list means no DTS > was specified. > > No need to add legacy option, as the behaviour does not change. > > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> > Cc: Simon van der Veldt <simon.vanderveldt@gmail.com> > Cc: Arnout Vandecappelle <arnout@mind.be> > Cc: Peter Korsgaard <peter@korsgaard.com> > Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com> > > --- > This is an RFC patch, totally untested, as an attempt to fix the fallout of > allowing both in-tree and out-of-tree DTS files at the same time. > It's here just to kickstart a discussion, especially about the help texts... ;-) > > --- > linux/Config.in | 28 ++++++---------------------- linux/linux.mk | 4 ---- > 2 files changed, 6 insertions(+), 26 deletions(-) > > diff --git a/linux/Config.in b/linux/Config.in index 80e85b9e8b..15394eb810 > 100644 > --- a/linux/Config.in > +++ b/linux/Config.in > @@ -363,35 +363,19 @@ config BR2_LINUX_KERNEL_DTB_IS_SELF_BUILT > config BR2_LINUX_KERNEL_APPENDED_DTB > bool > > -config BR2_LINUX_KERNEL_USE_INTREE_DTS > - bool "Use a device tree present in the kernel" > - help > - Use a device tree source distributed with > - the kernel sources. The dts files are located > - in the arch/<arch>/boot/dts folder. > - > config BR2_LINUX_KERNEL_INTREE_DTS_NAME > - string "Device Tree Source file names" > - depends on BR2_LINUX_KERNEL_USE_INTREE_DTS > + string "In-tree Device Tree Source file names" > help > - Name of the device tree source file, without > + Name of in-tree device tree source file, without > the trailing .dts. You can provide a list of > dts files to build, separated by spaces. > > -config BR2_LINUX_KERNEL_USE_CUSTOM_DTS > - bool "Use a custom device tree file" > - help > - Use a custom device tree file, i.e, a device > - tree file that does not belong to the kernel > - source tree. > - > config BR2_LINUX_KERNEL_CUSTOM_DTS_PATH > - string "Device Tree Source file paths" > - depends on BR2_LINUX_KERNEL_USE_CUSTOM_DTS > + string "Out-of-tree Device Tree Source file paths" > help > - Path to the device tree source files. You can > - provide a list of dts paths to copy and build, > - separated by spaces. > + Path to to out-of-tree device tree source files. > + You can provide a list of dts paths to copy and > + build, separated by spaces. > > endif > > diff --git a/linux/linux.mk b/linux/linux.mk index ab940e7305..c59050a194 > 100644 > --- a/linux/linux.mk > +++ b/linux/linux.mk > @@ -118,17 +118,13 @@ endif > # going to be installed in the target filesystem. > LINUX_VERSION_PROBED = `$(MAKE) $(LINUX_MAKE_FLAGS) -C > $(LINUX_DIR) --no-print-directory -s kernelrelease 2>/dev/null` > > -ifeq ($(BR2_LINUX_KERNEL_USE_INTREE_DTS),y) > KERNEL_DTS_NAME += $(call > qstrip,$(BR2_LINUX_KERNEL_INTREE_DTS_NAME)) > -endif > > -ifeq ($(BR2_LINUX_KERNEL_USE_CUSTOM_DTS),y) > # We keep only the .dts files, so that the user can specify both .dts # 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. > KERNEL_DTS_NAME += $(basename $(filter %.dts,$(notdir $(call > qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH))))) > -endif > > KERNEL_DTBS = $(addsuffix .dtb,$(KERNEL_DTS_NAME)) > > -- > 2.14.1 > This is a fix for many current broken defconfigs on master resulting in: linux/linux.mk:490: *** No kernel device tree source specified, check your BR2_LINUX_KERNEL_USE_INTREE_DTS / BR2_LINUX_KERNEL_USE_CUSTOM_DTS settings. Stop. Makefile:79: recipe for target '_all' failed make: *** [_all] Error 2 Tested-by: Joshua Henderson <joshua.henderson@microchip.com> Josh
>>>>> <Joshua.Henderson@microchip.com> writes: Hi, > This is a fix for many current broken defconfigs on master resulting in: > linux/linux.mk:490: *** No kernel device tree source specified, > check your BR2_LINUX_KERNEL_USE_INTREE_DTS / > BR2_LINUX_KERNEL_USE_CUSTOM_DTS settings. Stop. > Makefile:79: recipe for target '_all' failed > make: *** [_all] Error 2 > Tested-by: Joshua Henderson <joshua.henderson@microchip.com> Committed, thanks both.
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes: > Just use whatever the user specified in the list. An empty list means no > DTS was specified. > No need to add legacy option, as the behaviour does not change. > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> > Cc: Simon van der Veldt <simon.vanderveldt@gmail.com> > Cc: Arnout Vandecappelle <arnout@mind.be> > Cc: Peter Korsgaard <peter@korsgaard.com> > Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Committed to 2018.02.x, thanks.
diff --git a/linux/Config.in b/linux/Config.in index 80e85b9e8b..15394eb810 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -363,35 +363,19 @@ config BR2_LINUX_KERNEL_DTB_IS_SELF_BUILT config BR2_LINUX_KERNEL_APPENDED_DTB bool -config BR2_LINUX_KERNEL_USE_INTREE_DTS - bool "Use a device tree present in the kernel" - help - Use a device tree source distributed with - the kernel sources. The dts files are located - in the arch/<arch>/boot/dts folder. - config BR2_LINUX_KERNEL_INTREE_DTS_NAME - string "Device Tree Source file names" - depends on BR2_LINUX_KERNEL_USE_INTREE_DTS + string "In-tree Device Tree Source file names" help - Name of the device tree source file, without + Name of in-tree device tree source file, without the trailing .dts. You can provide a list of dts files to build, separated by spaces. -config BR2_LINUX_KERNEL_USE_CUSTOM_DTS - bool "Use a custom device tree file" - help - Use a custom device tree file, i.e, a device - tree file that does not belong to the kernel - source tree. - config BR2_LINUX_KERNEL_CUSTOM_DTS_PATH - string "Device Tree Source file paths" - depends on BR2_LINUX_KERNEL_USE_CUSTOM_DTS + string "Out-of-tree Device Tree Source file paths" help - Path to the device tree source files. You can - provide a list of dts paths to copy and build, - separated by spaces. + Path to to out-of-tree device tree source files. + You can provide a list of dts paths to copy and + build, separated by spaces. endif diff --git a/linux/linux.mk b/linux/linux.mk index ab940e7305..c59050a194 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -118,17 +118,13 @@ endif # going to be installed in the target filesystem. LINUX_VERSION_PROBED = `$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelrelease 2>/dev/null` -ifeq ($(BR2_LINUX_KERNEL_USE_INTREE_DTS),y) KERNEL_DTS_NAME += $(call qstrip,$(BR2_LINUX_KERNEL_INTREE_DTS_NAME)) -endif -ifeq ($(BR2_LINUX_KERNEL_USE_CUSTOM_DTS),y) # We keep only the .dts files, so that the user can specify both .dts # 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. KERNEL_DTS_NAME += $(basename $(filter %.dts,$(notdir $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH))))) -endif KERNEL_DTBS = $(addsuffix .dtb,$(KERNEL_DTS_NAME))
Just use whatever the user specified in the list. An empty list means no DTS was specified. No need to add legacy option, as the behaviour does not change. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Simon van der Veldt <simon.vanderveldt@gmail.com> Cc: Arnout Vandecappelle <arnout@mind.be> Cc: Peter Korsgaard <peter@korsgaard.com> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com> --- This is an RFC patch, totally untested, as an attempt to fix the fallout of allowing both in-tree and out-of-tree DTS files at the same time. It's here just to kickstart a discussion, especially about the help texts... ;-) --- linux/Config.in | 28 ++++++---------------------- linux/linux.mk | 4 ---- 2 files changed, 6 insertions(+), 26 deletions(-)