From patchwork Thu Dec 20 08:48:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 207624 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 396EE2C0093 for ; Thu, 20 Dec 2012 19:48:23 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E4C9520684; Thu, 20 Dec 2012 08:48:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cHFAZmoct1rX; Thu, 20 Dec 2012 08:48:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id B88E72053B; Thu, 20 Dec 2012 08:48:20 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 663498F75B for ; Thu, 20 Dec 2012 08:48:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id ABAD0814AA for ; Thu, 20 Dec 2012 08:48:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id U475nEqhHrgE for ; Thu, 20 Dec 2012 08:48:18 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (mail.free-electrons.com [94.23.32.191]) by whitealder.osuosl.org (Postfix) with ESMTP id 65AFB81493 for ; Thu, 20 Dec 2012 08:48:18 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id 4597B175; Thu, 20 Dec 2012 09:48:18 +0100 (CET) Received: from localhost (col31-4-88-188-83-94.fbx.proxad.net [88.188.83.94]) by mail.free-electrons.com (Postfix) with ESMTPSA id 4E93512E for ; Thu, 20 Dec 2012 09:48:11 +0100 (CET) From: Maxime Ripard To: buildroot@busybox.net Date: Thu, 20 Dec 2012 09:48:09 +0100 Message-Id: <1355993289-31804-1-git-send-email-maxime.ripard@free-electrons.com> X-Mailer: git-send-email 1.7.9.5 Subject: [Buildroot] [PATCHv3] linux: Support multiple device tree build X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Maxime Ripard --- Fixes since v3: - Remove the use of foreach but use addprefix/addsuffix instead --- linux/Config.in | 5 +++-- linux/linux.mk | 7 +++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index f408ad5..3ff6b4a 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -261,11 +261,12 @@ config BR2_LINUX_KERNEL_USE_CUSTOM_DTS endchoice config BR2_LINUX_KERNEL_INTREE_DTS_NAME - string "Device Tree Source file name" + string "Device Tree Source file names" depends on BR2_LINUX_KERNEL_USE_INTREE_DTS help Name of the device tree source file, without - the trailing .dts + the trailing .dts. You can provide a list of + dts files to build, separated by spaces. config BR2_LINUX_KERNEL_CUSTOM_DTS_PATH string "Device Tree Source file path" diff --git a/linux/linux.mk b/linux/linux.mk index c4bdf90..3321d80 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -187,10 +187,13 @@ endef ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT),y) ifeq ($(BR2_LINUX_KERNEL_DTB_IS_SELF_BUILT),) define LINUX_BUILD_DTB - $(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(KERNEL_DTS_NAME).dtb + $(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) \ + $(addsuffix .dtb, $(call qstrip, $(KERNEL_DTS_NAME))) endef define LINUX_INSTALL_DTB - cp $(KERNEL_ARCH_PATH)/boot/$(KERNEL_DTS_NAME).dtb $(BINARIES_DIR)/ + cp $(addprefix $(KERNEL_ARCH_PATH)/boot/, \ + $(addsuffix .dtb, $(call qstrip, $(KERNEL_DTS_NAME)))) \ + $(BINARIES_DIR)/ endef endif endif