[U-Boot] [PATCH v2] mx6qsabrelite: Remove mx6qsabrelite code in favor of nitrogen6x

[U-Boot] [PATCH v2] mx6qsabrelite: Remove mx6qsabrelite code in favor of nitrogen6x

[Fabio Estevam]

mx6qsabrelite and nitrogen6q boards are hardware compatible, so let's avoid the
code duplication and only use the nitrogen6x source code to make board code
maintainance easier.

Tested booting a mainline device tree kernel on a mx6qsabrelite board.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
Changes since v1:
- Update MAINTAINERS file

 MAINTAINERS                                        |   2 +-
 .../nitrogen6x/README.mx6qsabrelite}               |   0
 .../nitrogen6x/{README => README.nitrogen6x}       |   0
 board/freescale/mx6qsabrelite/Makefile             |  41 -
 board/freescale/mx6qsabrelite/mx6qsabrelite.c      | 848 ---------------------
 boards.cfg                                         |   2 +-
 include/configs/mx6qsabrelite.h                    | 297 --------
 include/configs/nitrogen6x.h                       |  80 +-
 8 files changed, 81 insertions(+), 1189 deletions(-)
 rename board/{freescale/mx6qsabrelite/README => boundary/nitrogen6x/README.mx6qsabrelite} (100%)
 rename board/boundary/nitrogen6x/{README => README.nitrogen6x} (100%)
 delete mode 100644 board/freescale/mx6qsabrelite/Makefile
 delete mode 100644 board/freescale/mx6qsabrelite/mx6qsabrelite.c
 delete mode 100644 include/configs/mx6qsabrelite.h

diff --git a/MAINTAINERS b/MAINTAINERS
index 001b42d..c4ed128 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -600,7 +600,6 @@ Jason Liu <r64343@freescale.com>
 	mx53evk         i.MX53
 	mx53loco        i.MX53
 	mx6qarm2	i.MX6Q
-	mx6qsabrelite   i.MX6Q
 
 Enric Balletbo i Serra <eballetbo@iseebcn.com>
 
@@ -1054,6 +1053,7 @@ Pali Roh??r <pali.rohar@gmail.com>
 	nokia_rx51	ARM ARMV7 (OMAP34xx SoC)
 
 Eric Nelson <eric.nelson@boundarydevices.com>
+	mx6qsabrelite		i.MX6Q		1GB
 	nitrogen6dl		i.MX6DL		1GB
 	nitrogen6dl2g		i.MX6DL		2GB
 	nitrogen6q		i.MX6Q/6D	1GB
diff --git a/board/freescale/mx6qsabrelite/README b/board/boundary/nitrogen6x/README.mx6qsabrelite
similarity index 100%
rename from board/freescale/mx6qsabrelite/README
rename to board/boundary/nitrogen6x/README.mx6qsabrelite
diff --git a/board/boundary/nitrogen6x/README b/board/boundary/nitrogen6x/README.nitrogen6x
similarity index 100%
rename from board/boundary/nitrogen6x/README
rename to board/boundary/nitrogen6x/README.nitrogen6x
diff --git a/board/freescale/mx6qsabrelite/Makefile b/board/freescale/mx6qsabrelite/Makefile
deleted file mode 100644
index cf344e4..0000000
diff --git a/board/freescale/mx6qsabrelite/mx6qsabrelite.c b/board/freescale/mx6qsabrelite/mx6qsabrelite.c
deleted file mode 100644
index 862bc30..0000000
diff --git a/boards.cfg b/boards.cfg
index db56488..86e2fd6 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -259,7 +259,7 @@ vision2                      arm         armv7       vision2             ttcontr
 cgtqmx6qeval				 arm		 armv7		 cgtqmx6eval		 congatec		mx6		cgtqmx6eval:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg,MX6Q
 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,MX6Q
-mx6qsabrelite                arm         armv7       mx6qsabrelite       freescale      mx6		mx6qsabrelite:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg
+mx6qsabrelite                arm         armv7       nitrogen6x          boundary       mx6		nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024,SABRELITE
 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
