From patchwork Fri Nov 14 11:37:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 410793 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 C2C491400AB for ; Fri, 14 Nov 2014 22:38:03 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8A46D4B982; Fri, 14 Nov 2014 12:37:57 +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 H35SPnrzNxn3; Fri, 14 Nov 2014 12:37:57 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9B1DA4B98A; Fri, 14 Nov 2014 12:37:51 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 59E6C4B978 for ; Fri, 14 Nov 2014 12:37:42 +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 wkZhQoEpBiVK for ; Fri, 14 Nov 2014 12:37:42 +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 mail-qc0-f173.google.com (mail-qc0-f173.google.com [209.85.216.173]) by theia.denx.de (Postfix) with ESMTPS id 113054B982 for ; Fri, 14 Nov 2014 12:37:38 +0100 (CET) Received: by mail-qc0-f173.google.com with SMTP id x3so12631252qcv.18 for ; Fri, 14 Nov 2014 03:37:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=uR9dQOx0neelcBiHK0vPIAQLwMmw5+dP5i6WQ1NRZuE=; b=yr0HJR7vsADiiy4uzdjl9qRIjXO1DvyWFEv3sWxypgDJfCCBsCvAYLN6ISWwLmG0XL uP9cmZHKxI1Fp2X/ndPpNYWAa36eY/8K3XgxE/ufpcXefdnzPePydkfPEwIo73YY35ml jd8u0yCOpSq2kIzOsKjXlZ7Gl/rq4+oloR0nPm0nPHNECjiLTH//S8m+xOOZ4Vps75nY ySuGcii4uWPHjHAvHjFTjfQbkwTObW181RgUDrulM3VAalwQRtp8huLfoda0VUrjBhwp UxlbX2JWejH58AUdZh14jglqL7hodQQoguupwCXUmnLHgCywWNmgwWYeQR3DDdZzMpZQ xSUA== X-Received: by 10.229.212.66 with SMTP id gr2mr10619744qcb.8.1415965056975; Fri, 14 Nov 2014 03:37:36 -0800 (PST) Received: from localhost.localdomain ([201.82.52.106]) by mx.google.com with ESMTPSA id z9sm26694507qai.19.2014.11.14.03.37.33 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 14 Nov 2014 03:37:36 -0800 (PST) From: Fabio Estevam To: sbabic@denx.de Date: Fri, 14 Nov 2014 09:37:02 -0200 Message-Id: <1415965022-4912-4-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1415965022-4912-1-git-send-email-festevam@gmail.com> References: <1415965022-4912-1-git-send-email-festevam@gmail.com> Cc: marex@denx.de, Fabio Estevam , john.tobias.ph@gmail.com, otavio@ossystems.com.br, u-boot@lists.denx.de Subject: [U-Boot] [PATCH v2 4/4] mx6: Use a common SPL configuration file X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.13 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de From: Fabio Estevam Many boards use a minimal .cfg file in the SPL case. Introduce spl_sd.cfg so that we can reuse it. Signed-off-by: Fabio Estevam Acked-by: Stefano Babic --- Changes since v1: - Newly introduced on this series arch/arm/imx-common/spl_sd.cfg | 8 ++++++++ board/compulab/cm_fx6/imximage.cfg | 8 -------- board/freescale/mx6sabresd/mx6sabresd_spl.cfg | 20 -------------------- board/kosagi/novena/setup.cfg | 16 ---------------- configs/cm_fx6_defconfig | 2 +- configs/mx6sabresd_spl_defconfig | 2 +- configs/novena_defconfig | 2 +- 7 files changed, 11 insertions(+), 47 deletions(-) create mode 100644 arch/arm/imx-common/spl_sd.cfg delete mode 100644 board/compulab/cm_fx6/imximage.cfg delete mode 100644 board/freescale/mx6sabresd/mx6sabresd_spl.cfg delete mode 100644 board/kosagi/novena/setup.cfg diff --git a/arch/arm/imx-common/spl_sd.cfg b/arch/arm/imx-common/spl_sd.cfg new file mode 100644 index 0000000..5fc3e8a --- /dev/null +++ b/arch/arm/imx-common/spl_sd.cfg @@ -0,0 +1,8 @@ +/* + * Copyright (C) 2014, Compulab Ltd - http://compulab.co.il/ + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +IMAGE_VERSION 2 +BOOT_FROM sd diff --git a/board/compulab/cm_fx6/imximage.cfg b/board/compulab/cm_fx6/imximage.cfg deleted file mode 100644 index 420947e..0000000 --- a/board/compulab/cm_fx6/imximage.cfg +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright (C) 2014, Compulab Ltd - http://compulab.co.il/ - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -IMAGE_VERSION 2 -BOOT_FROM sd diff --git a/board/freescale/mx6sabresd/mx6sabresd_spl.cfg b/board/freescale/mx6sabresd/mx6sabresd_spl.cfg deleted file mode 100644 index 1d031ba..0000000 --- a/board/freescale/mx6sabresd/mx6sabresd_spl.cfg +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (C) 2011 Freescale Semiconductor, Inc. - * Jason Liu - * - * SPDX-License-Identifier: GPL-2.0+ - * - * Refer doc/README.imximage for more details about how-to configure - * and create imximage boot image - * - * The syntax is taken as close as possible with the kwbimage - */ - -/* image version */ -IMAGE_VERSION 2 - -/* - * Boot Device : one of - * spi, sd (the board has no nand neither onenand) - */ -BOOT_FROM sd diff --git a/board/kosagi/novena/setup.cfg b/board/kosagi/novena/setup.cfg deleted file mode 100644 index a79d1f7..0000000 --- a/board/kosagi/novena/setup.cfg +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (C) 2014 Marek Vasut - * - * SPDX-License-Identifier: GPL-2.0+ - * - * Refer docs/README.imxmage for more details about how-to configure - * and create imximage boot image - * - * The syntax is taken as close as possible with the kwbimage - */ - -/* image version */ -IMAGE_VERSION 2 - -/* Boot Device : sd */ -BOOT_FROM sd diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig index 50c06f7..3c0d64f 100644 --- a/configs/cm_fx6_defconfig +++ b/configs/cm_fx6_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/compulab/cm_fx6/imximage.cfg,MX6QDL,SPL" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL" +S:CONFIG_ARM=y +S:CONFIG_TARGET_CM_FX6=y diff --git a/configs/mx6sabresd_spl_defconfig b/configs/mx6sabresd_spl_defconfig index b7b26df..12e7844 100644 --- a/configs/mx6sabresd_spl_defconfig +++ b/configs/mx6sabresd_spl_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6sabresd_spl.cfg,SPL,MX6Q" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6Q" +S:CONFIG_ARM=y +S:CONFIG_TARGET_MX6SABRESD=y diff --git a/configs/novena_defconfig b/configs/novena_defconfig index a560afb..d28dbd7 100644 --- a/configs/novena_defconfig +++ b/configs/novena_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/kosagi/novena/setup.cfg,MX6Q,SPL" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q,SPL" +S:CONFIG_ARM=y +S:CONFIG_TARGET_KOSAGI_NOVENA=y