From patchwork Wed Aug 21 19:27:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Henrik_Nordstr=C3=B6m?= X-Patchwork-Id: 268897 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 458A52C009A for ; Thu, 22 Aug 2013 06:03:32 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BC10B4A066; Wed, 21 Aug 2013 22:03:28 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id k-MedOSsxo6H; Wed, 21 Aug 2013 22:03:28 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3189B4A05E; Wed, 21 Aug 2013 22:03:26 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1FADC4A05E for ; Wed, 21 Aug 2013 22:03:18 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1Th5bJrtHTCR for ; Wed, 21 Aug 2013 22:03:12 +0200 (CEST) X-Greylist: delayed 2147 seconds by postgrey-1.27 at theia; Wed, 21 Aug 2013 22:03:06 CEST X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from vps1.hno.se (vps1.hno.se [31.192.227.87]) by theia.denx.de (Postfix) with ESMTPS id 62F654A023 for ; Wed, 21 Aug 2013 22:03:06 +0200 (CEST) Received: from home.hno.se (home.hno.se [IPv6:2001:470:df90::1]) (authenticated bits=128) by vps1.hno.se (8.14.4/8.14.4) with ESMTP id r7LJRFrB013858 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 21 Aug 2013 21:27:17 +0200 Received: from henrik ([127.0.0.1]) (authenticated bits=0) by home.hno.se (8.14.5/8.14.5) with ESMTP id r7LJR6Ve011239 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 21 Aug 2013 21:27:07 +0200 Message-ID: <1377113230.11553.2.camel@localhost> From: Henrik =?ISO-8859-1?Q?Nordstr=F6m?= To: U-Boot List Date: Wed, 21 Aug 2013 21:27:10 +0200 X-Mailer: Evolution 3.8.5 (3.8.5-2.fc19) Mime-Version: 1.0 Cc: Tom Rini Subject: [U-Boot] [PATCH] Always build u-boot.img when using CONFIG_SPL_FRAMEWORK X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de From 015f65db8c6c01fe527f2f88af255ecdb5e2c58d Mon Sep 17 00:00:00 2001 From: Henrik Nordstrom Date: Wed, 21 Aug 2013 21:20:47 +0200 Subject: [PATCH] Always build u-boot.img when using CONFIG_SPL_FRAMEWORK Use of uImage formatted u-boot binary have long been preferred, and recent changes to better support Falcon mode on MMC now enforces it on MMC. --- Makefile | 1 + 1 file changed, 1 insertion(+) ALL-$(CONFIG_SPL) += $(obj)$(subst ",,$(CONFIG_SPL_TARGET)) diff --git a/Makefile b/Makefile index 43b57da..76dbda9 100644 --- a/Makefile +++ b/Makefile @@ -397,6 +397,7 @@ ALL-y += $(obj)u-boot.srec $(obj)u-boot.bin $(obj)System.map ALL-$(CONFIG_NAND_U_BOOT) += $(obj)u-boot-nand.bin ALL-$(CONFIG_ONENAND_U_BOOT) += $(obj)u-boot-onenand.bin ALL-$(CONFIG_SPL) += $(obj)spl/u-boot-spl.bin +ALL-$(CONFIG_SPL_FRAMEWORK) += $(obj)u-boot.img ALL-$(CONFIG_OF_SEPARATE) += $(obj)u-boot.dtb $(obj)u-boot-dtb.bin ifneq ($(CONFIG_SPL_TARGET),)