diff --git a/include/configs/mx6qsabrelite.h b/include/configs/mx6qsabrelite.h
deleted file mode 100644
index c7db81d..0000000
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index 74df66c..85eecfc 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -186,6 +186,80 @@
 
 #define CONFIG_DRIVE_TYPES CONFIG_DRIVE_SATA CONFIG_DRIVE_MMC
 
+#if defined(CONFIG_SABRELITE)
+#define CONFIG_EXTRA_ENV_SETTINGS \
+	"script=boot.scr\0" \
+	"uimage=uImage\0" \
+	"console=ttymxc1\0" \
+	"fdt_high=0xffffffff\0" \
+	"initrd_high=0xffffffff\0" \
+	"fdt_file=imx6q-sabrelite.dtb\0" \
+	"fdt_addr=0x11000000\0" \
+	"boot_fdt=try\0" \
+	"ip_dyn=yes\0" \
+	"mmcdev=0\0" \
+	"mmcpart=1\0" \
+	"mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
+	"mmcargs=setenv bootargs console=${console},${baudrate} " \
+		"root=${mmcroot}\0" \
+	"loadbootscript=" \
+		"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
+	"bootscript=echo Running bootscript from mmc ...; " \
+		"source\0" \
+	"loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
+	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
+	"mmcboot=echo Booting from mmc ...; " \
+		"run mmcargs; " \
+		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
+			"if run loadfdt; then " \
+				"bootm ${loadaddr} - ${fdt_addr}; " \
+			"else " \
+				"if test ${boot_fdt} = try; then " \
+					"bootm; " \
+				"else " \
+					"echo WARN: Cannot load the DT; " \
+				"fi; " \
+			"fi; " \
+		"else " \
+			"bootm; " \
+		"fi;\0" \
+	"netargs=setenv bootargs console=${console},${baudrate} " \
+		"root=/dev/nfs " \
+	"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
+		"netboot=echo Booting from net ...; " \
+		"run netargs; " \
+		"if test ${ip_dyn} = yes; then " \
+			"setenv get_cmd dhcp; " \
+		"else " \
+			"setenv get_cmd tftp; " \
+		"fi; " \
+		"${get_cmd} ${uimage}; " \
+		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
+			"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
+				"bootm ${loadaddr} - ${fdt_addr}; " \
+			"else " \
+				"if test ${boot_fdt} = try; then " \
+					"bootm; " \
+				"else " \
+					"echo WARN: Cannot load the DT; " \
+				"fi; " \
+			"fi; " \
+		"else " \
+			"bootm; " \
+		"fi;\0"
+
+#define CONFIG_BOOTCOMMAND \
+	   "mmc dev ${mmcdev}; if mmc rescan; then " \
+		   "if run loadbootscript; then " \
+			   "run bootscript; " \
+		   "else " \
+			   "if run loaduimage; then " \
+				   "run mmcboot; " \
+			   "else run netboot; " \
+			   "fi; " \
+		   "fi; " \
+	   "else run netboot; fi"
+#else
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc1\0" \
 	"clearenv=if sf probe || sf probe || sf probe 1 ; then " \
@@ -219,6 +293,7 @@
 		"done ; " \
 	"done\0" \
 
+#endif
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_HUSH_PARSER
@@ -258,8 +333,11 @@
 
 #define CONFIG_ENV_SIZE			(8 * 1024)
 
-/* #define CONFIG_ENV_IS_IN_MMC */
+#if defined(CONFIG_SABRELITE)
+#define CONFIG_ENV_IS_IN_MMC
+#else
 #define CONFIG_ENV_IS_IN_SPI_FLASH
+#endif
 
 #if defined(CONFIG_ENV_IS_IN_MMC)
 #define CONFIG_ENV_OFFSET		(6 * 64 * 1024)
-- 
1.8.1.2

[U-Boot] [PATCH v2] mx6qsabrelite: Remove mx6qsabrelite code in favor of nitrogen6x

[Otavio Salvador]

