From patchwork Sat Jun 23 12:45:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: trem X-Patchwork-Id: 166756 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id C8B7BB6FA2 for ; Sat, 23 Jun 2012 22:45:57 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5F5578CABF; Sat, 23 Jun 2012 12:45:53 +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 oxBgoi3Rw3MQ; Sat, 23 Jun 2012 12:45:52 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id CA87D8CAC8; Sat, 23 Jun 2012 12:45:51 +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 B489A8F753 for ; Sat, 23 Jun 2012 12:45:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 546438CB90 for ; Sat, 23 Jun 2012 12:45:50 +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 qI+PQdCFo2Eq for ; Sat, 23 Jun 2012 12:45:48 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from smtp4-g21.free.fr (smtp4-g21.free.fr [212.27.42.4]) by whitealder.osuosl.org (Postfix) with ESMTP id 6F5EA8CABF for ; Sat, 23 Jun 2012 12:45:46 +0000 (UTC) Received: from localhost.localdomain (unknown [88.161.33.221]) by smtp4-g21.free.fr (Postfix) with ESMTP id BD2814C80D2; Sat, 23 Jun 2012 14:45:41 +0200 (CEST) From: Philippe Reynes To: buildroot@busybox.net Date: Sat, 23 Jun 2012 14:45:39 +0200 Message-Id: <1340455539-20097-1-git-send-email-tremyfr@yahoo.fr> X-Mailer: git-send-email 1.7.4.4 Subject: [Buildroot] [PATCH] [ARM] Add dtb image generation v2 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 This version check if the option DTB is in the config before copying the dtb file in image directory. Signed-off-by: Philippe Reynes --- linux/Config.in | 6 ++++++ linux/linux.mk | 4 ++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 1cd05ae..a3c4385 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -132,6 +132,12 @@ config BR2_LINUX_KERNEL_DTS_FILE The final "custom target" name depends on the dts file name: .dts --> simpleImage. + +config BR2_LINUX_KERNEL_DTB_FILE + string "Device Tree dtb file expected" + depends on BR2_arm + help + Name of the dtb file to produce # # Binary format # diff --git a/linux/linux.mk b/linux/linux.mk index f165dda..045b4c3 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -174,6 +174,8 @@ define LINUX_BUILD_CMDS @if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \ $(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) modules ; \ fi + $(if $(BR2_LINUX_KERNEL_DTB_FILE), + $(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(BR2_LINUX_KERNEL_DTB_FILE)) endef @@ -194,6 +196,8 @@ endef define LINUX_INSTALL_IMAGES_CMDS cp $(LINUX_IMAGE_PATH) $(BINARIES_DIR) + $(if $(BR2_LINUX_KERNEL_DTB_FILE), + cp $(KERNEL_ARCH_PATH)/boot/$(BR2_LINUX_KERNEL_DTB_FILE) $(BINARIES_DIR)) endef define LINUX_INSTALL_TARGET_CMDS