Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Rafal Susz <rafal.susz@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/2] package/linux: fix custom dts files handling
Date: Tue, 13 Mar 2018 19:00:05 +0100	[thread overview]
Message-ID: <20180313180006.5364-1-rafal.susz@gmail.com> (raw)
In-Reply-To: <20180313142635.27423-1-rafal.susz@gmail.com>

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

  parent reply	other threads:[~2018-03-13 18:00 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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     ` Rafal Susz [this message]
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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180313180006.5364-1-rafal.susz@gmail.com \
    --to=rafal.susz@gmail.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox