From patchwork Thu Apr 18 14:41:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Aubert X-Patchwork-Id: 237667 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 7B8E32C01AB for ; Fri, 19 Apr 2013 00:42:35 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id F359E4A374; Thu, 18 Apr 2013 16:42:27 +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 95eHn4EEgK4e; Thu, 18 Apr 2013 16:42:27 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 278C44A360; Thu, 18 Apr 2013 16:42:25 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 85CBD4A360 for ; Thu, 18 Apr 2013 16:42:22 +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 QjB8lqlqWiQJ for ; Thu, 18 Apr 2013 16:42:21 +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 esa2.staubli.c3s2.iphmx.com (esa2.staubli.c3s2.iphmx.com [68.232.139.29]) by theia.denx.de (Postfix) with ESMTPS id A82F14A35A for ; Thu, 18 Apr 2013 16:42:17 +0200 (CEST) X-IronPort-AV: E=Sophos;i="4.87,502,1363129200"; d="scan'208";a="4236526" Received: from unknown (HELO fav03not.staubli.pri) ([217.109.88.35]) by esa2.staubli.c3s2.iphmx.com with ESMTP; 18 Apr 2013 16:42:05 +0200 Received: from favd8744.staubli.pri ([10.10.100.28]) by fav03not.staubli.pri (Lotus Domino Release 8.5.1FP5) with ESMTP id 2013041816420452-19992 ; Thu, 18 Apr 2013 16:42:04 +0200 Received: from favd8744.staubli.pri (localhost [127.0.0.1]) by favd8744.staubli.pri (8.14.5/8.14.5) with ESMTP id r3IEg4xI022437; Thu, 18 Apr 2013 16:42:04 +0200 Received: (from aubert@localhost) by favd8744.staubli.pri (8.14.5/8.14.5/Submit) id r3IEg3F7022436; Thu, 18 Apr 2013 16:42:03 +0200 From: Pierre Aubert To: u-boot@lists.denx.de Date: Thu, 18 Apr 2013 16:41:26 +0200 Message-Id: <1366296086-22394-1-git-send-email-p.aubert@staubli.com> X-Mailer: git-send-email 1.7.6.5 X-MIMETrack: Itemize by SMTP Server on FAV03NOT/FAVERGES/STAUBLI(Release 8.5.1FP5|September 29, 2010) at 18/04/2013 16:42:04, Serialize by Router on FAV03NOT/FAVERGES/STAUBLI(Release 8.5.1FP5|September 29, 2010) at 18/04/2013 16:42:04, Serialize complete at 18/04/2013 16:42:04 Cc: Pierre Aubert Subject: [U-Boot] [PATCH] 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 --- .../freescale/{mx6qsabresd => mx6sabresd}/Makefile | 2 +- .../mx6qsabresd.c => mx6sabresd/mx6sabresd.c} | 11 ++++++----- boards.cfg | 5 +++-- include/configs/mx6qsabreauto.h | 2 +- .../{mx6qsabre_common.h => mx6sabre_common.h} | 1 - include/configs/{mx6qsabresd.h => mx6sabresd.h} | 2 +- 6 files changed, 12 insertions(+), 11 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/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 0d7cb9e..dcefdab 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,10 @@ int board_late_init(void) int checkboard(void) { - puts("Board: MX6Q-SabreSD\n"); - +#ifdef CONFIG_MX6Q + puts("Board: MX6Q-SabreSD\n"); +#else + puts("Board: MX6DL-SabreSD\n"); +#endif return 0; } diff --git a/boards.cfg b/boards.cfg index f785da8..c002cf7 100644 --- a/boards.cfg +++ b/boards.cfg @@ -256,9 +256,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 +mx6qsabresd arm armv7 mx6sabresd freescale mx6 mx6sabresd:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg,MX6Q +mx6dlsabresd arm armv7 mx6sabresd freescale mx6 mx6sabresd:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL eco5pk arm armv7 eco5pk 8dtech omap3 nitrogen6dl arm armv7 nitrogen6x boundary mx6 nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024 nitrogen6dl2g arm armv7 nitrogen6x boundary mx6 nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl2g.cfg,MX6DL,DDR_MB=2048 diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h index 1583c11..099839a 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 f5f115f..203158d 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)