From patchwork Tue Jun 4 07:00:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Aubert X-Patchwork-Id: 248476 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 3404B2C009E for ; Tue, 4 Jun 2013 17:14:25 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3FE044A01F; Tue, 4 Jun 2013 09:14:20 +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 aX4BgOv3XulU; Tue, 4 Jun 2013 09:14:20 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A83214A02A; Tue, 4 Jun 2013 09:14:18 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6BA064A02A for ; Tue, 4 Jun 2013 09:14:17 +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 FEnIS+wkp9VD for ; Tue, 4 Jun 2013 09:14:14 +0200 (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 esa1.staubli.c3s2.iphmx.com (esa1.staubli.c3s2.iphmx.com [68.232.133.30]) by theia.denx.de (Postfix) with ESMTPS id 77BDA4A01F for ; Tue, 4 Jun 2013 09:14:14 +0200 (CEST) X-IronPort-AV: E=Sophos;i="4.87,798,1363129200"; d="scan'208";a="5286982" Received: from unknown (HELO fav03not.staubli.pri) ([217.109.88.35]) by esa1.staubli.c3s2.iphmx.com with ESMTP; 04 Jun 2013 09:00:59 +0200 Received: from favd8744.staubli.pri ([10.10.100.28]) by fav03not.staubli.pri (Lotus Domino Release 8.5.1FP5) with ESMTP id 2013060409005948-7951 ; Tue, 4 Jun 2013 09:00:59 +0200 Received: from favd8744.staubli.pri (localhost [127.0.0.1]) by favd8744.staubli.pri (8.14.5/8.14.5) with ESMTP id r5470xIw008991; Tue, 4 Jun 2013 09:00:59 +0200 Received: (from aubert@localhost) by favd8744.staubli.pri (8.14.5/8.14.5/Submit) id r5470xNa008990; Tue, 4 Jun 2013 09:00:59 +0200 From: Pierre Aubert To: u-boot@lists.denx.de Date: Tue, 4 Jun 2013 09:00:15 +0200 Message-Id: <1370329215-8950-2-git-send-email-p.aubert@staubli.com> X-Mailer: git-send-email 1.7.6.5 In-Reply-To: <1366286251-17552-1-git-send-email-p.aubert@staubli.com> References: <1366286251-17552-1-git-send-email-p.aubert@staubli.com> X-MIMETrack: Itemize by SMTP Server on FAV03NOT/FAVERGES/STAUBLI(Release 8.5.1FP5|September 29, 2010) at 04/06/2013 09:00:59, Serialize by Router on FAV03NOT/FAVERGES/STAUBLI(Release 8.5.1FP5|September 29, 2010) at 04/06/2013 09:00:59, Serialize complete at 04/06/2013 09:00:59 Cc: Pierre Aubert Subject: [U-Boot] [PATCH v3 2/2] imx: Add support for the SabreSD shipped with i.MX6DL 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: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de The SabreSD platform is available with i.MX6Q or i.MX6DL. This patch adds the support of the i.MX6DL. The config file and the board directory are renamed to remove the reference to the MX6Q. Signed-off-by: Pierre Aubert CC: Stefano Babic Reviewed-by: Fabio Estevam --- Changes in v2: - update MAINTAINERS - code cleanup - remove the Soc type from the board name Changes for v3: - rebased on u-boot-imx MAINTAINERS | 2 +- .../freescale/{mx6qsabresd => mx6sabresd}/Makefile | 2 +- .../mx6qsabresd.c => mx6sabresd/mx6sabresd.c} | 7 ++----- boards.cfg | 5 +++-- include/configs/mx6qsabreauto.h | 2 +- .../{mx6qsabre_common.h => mx6sabre_common.h} | 1 - include/configs/{mx6qsabresd.h => mx6sabresd.h} | 2 +- 7 files changed, 9 insertions(+), 12 deletions(-) rename board/freescale/{mx6qsabresd => mx6sabresd}/Makefile (98%) rename board/freescale/{mx6qsabresd/mx6qsabresd.c => mx6sabresd/mx6sabresd.c} (98%) rename include/configs/{mx6qsabre_common.h => mx6sabre_common.h} (99%) rename include/configs/{mx6qsabresd.h => mx6sabresd.h} (97%) diff --git a/MAINTAINERS b/MAINTAINERS index e4113d8..649c16c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -662,7 +662,7 @@ Fabio Estevam mx31pdk i.MX31 mx53ard i.MX53 mx53smd i.MX53 - mx6qsabresd i.MX6Q + mx6sabresd i.MX6Q/DL mx6qsabreauto i.MX6Q wandboard i.MX6DL/S mx6slevk i.MX6SL diff --git a/board/freescale/mx6qsabresd/Makefile b/board/freescale/mx6sabresd/Makefile similarity index 98% rename from board/freescale/mx6qsabresd/Makefile rename to board/freescale/mx6sabresd/Makefile index 5693772..ff3c94b 100644 --- a/board/freescale/mx6qsabresd/Makefile +++ b/board/freescale/mx6sabresd/Makefile @@ -23,7 +23,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).o -COBJS := mx6qsabresd.o +COBJS := mx6sabresd.o SRCS := $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) diff --git a/board/freescale/mx6qsabresd/mx6qsabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c similarity index 98% rename from board/freescale/mx6qsabresd/mx6qsabresd.c rename to board/freescale/mx6sabresd/mx6sabresd.c index 2529826..222ee98 100644 --- a/board/freescale/mx6qsabresd/mx6qsabresd.c +++ b/board/freescale/mx6sabresd/mx6sabresd.c @@ -17,12 +17,10 @@ * GNU General Public License for more details. */ -#include -#include #include #include #include -#include +#include #include #include #include @@ -291,7 +289,6 @@ int board_late_init(void) int checkboard(void) { - puts("Board: MX6Q-SabreSD\n"); - + puts("Board: MX6-SabreSD\n"); return 0; } diff --git a/boards.cfg b/boards.cfg index 3fdf41e..f322a01 100644 --- a/boards.cfg +++ b/boards.cfg @@ -257,9 +257,10 @@ mx53smd arm armv7 mx53smd freesca ima3-mx53 arm armv7 ima3-mx53 esg mx5 ima3-mx53:IMX_CONFIG=board/esg/ima3-mx53/imximage.cfg vision2 arm armv7 vision2 ttcontrol mx5 vision2:IMX_CONFIG=board/ttcontrol/vision2/imximage_hynix.cfg mx6qarm2 arm armv7 mx6qarm2 freescale mx6 mx6qarm2:IMX_CONFIG=board/freescale/mx6qarm2/imximage.cfg -mx6qsabreauto arm armv7 mx6qsabreauto freescale mx6 mx6qsabreauto:IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg +mx6qsabreauto arm armv7 mx6qsabreauto freescale mx6 mx6qsabreauto:IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,MX6Q mx6qsabrelite arm armv7 mx6qsabrelite freescale mx6 mx6qsabrelite:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg -mx6qsabresd arm armv7 mx6qsabresd freescale mx6 mx6qsabresd:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg +mx6dlsabresd arm armv7 mx6sabresd freescale mx6 mx6sabresd:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL +mx6qsabresd arm armv7 mx6sabresd freescale mx6 mx6sabresd:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg,MX6Q mx6slevk arm armv7 mx6slevk freescale mx6 mx6slevk:IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL titanium arm armv7 titanium freescale mx6 titanium:IMX_CONFIG=board/freescale/titanium/imximage.cfg vf610twr arm armv7 vf610twr freescale vf610 vf610twr:IMX_CONFIG=board/freescale/vf610twr/imximage.cfg diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h index 947ea60..d357b4d 100644 --- a/include/configs/mx6qsabreauto.h +++ b/include/configs/mx6qsabreauto.h @@ -30,7 +30,7 @@ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 -#include "mx6qsabre_common.h" +#include "mx6sabre_common.h" #define CONFIG_SYS_FSL_USDHC_NUM 2 #if defined(CONFIG_ENV_IS_IN_MMC) diff --git a/include/configs/mx6qsabre_common.h b/include/configs/mx6sabre_common.h similarity index 99% rename from include/configs/mx6qsabre_common.h rename to include/configs/mx6sabre_common.h index 7298a76..2ad9dff 100644 --- a/include/configs/mx6qsabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -18,7 +18,6 @@ #define __MX6QSABRE_COMMON_CONFIG_H #define CONFIG_MX6 -#define CONFIG_MX6Q #include "mx6_common.h" diff --git a/include/configs/mx6qsabresd.h b/include/configs/mx6sabresd.h similarity index 97% rename from include/configs/mx6qsabresd.h rename to include/configs/mx6sabresd.h index 3b8d752..e7facd3 100644 --- a/include/configs/mx6qsabresd.h +++ b/include/configs/mx6sabresd.h @@ -24,7 +24,7 @@ #define CONFIG_DEFAULT_FDT_FILE "imx6q-sabresd.dtb" #define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024) -#include "mx6qsabre_common.h" +#include "mx6sabre_common.h" #define CONFIG_SYS_FSL_USDHC_NUM 3 #if defined(CONFIG_ENV_IS_IN_MMC)