On Mon, Jul 15, 2013 at 2:29 PM, Fabio Estevam
<fabio.estevam@freescale.com> wrote:
> mx6qsabrelite and nitrogen6q boards are hardware compatible, so let's avoid the
> code duplication and only use the nitrogen6x source code to make board code
> maintainance easier.
>
> Tested booting a mainline device tree kernel on a mx6qsabrelite board.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

Reviewed-by: Otavio Salvador <otavio@ossystems.com.br>

--
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://projetos.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

[U-Boot] [PATCH v2] mx6qsabrelite: Remove mx6qsabrelite code in favor of nitrogen6x

[Eric Nelson]

On 07/15/2013 10:29 AM, Fabio Estevam wrote:
> mx6qsabrelite and nitrogen6q boards are hardware compatible, so let's avoid the
> code duplication and only use the nitrogen6x source code to make board code
> maintainance easier.
>
> Tested booting a mainline device tree kernel on a mx6qsabrelite board.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
> Changes since v1:
> - Update MAINTAINERS file
>

Tested-by: Eric Nelson <eric.nelson@boundarydevices.com>

[U-Boot] [PATCH v2] mx6qsabrelite: Remove mx6qsabrelite code in favor of nitrogen6x

[Albert ARIBAUD]

Hi Fabio,

On Mon, 15 Jul 2013 14:29:28 -0300, Fabio Estevam
<fabio.estevam@freescale.com> wrote:

> mx6qsabrelite and nitrogen6q boards are hardware compatible, so let's avoid the
> code duplication and only use the nitrogen6x source code to make board code
> maintainance easier.
> 
> Tested booting a mainline device tree kernel on a mx6qsabrelite board.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---

Hmm, why does this patch not show on Patchwork? Only its V1 does.

Amicalement,
-- 
Albert.

[U-Boot] [PATCH v2] mx6qsabrelite: Remove mx6qsabrelite code in favor of nitrogen6x

[Stefano Babic]

Hi Albert,

On 17/07/2013 09:42, Albert ARIBAUD wrote:
> Hi Fabio,
> 
> On Mon, 15 Jul 2013 14:29:28 -0300, Fabio Estevam
> <fabio.estevam@freescale.com> wrote:
> 
>> mx6qsabrelite and nitrogen6q boards are hardware compatible, so let's avoid the
>> code duplication and only use the nitrogen6x source code to make board code
>> maintainance easier.
>>
>> Tested booting a mainline device tree kernel on a mx6qsabrelite board.
>>
>> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
>> ---
> 
> Hmm, why does this patch not show on Patchwork? Only its V1 does.
> 

I am struggling for finding it, too. I have already seen a similar case
in the past. Otavio remarked that when there is a rename, patchwork is
not able to track it (bug in patchwork).

Stefano


-- 
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

[U-Boot] [PATCH v2] mx6qsabrelite: Remove mx6qsabrelite code in favor of nitrogen6x

[Albert ARIBAUD]

Hi Stefano,

On Wed, 17 Jul 2013 10:04:29 +0200, Stefano Babic <sbabic@denx.de>
wrote:

> Hi Albert,
> 
> On 17/07/2013 09:42, Albert ARIBAUD wrote:
> > Hi Fabio,
> > 
> > On Mon, 15 Jul 2013 14:29:28 -0300, Fabio Estevam
> > <fabio.estevam@freescale.com> wrote:
> > 
> >> mx6qsabrelite and nitrogen6q boards are hardware compatible, so let's avoid the
> >> code duplication and only use the nitrogen6x source code to make board code
> >> maintainance easier.
> >>
> >> Tested booting a mainline device tree kernel on a mx6qsabrelite board.
> >>
> >> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> >> ---
> > 
> > Hmm, why does this patch not show on Patchwork? Only its V1 does.
> > 
> 
> I am struggling for finding it, too. I have already seen a similar case
> in the past. Otavio remarked that when there is a rename, patchwork is
> not able to track it (bug in patchwork).

Since we have a clear example (and on the patchwork site where the
patchwork folks can dig as deep as they need), we could bring this up
to the patchwork list, with the M-IDs of the V1 and V2 patches.

