From patchwork Mon Jul 30 12:32:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 174011 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 D6B542C0084 for ; Mon, 30 Jul 2012 22:33:41 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C8977101A22; Mon, 30 Jul 2012 12:33:40 +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 GT1dQNJYnDGi; Mon, 30 Jul 2012 12:33:33 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1C44510197D; Mon, 30 Jul 2012 12:33:19 +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 A248D8F753 for ; Mon, 30 Jul 2012 12:33:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id F312F8C344 for ; Mon, 30 Jul 2012 12:33:16 +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 5ICldwdSoFyK for ; Mon, 30 Jul 2012 12:33:11 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (mail.free-electrons.com [88.190.12.23]) by whitealder.osuosl.org (Postfix) with ESMTP id F329F8C0E3 for ; Mon, 30 Jul 2012 12:33:10 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id C4F2E1A5; Mon, 30 Jul 2012 14:33:05 +0200 (CEST) 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 9191717B; Mon, 30 Jul 2012 14:32:50 +0200 (CEST) From: Maxime Ripard To: buildroot@busybox.net Date: Mon, 30 Jul 2012 14:32:46 +0200 Message-Id: <1343651569-6450-4-git-send-email-maxime.ripard@free-electrons.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1343651569-6450-1-git-send-email-maxime.ripard@free-electrons.com> References: <1343651569-6450-1-git-send-email-maxime.ripard@free-electrons.com> Cc: brian@crystalfontz.com Subject: [Buildroot] [PATCH 3/6] Factorize the u-boot images code 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 patch introduces the BR2_LINUX_KERNEL_UBOOT_IMAGE boolean to factorize more code that will be shared in the next patches that introduces other uImage-like targets. Signed-off-by: Maxime Ripard Acked-by: Arnout Vandecappelle (Essensium/Mind) --- linux/Config.in | 4 ++++ linux/linux.mk | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/linux/Config.in b/linux/Config.in index 8ede89c..ff705cb 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,12 +128,16 @@ config BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE # Binary format # +config BR2_LINUX_KERNEL_UBOOT_IMAGE + bool + choice prompt "Kernel binary format" config BR2_LINUX_KERNEL_UIMAGE bool "uImage" depends on BR2_arm || BR2_armeb || BR2_bfin || BR2_powerpc || BR2_avr32 || BR2_sh || BR2_sh64 + select BR2_LINUX_KERNEL_UBOOT_IMAGE config BR2_LINUX_KERNEL_BZIMAGE bool "bzImage" diff --git a/linux/linux.mk b/linux/linux.mk index 25f5a05..5ba6c60 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -34,6 +34,10 @@ LINUX_PATCHES = $(call qstrip,$(BR2_LINUX_KERNEL_PATCH)) LINUX_INSTALL_IMAGES = YES LINUX_DEPENDENCIES += host-module-init-tools +ifeq ($(BR2_LINUX_KERNEL_UBOOT_IMAGE),y) + LINUX_DEPENDENCIES += host-uboot-tools +endif + LINUX_MAKE_FLAGS = \ HOSTCC="$(HOSTCC)" \ HOSTCFLAGS="$(HOSTCFLAGS)" \ @@ -62,7 +66,6 @@ LINUX_IMAGE_NAME=vmImage else LINUX_IMAGE_NAME=uImage endif -LINUX_DEPENDENCIES+=host-uboot-tools else ifeq ($(BR2_LINUX_KERNEL_BZIMAGE),y) LINUX_IMAGE_NAME=bzImage else ifeq ($(BR2_LINUX_KERNEL_ZIMAGE),y)