i2S-6ULY2: boot command on script from UBIFS partition

include/configs/i2s6ull_common.h

@@ -93,7 +93,11 @@
 #elif defined(CONFIG_SYS_BOOT_NAND)
 /* i2S-6ULL NAND variant */
 #define CONFIG_SYS_USE_NAND
+#ifdef CONFIG_SDCARD
+#define CONFIG_ENV_IS_IN_MMC
+#else
 #define CONFIG_ENV_IS_IN_NAND
+#endif
 #define CONFIG_CMD_MTDPARTS
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
@@ -106,12 +110,16 @@
 #elif defined(CONFIG_SYS_BOOT_EMMC)
 /* i2S-6ULL eMMC variant */
 #define CONFIG_ENV_IS_IN_MMC
+#ifdef CONFIG_SDCARD
+#define CONFIG_SYS_MMC_ENV_DEV		0	/* USDHC1 */
+#else
 #define CONFIG_SYS_MMC_ENV_DEV		1	/* USDHC2 */
+#endif
 #define CONFIG_SYS_MMC_ENV_PART		1	/* user area */
 
 #endif
 
-#if defined(CONFIG_ENV_IS_IN_MMC)
+#if defined(CONFIG_ENV_IS_IN_MMC) || defined(CONFIG_SDCARD)
 #define CONFIG_ENV_OFFSET		(8 * SZ_64K)
 #define CONFIG_ENV_SIZE			SZ_8K
 #elif defined(CONFIG_ENV_IS_IN_SPI_FLASH)

include/configs/i2som_6ull_14x14.h

@@ -63,7 +63,7 @@
 #define CONFIG_MFG_NAND_PARTITION "mtdparts=gpmi-nand:" \
 				"5m(bootloader),1m(env),1m(safe)," \
 				"16m(linux)," \
-				"16m(recovery)," \
+				"32m(recovery)," \
 				"150m(rootfs)," \
 				"-(data) "
 #define CONFIG_FDT_FILE "findfdt="\
@@ -112,13 +112,20 @@
 	CONFIG_MFG_ENV_SETTINGS \
 	"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
 	"mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
-	"fdt_file=zImage-i2c-b6ull-nand.dtb\0" \
+	"fdt_file=zImage-i2c6ulxb-nand.dtb\0" \
 	"panel=TFT43AB\0" \
 	"fdt_addr=0x83000000\0" \
 	"fdt_high=0xffffffff\0" \
 	"console=ttymxc0\0" \
 	"mtdids=nand0=gpmi-nand\0" \
-	"zimage=zImage-i2c-b6ull.bin\0" \
+	"zimage=zImage\0" \
+	"mtdbootpart=linux\0" \
+	"script=boot.scr\0" \
+	"loadscript=if ubi part ${mtdbootpart}; then " \
+		"if ubifsmount ubi0:${mtdbootpart}; then " \
+			"ubifsload ${loadaddr} ${script};" \
+		"fi;" \
+	"fi;\0" \
 	"bootargs=console=ttymxc0,115200 ubi.mtd=5 " \
 		"root=ubi0:rootfs rootfstype=ubifs " \
 		CONFIG_MFG_NAND_PARTITION \
@@ -126,7 +133,7 @@
 	"mtdparts=gpmi-nand:" \
 		"5m(bootloader),1m(env),1m(safe)," \
 		"16m(linux)," \
-		"16m(recovery)," \
+		"32m(recovery)," \
 		"150m(rootfs)," \
 		"-(data) \0"
 #ifdef CONFIG_SDCARD
@@ -140,10 +147,9 @@
 
 #else
 #define CONFIG_BOOTCOMMAND \
-	"ubi part linux && ubifsmount ubi0:linux && " \
-		"ubifsload ${loadaddr} ${zimage} && " \
-		"ubifsload ${fdt_addr} ${fdt_file} && " \
-		"bootz ${loadaddr} - ${fdt_addr}"
+	"if run loadscript; then " \
+		"source ${loadaddr};" \
+	"fi;"
 
 #endif
 #elif defined(CONFIG_SYS_BOOT_EMMC)
@@ -155,7 +161,7 @@
 	"console=ttymxc0\0" \
 	"fdt_high=0xffffffff\0" \
 	"initrd_high=0xffffffff\0" \
-	"fdt_file=zImage-i2c-b6ull-emmc.dtb\0" \
+	"fdt_file=zImage-i2c6ulxbe.dtb\0" \
 	"fdt_addr=0x83000000\0" \
 	"boot_fdt=try\0" \
 	"ip_dyn=yes\0" \