From patchwork Fri Jul 25 21:25:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Proulx X-Patchwork-Id: 373812 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id B9E4C14017D for ; Sat, 26 Jul 2014 07:26:01 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id AB4928B795; Fri, 25 Jul 2014 21:26:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bEraBGmnrJ5p; Fri, 25 Jul 2014 21:25:58 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 80A8E8B77C; Fri, 25 Jul 2014 21:25:58 +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 2A9C61BFA94 for ; Fri, 25 Jul 2014 21:25:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 23BE08BF2F for ; Fri, 25 Jul 2014 21:25:57 +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 k18tfzJHQWlk for ; Fri, 25 Jul 2014 21:25:54 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by whitealder.osuosl.org (Postfix) with ESMTPS id 986AA8C39A for ; Fri, 25 Jul 2014 21:25:54 +0000 (UTC) Received: by mail-vc0-f171.google.com with SMTP id hq11so8218689vcb.16 for ; Fri, 25 Jul 2014 14:25:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=QaHybpMfQzV2M3wH+8ahQ/zZSUR0x1h0JGoPIj0b9ys=; b=i1L12rL4CQv2lfCTudvVxVAS2/c3StbppFY2TmpSnutm6msq/tQnx+tyzFj4GgbwgA w6EVnanXUwm9LOBsfQ0fh3/AXGLq0MRL3r6p+ANU771UPvpo9INiTvIrSfSW4GRZDrYd qJ9I5AXj6AL/4jm12aMA34JvdqyDC+GwtL1WH2VTeHbP1rxvPhDPNZws7PGZhye4qsPV ZTROWuvt+HbkbymHxBR7kdEGo/m91MWMEf9VarOO0HXa5a7k6VFWJdu4cZsjkTzHUmja KeVcRrd0sYnG4exPyEmCHVHNMaUOMvgWZsAKLTwfS3aOMfre/t37pqW/0vso5VzClTyZ 9Hzg== X-Received: by 10.220.172.8 with SMTP id j8mr24439877vcz.32.1406323553362; Fri, 25 Jul 2014 14:25:53 -0700 (PDT) Received: from localhost.localdomain ([192.222.140.14]) by mx.google.com with ESMTPSA id jz10sm2931814vec.3.2014.07.25.14.25.51 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 25 Jul 2014 14:25:51 -0700 (PDT) From: Philippe Proulx To: buildroot@busybox.net Date: Fri, 25 Jul 2014 17:25:32 -0400 Message-Id: <1406323532-18764-1-git-send-email-eeppeliteloop@gmail.com> X-Mailer: git-send-email 2.0.2 Subject: [Buildroot] [PATCH] linux: support multiple custom DTS files 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: Philippe Proulx --- linux/Config.in | 6 ++++-- linux/linux.mk | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 441301f..a7a3911 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -323,10 +323,12 @@ config BR2_LINUX_KERNEL_INTREE_DTS_NAME dts files to build, separated by spaces. config BR2_LINUX_KERNEL_CUSTOM_DTS_PATH - string "Device Tree Source file path" + string "Device Tree Source file paths" depends on BR2_LINUX_KERNEL_USE_CUSTOM_DTS help - Path to the device tree source file + Path to the device tree source file. 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 2a9bf3e..a5699f9 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -264,7 +264,7 @@ endif # configuration has changed. define LINUX_BUILD_CMDS $(if $(BR2_LINUX_KERNEL_USE_CUSTOM_DTS), - cp $(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH) $(KERNEL_ARCH_PATH)/boot/dts/) + cp $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)) $(KERNEL_ARCH_PATH)/boot/dts/) $(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_TARGET_NAME) @if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \ $(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) modules ; \