I'd rather someone with a handle to the U-Boot mailing list do it, as
it may require digging there too.

Wolfgang?

> Stefano

Amicalement,
-- 
Albert.

[U-Boot] [PATCH v2] mx6qsabrelite: Remove mx6qsabrelite code in favor of nitrogen6x

[Stefano Babic]

On 17/07/2013 11:10, Albert ARIBAUD wrote:
> Hi Stefano,
> 
> On Wed, 17 Jul 2013 10:04:29 +0200, Stefano Babic <sbabic@denx.de>
> wrote:
> 
>> Hi Albert,
>>
>> On 17/07/2013 09:42, Albert ARIBAUD wrote:
>>> Hi Fabio,
>>>
>>> On Mon, 15 Jul 2013 14:29:28 -0300, Fabio Estevam
>>> <fabio.estevam@freescale.com> wrote:
>>>
>>>> mx6qsabrelite and nitrogen6q boards are hardware compatible, so let's avoid the
>>>> code duplication and only use the nitrogen6x source code to make board code
>>>> maintainance easier.
>>>>
>>>> Tested booting a mainline device tree kernel on a mx6qsabrelite board.
>>>>
>>>> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
>>>> ---
>>>
>>> Hmm, why does this patch not show on Patchwork? Only its V1 does.
>>>
>>
>> I am struggling for finding it, too. I have already seen a similar case
>> in the past. Otavio remarked that when there is a rename, patchwork is
>> not able to track it (bug in patchwork).
> 
> Since we have a clear example (and on the patchwork site where the
> patchwork folks can dig as deep as they need), we could bring this up
> to the patchwork list, with the M-IDs of the V1 and V2 patches.

A second example was :

[PATCH 5/6] mx28evk: Move README file inside board directory

This can be found in the ML, but I never found it in patchworks. This
patch renamed only a file:

> diff --git a/doc/README.mx28evk b/board/freescale/mx28evk/README
> similarity index 100%
> rename from doc/README.mx28evk
> rename to board/freescale/mx28evk/README
>

For this reason the disappearing of mx6qsabrelite can be related,
because also this patch renames a file.

Regards,
Stefano

-- 
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

[U-Boot] [PATCH v2] mx6qsabrelite: Remove mx6qsabrelite code in favor of nitrogen6x

[Stefano Babic]

Hi Fabio,

On 15/07/2013 19:29, Fabio Estevam wrote:
> mx6qsabrelite and nitrogen6q boards are hardware compatible, so let's avoid the
> code duplication and only use the nitrogen6x source code to make board code
> maintainance easier.
> 
> Tested booting a mainline device tree kernel on a mx6qsabrelite board.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---

I get several "corrupt patch" even if it was sent as usual with
git-send-email. Checking in e-mail source, seevral spaces are replaced
by =20. I do not know if they are the cause: even trying to fix them, I
cannot simply apply the patch. It seems that the mail server did some evil..

Could you be so kind to repush the patch ?

Thanks,
Stefano

-- 
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

[U-Boot] [PATCH v2] mx6qsabrelite: Remove mx6qsabrelite code in favor of nitrogen6x

[Fabio Estevam]

Hi Stefano,

On Wed, Jul 24, 2013 at 9:45 AM, Stefano Babic <sbabic@denx.de> wrote:
> Hi Fabio,
>
> On 15/07/2013 19:29, Fabio Estevam wrote:
>> mx6qsabrelite and nitrogen6q boards are hardware compatible, so let's avoid the
>> code duplication and only use the nitrogen6x source code to make board code
>> maintainance easier.
>>
>> Tested booting a mainline device tree kernel on a mx6qsabrelite board.
>>
>> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
>> ---
>
> I get several "corrupt patch" even if it was sent as usual with
> git-send-email. Checking in e-mail source, seevral spaces are replaced
> by =20. I do not know if they are the cause: even trying to fix them, I
> cannot simply apply the patch. It seems that the mail server did some evil..
>
> Could you be so kind to repush the patch ?

No problem, I will re-send it later this week.

Regards,

Fabio Estevam