Patchwork [U-Boot,v6,1/2] mx23_olinuxino: Add default environment

login
register
mail settings
Submitter Otavio Salvador
Date Jan. 23, 2013, 8:30 p.m.
Message ID <1358973034-21160-1-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/215034/
State Awaiting Upstream
Delegated to: Stefano Babic
Headers show

Comments

Otavio Salvador - Jan. 23, 2013, 8:30 p.m.
This adds a default environment with support for MMC booting.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
Changes in v6:
- Remove 'saveenv' command as it is not need
- Move environment settings to environment section

Changes in v5:
- Remove duplicate environment setting
- Improve commit log

Changes in v4: None
Changes in v3: None
Changes in v2: None

 include/configs/mx23_olinuxino.h | 77 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 70 insertions(+), 7 deletions(-)
Stefano Babic - Jan. 28, 2013, 10:54 a.m.
On 23/01/2013 21:30, Otavio Salvador wrote:
> This adds a default environment with support for MMC booting.
> 
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---

Applied (whole patchset) to u-boot-imx, thanks.

Best regards,
Stefano Babic
Marek Vasut - Jan. 28, 2013, 1:29 p.m.
Dear Stefano Babic,

> On 23/01/2013 21:30, Otavio Salvador wrote:
> > This adds a default environment with support for MMC booting.
> > 
> > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> > ---
> 
> Applied (whole patchset) to u-boot-imx, thanks.

Otavio, "u-boot.sd" is never generated for MX23, so the env is broken now. 
Please fix.

Best regards,
Marek Vasut
Otavio Salvador - Jan. 28, 2013, 2:03 p.m.
On Mon, Jan 28, 2013 at 11:29 AM, Marek Vasut <marex@denx.de> wrote:
> Dear Stefano Babic,
>
>> On 23/01/2013 21:30, Otavio Salvador wrote:
>> > This adds a default environment with support for MMC booting.
>> >
>> > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>> > ---
>>
>> Applied (whole patchset) to u-boot-imx, thanks.
>
> Otavio, "u-boot.sd" is never generated for MX23, so the env is broken now.
> Please fix.

I proposed a patch for mxsboot which fixes it. I am waiting for your
alternative patch for mxsboot.

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
Marek Vasut - Jan. 28, 2013, 2:05 p.m.
Dear Otavio Salvador,

> On Mon, Jan 28, 2013 at 11:29 AM, Marek Vasut <marex@denx.de> wrote:
> > Dear Stefano Babic,
> > 
> >> On 23/01/2013 21:30, Otavio Salvador wrote:
> >> > This adds a default environment with support for MMC booting.
> >> > 
> >> > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> >> > ---
> >> 
> >> Applied (whole patchset) to u-boot-imx, thanks.
> > 
> > Otavio, "u-boot.sd" is never generated for MX23, so the env is broken
> > now. Please fix.
> 
> I proposed a patch for mxsboot which fixes it. I am waiting for your
> alternative patch for mxsboot.

There is no alternative patch, I'm still waiting for the resolution of the 
service RQ ticket. Did you hear anything from FSL already?

Best regards,
Marek Vasut
Otavio Salvador - Jan. 28, 2013, 2:57 p.m.
On Mon, Jan 28, 2013 at 12:05 PM, Marek Vasut <marex@denx.de> wrote:
> Dear Otavio Salvador,
>
>> On Mon, Jan 28, 2013 at 11:29 AM, Marek Vasut <marex@denx.de> wrote:
>> > Dear Stefano Babic,
>> >
>> >> On 23/01/2013 21:30, Otavio Salvador wrote:
>> >> > This adds a default environment with support for MMC booting.
>> >> >
>> >> > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>> >> > ---
>> >>
>> >> Applied (whole patchset) to u-boot-imx, thanks.
>> >
>> > Otavio, "u-boot.sd" is never generated for MX23, so the env is broken
>> > now. Please fix.
>>
>> I proposed a patch for mxsboot which fixes it. I am waiting for your
>> alternative patch for mxsboot.
>
> There is no alternative patch,

There're; mine solution was a small header with 4 sector offset; yours
was to reuse mx28 header and move it to 4 sectors offset. Both works
for MX23.

> ... I'm still waiting for the resolution of the
> service RQ ticket. Did you hear anything from FSL already?

Nothing yet but I think we can go with either solutions for now and
depending on their feedback in future we can change it. I see no
reason to hold a fix due it. We know two ways how to make it work so
let's pick one and go with it for now.

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
Marek Vasut - Jan. 28, 2013, 3:11 p.m.
Dear Otavio Salvador,

