From patchwork Wed Nov 2 02:06:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Nelson X-Patchwork-Id: 690231 X-Patchwork-Delegate: sbabic@denx.de 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 3t7s3m4R4Tz9t9b for ; Wed, 2 Nov 2016 13:09:24 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 99224A7593; Wed, 2 Nov 2016 03:09:13 +0100 (CET) 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 Q9XKm-ZO7OYZ; Wed, 2 Nov 2016 03:09:13 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D3926B381C; Wed, 2 Nov 2016 03:09:02 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id EB97E4BF90 for ; Wed, 2 Nov 2016 03:08:53 +0100 (CET) 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 84a2WdiL8SPQ for ; Wed, 2 Nov 2016 03:08:53 +0100 (CET) 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 fed1rmfepo201.cox.net (fed1rmfepo201.cox.net [68.230.241.146]) by theia.denx.de (Postfix) with ESMTP id 519BDA7535 for ; Wed, 2 Nov 2016 03:08:49 +0100 (CET) Received: from fed1rmimpo209.cox.net ([68.230.241.160]) by fed1rmfepo201.cox.net (InterMail vM.8.01.05.28 201-2260-151-171-20160122) with ESMTP id <20161102020848.WQCL6555.fed1rmfepo201.cox.net@fed1rmimpo209.cox.net> for ; Tue, 1 Nov 2016 22:08:48 -0400 Received: from localhost.localdomain ([98.165.102.90]) by fed1rmimpo209.cox.net with cox id 2q8b1u00H1x1f0q01q8oi4; Tue, 01 Nov 2016 22:08:48 -0400 X-CT-Class: Clean X-CT-Score: 0.00 X-CT-RefID: str=0001.0A090205.58194AB0.00CC, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0 X-CT-Spam: 0 X-Authority-Analysis: v=2.1 cv=cKFAygqN c=1 sm=1 tr=0 a=i7nT0dqFxmwB8XGI+JTv/g==:117 a=i7nT0dqFxmwB8XGI+JTv/g==:17 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=9_1hYV8uAAAA:8 a=aXQWo4y78WL46e9V5w0A:9 a=FKwbt-OhbrkoYuZlCyy7:22 X-CM-Score: 0.00 Authentication-Results: cox.net; auth=pass (CRAM-MD5) smtp.auth=eric.a.nelson@cox.net From: Eric Nelson To: u-boot@lists.denx.de Date: Tue, 1 Nov 2016 19:06:34 -0700 Message-Id: <1478052394-21499-4-git-send-email-eric@nelint.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1478052394-21499-1-git-send-email-eric@nelint.com> References: <1478031230-7263-1-git-send-email-eric@nelint.com> <1478052394-21499-1-git-send-email-eric@nelint.com> Cc: marex@denx.de, trini@konsulko.com, otavio.salvador@ossystems.com.br, vincent.stehle@laposte.net, albert.aribaud@3adev.fr, picmaster@mail.bg, fabio.estevam@nxp.com Subject: [U-Boot] [RFC PATCH 3/3] ARM: imx: mx6memcal: allow build of combined SPL+U-Boot X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Add an imximage config file to construct u-boot.imx with SPL as a plugin and use it as a straw-man for the mx6memcal virtual board. Note that this breaks the build of SPL because only one value can be listed for IMX_CONFIG. As it stands, all imx SPL builds use an almost empty .cfg file from arch/arm/configs/spl_sd.cfg. This could be hard-coded for use in building SPL if we just remove the comments from the file (copyright). Signed-off-by: Eric Nelson --- arch/arm/imx-common/spl-plus-u-boot.cfg | 4 ++++ configs/mx6memcal_defconfig | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 arch/arm/imx-common/spl-plus-u-boot.cfg diff --git a/arch/arm/imx-common/spl-plus-u-boot.cfg b/arch/arm/imx-common/spl-plus-u-boot.cfg new file mode 100644 index 0000000..5940cb0 --- /dev/null +++ b/arch/arm/imx-common/spl-plus-u-boot.cfg @@ -0,0 +1,4 @@ +IMAGE_VERSION 2 +BOOT_FROM sd +PLUGIN spl/u-boot-spl.bin 0x00907000 + diff --git a/configs/mx6memcal_defconfig b/configs/mx6memcal_defconfig index 7e07182..06aa85f 100644 --- a/configs/mx6memcal_defconfig +++ b/configs/mx6memcal_defconfig @@ -6,7 +6,7 @@ CONFIG_MX6_DDRCAL=y CONFIG_TARGET_MX6MEMCAL=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6QDL" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl-plus-u-boot.cfg,SPL,MX6QDL" CONFIG_SPL=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_BOOTD is not set