Skip to contentSkip to conversation

arm: m28evk: Test if bootscript exists before loading it

PATCH New Marek Vasut 2 participants 8 messages Sep 23, 2014 – Sep 29, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 arm: m28evk: Test if bootscript exists before loading it

Make sure the boot.scr exists on the card before loading it from the card to avoid annoying message on the console.

---
 include/configs/m28evk.h | 2 ++
 1 file changed, 2 insertions(+)
include/configs/m28evk.h +2 -0
index fccd29d..2d9ad5f 100644
@@ -279,10 +279,12 @@
 		"bootm ${kernel_addr_r}\0"				\
 	"try_bootscript="						\
 		"mmc rescan;"						\
+		"if test -e mmc 0:2 ${bootscript} ; then "		\
 		"if ext4load mmc 0:2 ${kernel_addr_r} ${bootscript};"	\
 		"then;"							\
 			"\techo Running bootscript...;"			\
 			"\tsource ${kernel_addr_r};"			\
+		"fi ; "							\
 		"fi\0"
 
 /* The rest of the configuration is shared */
Signature · 1 line
2.1.0
#1 lore raw

PATCH 2/4 arm: m53evk: Test if bootscript exists before loading it

Make sure the boot.scr exists on the card before loading it from the card to avoid annoying message on the console.

---
 include/configs/m53evk.h | 2 ++
 1 file changed, 2 insertions(+)
include/configs/m53evk.h +2 -0
index df6a226..ad9c39c 100644
@@ -348,10 +348,12 @@
 		"bootm ${kernel_addr_r}\0"				\
 	"try_bootscript="						\
 		"mmc rescan;"						\
+		"if test -e mmc 0:1 ${bootscript} ; then "		\
 		"if ext4load mmc 0:1 ${kernel_addr_r} ${bootscript};"	\
 		"then;"							\
 			"\techo Running bootscript...;"			\
 			"\tsource ${kernel_addr_r};"			\
+		"fi ; "							\
 		"fi\0"
 
 #endif	/* __M53EVK_CONFIG_H__ */
Signature · 1 line
2.1.0
#2 lore raw

PATCH 2/4 arm: m53evk: Test if bootscript exists before loading it

Quoted 6 lines · Marek Vasut

Make sure the boot.scr exists on the card before loading it from the card to avoid annoying message on the console.

---

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
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
=====================================================================
#3 lore raw

PATCH 3/4 arm: m28evk: Enable FS_GENERIC

In reply to Marek Vasut

Enable the CONFIG_CMD_FS_GENERIC on m28evk to avoid per-fs specific commands and tweak the environment to cater for this new option.

---
 include/configs/m28evk.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
include/configs/m28evk.h +3 -2
index 2d9ad5f..322b45f 100644
@@ -32,6 +32,7 @@
 #define CONFIG_CMD_EXT4
 #define CONFIG_CMD_EXT4_WRITE
 #define CONFIG_CMD_FAT
+#define CONFIG_CMD_FS_GENERIC
 #define CONFIG_CMD_GPIO
 #define CONFIG_CMD_GREPENV
 #define CONFIG_CMD_I2C
@@ -236,7 +237,7 @@
 	"addargs=run addcons addmtd addmisc\0"				\
 	"mmcload="							\
 		"mmc rescan ; "						\
-		"ext4load mmc 0:2 ${kernel_addr_r} ${bootfile}\0"	\
+		"load mmc 0:2 ${kernel_addr_r} ${bootfile}\0"		\
 	"ubiload="							\
 		"ubi part UBI ; ubifsmount ubi0:rootfs ; "		\
 		"ubifsload ${kernel_addr_r} /boot/${bootfile}\0"	\
@@ -280,7 +281,7 @@
 	"try_bootscript="						\
 		"mmc rescan;"						\
 		"if test -e mmc 0:2 ${bootscript} ; then "		\
-		"if ext4load mmc 0:2 ${kernel_addr_r} ${bootscript};"	\
+		"if load mmc 0:2 ${kernel_addr_r} ${bootscript};"	\
 		"then;"							\
 			"\techo Running bootscript...;"			\
 			"\tsource ${kernel_addr_r};"			\
Signature · 1 line
2.1.0
#4 lore raw

PATCH 3/4 arm: m28evk: Enable FS_GENERIC

Quoted 6 lines · Marek Vasut

Enable the CONFIG_CMD_FS_GENERIC on m28evk to avoid per-fs specific commands and tweak the environment to cater for this new option.

---

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
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
=====================================================================
#5 lore raw

PATCH 4/4 arm: m53evk: Enable FS_GENERIC

In reply to Marek Vasut

Enable the CONFIG_CMD_FS_GENERIC on m53evk to avoid per-fs specific commands and tweak the environment to cater for this new option.

---
 include/configs/m53evk.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
include/configs/m53evk.h +3 -2
index ad9c39c..ee4eb10 100644
@@ -38,6 +38,7 @@
 #define CONFIG_CMD_EXT4
 #define CONFIG_CMD_EXT4_WRITE
 #define CONFIG_CMD_FAT
+#define CONFIG_CMD_FS_GENERIC
 #define CONFIG_CMD_GREPENV
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
@@ -305,7 +306,7 @@
 	"addargs=run addcons addmtd addmisc\0"				\
 	"mmcload="							\
 		"mmc rescan ; "						\
-		"ext4load mmc 0:1 ${kernel_addr_r} ${bootfile}\0"	\
+		"load mmc 0:1 ${kernel_addr_r} ${bootfile}\0"		\
 	"ubiload="							\
 		"ubi part UBI ; ubifsmount ubi0:rootfs ; "		\
 		"ubifsload ${kernel_addr_r} /boot/${bootfile}\0"	\
@@ -349,7 +350,7 @@
 	"try_bootscript="						\
 		"mmc rescan;"						\
 		"if test -e mmc 0:1 ${bootscript} ; then "		\
-		"if ext4load mmc 0:1 ${kernel_addr_r} ${bootscript};"	\
+		"if load mmc 0:1 ${kernel_addr_r} ${bootscript};"	\
 		"then;"							\
 			"\techo Running bootscript...;"			\
 			"\tsource ${kernel_addr_r};"			\
Signature · 1 line
2.1.0
#6 lore raw

PATCH 4/4 arm: m53evk: Enable FS_GENERIC

Quoted 6 lines · Marek Vasut

Enable the CONFIG_CMD_FS_GENERIC on m53evk to avoid per-fs specific commands and tweak the environment to cater for this new option.

---

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
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
=====================================================================
#7 lore raw

PATCH 1/4 arm: m28evk: Test if bootscript exists before loading it

In reply to Marek Vasut
Quoted 6 lines · Marek Vasut

Make sure the boot.scr exists on the card before loading it from the card to avoid annoying message on the console.

---

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
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
=====================================================================