> On Mon, Jan 28, 2013 at 12:05 PM, Marek Vasut <marex@denx.de> wrote:
> > Dear Otavio Salvador,
> > 
> >> On Mon, Jan 28, 2013 at 11:29 AM, Marek Vasut <marex@denx.de> wrote:
> >> > Dear Stefano Babic,
> >> > 
> >> >> On 23/01/2013 21:30, Otavio Salvador wrote:
> >> >> > This adds a default environment with support for MMC booting.
> >> >> > 
> >> >> > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> >> >> > ---
> >> >> 
> >> >> Applied (whole patchset) to u-boot-imx, thanks.
> >> > 
> >> > Otavio, "u-boot.sd" is never generated for MX23, so the env is broken
> >> > now. Please fix.
> >> 
> >> I proposed a patch for mxsboot which fixes it. I am waiting for your
> >> alternative patch for mxsboot.
> > 
> > There is no alternative patch,
> 
> There're; mine solution was a small header with 4 sector offset; yours
> was to reuse mx28 header and move it to 4 sectors offset. Both works
> for MX23.
> 
> > ... I'm still waiting for the resolution of the
> > service RQ ticket. Did you hear anything from FSL already?
> 
> Nothing yet but I think we can go with either solutions for now and
> depending on their feedback in future we can change it. I see no
> reason to hold a fix due it.

It's no fix, it's random code with no documentation backing it.

> We know two ways how to make it work so
> let's pick one and go with it for now.
> 
> --
> Otavio Salvador                             O.S. Systems
> E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
> Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Best regards,
Marek Vasut

Patch

diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h
index bc63481..4658aea 100644
--- a/include/configs/mx23_olinuxino.h
+++ b/include/configs/mx23_olinuxino.h
@@ -127,21 +127,84 @@ 
 #define CONFIG_APBH_DMA
 
 /*
- * ENV -- nowhere so far
- */
-#define	CONFIG_ENV_SIZE			(16 * 1024)
-#define	CONFIG_ENV_IS_NOWHERE
-
-/*
  * Boot Linux
  */
 #define	CONFIG_CMDLINE_TAG
 #define	CONFIG_SETUP_MEMORY_TAGS
 #define	CONFIG_BOOTDELAY	3
 #define	CONFIG_BOOTFILE		"uImage"
-#define	CONFIG_BOOTARGS		"console=ttyAMA0,115200n8 "
 #define	CONFIG_LOADADDR		0x42000000
 #define	CONFIG_SYS_LOAD_ADDR	CONFIG_LOADADDR
 #define	CONFIG_OF_LIBFDT
 
+/*
+ * Environment
+ */
+#define	CONFIG_ENV_IS_IN_MMC
+#define	CONFIG_ENV_OVERWRITE
+#ifdef	CONFIG_ENV_IS_IN_MMC
+#define	CONFIG_ENV_OFFSET	(256 * 1024)
+#define	CONFIG_ENV_SIZE	(16 * 1024)
+#define	CONFIG_SYS_MMC_ENV_DEV 0
+#endif
+
+/*
+ * Extra Environments
+ */
+#define CONFIG_EXTRA_ENV_SETTINGS \
+	"update_sd_firmware_filename=u-boot.sd\0" \
+	"update_sd_firmware="		/* Update the SD firmware partition */ \
+		"if mmc rescan ; then "	\
+		"if tftp ${update_sd_firmware_filename} ; then " \
+		"setexpr fw_sz ${filesize} / 0x200 ; "	/* SD block size */ \
+		"setexpr fw_sz ${fw_sz} + 1 ; "	\
+		"mmc write ${loadaddr} 0x800 ${fw_sz} ; " \
+		"fi ; "	\
+		"fi\0" \
+	"script=boot.scr\0"	\
+	"uimage=uImage\0" \
+	"console=ttyAMA0\0" \
+	"fdt_file=imx23-olinuxino.dtb\0" \
+	"fdt_addr=0x41000000\0" \
+	"boot_fdt=try\0" \
+	"mmcdev=0\0" \
+	"mmcpart=2\0" \
+	"mmcroot=/dev/mmcblk0p3 rw rootwait\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"
+
+#define CONFIG_BOOTCOMMAND \
+	"mmc dev ${mmcdev}; if mmc rescan; then " \
+		"if run loadbootscript; then " \
+			"run bootscript; " \
+		"else " \
+			"if run loaduimage; then " \
+				"run mmcboot; " \
+			"else " \
+				"echo ERR: Fail to boot from MMC; " \
+			"fi; " \
+		"fi; " \
+	"else exit; fi"
+
 #endif /* __MX23_OLINUXINO_CONFIG_H__ */