Patchwork [U-Boot,v3,2/2] imx: Add support for the SabreSD shipped with i.MX6DL

login
register
mail settings
Submitter Pierre Aubert
Date June 4, 2013, 7 a.m.
Message ID <1370329215-8950-2-git-send-email-p.aubert@staubli.com>
Download mbox | patch
Permalink /patch/248476/
State Awaiting Upstream
Delegated to: Stefano Babic
Headers show

Comments

Pierre Aubert - June 4, 2013, 7 a.m.
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 <p.aubert@staubli.com>
CC: Stefano Babic <sbabic@denx.de>
---
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%)
Fabio Estevam - June 14, 2013, 3:13 p.m.
On Tue, Jun 4, 2013 at 4:00 AM, Pierre Aubert <p.aubert@staubli.com> wrote:
> 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 <p.aubert@staubli.com>
> CC: Stefano Babic <sbabic@denx.de>

Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com>
Stefano Babic - June 26, 2013, 3 p.m.
On 14/06/2013 17:13, Fabio Estevam wrote:
> On Tue, Jun 4, 2013 at 4:00 AM, Pierre Aubert <p.aubert@staubli.com> wrote:
>> 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 <p.aubert@staubli.com>
>> CC: Stefano Babic <sbabic@denx.de>
> 
> Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com>
> 

Applied to u-boot-imx (both patches), thanks.

Best regards,
Stefano Babic

Patch

diff --git a/MAINTAINERS b/MAINTAINERS
index e4113d8..649c16c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -662,7 +662,7 @@  Fabio Estevam <fabio.estevam@freescale.com>
 	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 <common.h>
-#include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
-#include <asm/arch/mx6q_pins.h>
+#include <asm/arch/mx6-pins.h>
 #include <asm/errno.h>
 #include <asm/gpio.h>
 #include <asm/imx-common/iomux-v3.h>
@@ -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)