* [U-Boot] [PATCH 00/10] i.MX6: engicam: Add nandboot env and FIT support
@ 2016-12-21 11:00 Jagan Teki
2016-12-21 11:00 ` [U-Boot] [PATCH 01/10] configs: engicam: Increase nand kernel partition size Jagan Teki
` (11 more replies)
0 siblings, 12 replies; 16+ messages in thread
From: Jagan Teki @ 2016-12-21 11:00 UTC (permalink / raw)
To: u-boot
From: Jagan Teki <jagan@amarulasolutions.com>
This patchset, add support for
- legacy image boot, with bootm
- NAND boot env support, with UBIFS as rootfs
- FIT image boot support
on i.MX6 based Engicam Quad/DualLite/Dual/Solo module kits.
Jagan Teki (10):
configs: engicam: Increase nand kernel partition size
imx6: engicam: Use bootm instead of bootz
configs: engicam: Rename nand with gpmi-name in mtdparts
defconfigs: engicam: Enable MMC commands in nand
defconfigs: engicam: Enable UBI commands
imx6: engicam: Add nandboot env support
defconfigs: imx6: engicam: Enable FIT
configs: engicam: Enable CONFIG_IMAGE_FORMAT_LEGACY
configs: engicam: Cleanup on mmcboot env
configs: engicam: Add fitboot env support
configs/imx6dl_icore_mmc_defconfig | 4 +-
configs/imx6dl_icore_nand_defconfig | 10 ++++-
configs/imx6dl_icore_rqs_mmc_defconfig | 4 +-
configs/imx6q_icore_mmc_defconfig | 4 +-
configs/imx6q_icore_nand_defconfig | 10 ++++-
configs/imx6q_icore_rqs_mmc_defconfig | 4 +-
configs/imx6ul_geam_mmc_defconfig | 4 +-
configs/imx6ul_geam_nand_defconfig | 10 ++++-
include/configs/imx6qdl_icore.h | 77 +++++++++++++++++++++++++---------
include/configs/imx6qdl_icore_rqs.h | 43 +++++++++++++------
include/configs/imx6ul_geam.h | 76 ++++++++++++++++++++++++---------
11 files changed, 187 insertions(+), 59 deletions(-)
--
1.9.1
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH 01/10] configs: engicam: Increase nand kernel partition size
2016-12-21 11:00 [U-Boot] [PATCH 00/10] i.MX6: engicam: Add nandboot env and FIT support Jagan Teki
@ 2016-12-21 11:00 ` Jagan Teki
2016-12-21 11:00 ` [U-Boot] [PATCH 02/10] imx6: engicam: Use bootm instead of bootz Jagan Teki
` (10 subsequent siblings)
11 siblings, 0 replies; 16+ messages in thread
From: Jagan Teki @ 2016-12-21 11:00 UTC (permalink / raw)
To: u-boot
From: Jagan Teki <jagan@amarulasolutions.com>
Increase the nand kernel partition size, for supporting
large uImage files, maximum 8MiB.
Cc: Stefano Babic <sbabic@denx.de>
Cc: Matteo Lisi <matteo.lisi@engicam.com>
Cc: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
include/configs/imx6qdl_icore.h | 2 +-
include/configs/imx6ul_geam.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/configs/imx6qdl_icore.h b/include/configs/imx6qdl_icore.h
index 204e96e..0125385 100644
--- a/include/configs/imx6qdl_icore.h
+++ b/include/configs/imx6qdl_icore.h
@@ -131,7 +131,7 @@
# define CONFIG_MTD_PARTITIONS
# define MTDIDS_DEFAULT "nand0=nand"
# define MTDPARTS_DEFAULT "mtdparts=nand:2m(spl),2m(uboot)," \
- "1m(env),4m(kernel),1m(dtb),-(rootfs)"
+ "1m(env),8m(kernel),1m(dtb),-(rootfs)"
# define CONFIG_APBH_DMA
# define CONFIG_APBH_DMA_BURST
diff --git a/include/configs/imx6ul_geam.h b/include/configs/imx6ul_geam.h
index 48b1120..787da08 100644
--- a/include/configs/imx6ul_geam.h
+++ b/include/configs/imx6ul_geam.h
@@ -130,7 +130,7 @@
# define CONFIG_MTD_PARTITIONS
# define MTDIDS_DEFAULT "nand0=nand"
# define MTDPARTS_DEFAULT "mtdparts=nand:2m(spl),2m(uboot)," \
- "1m(env),4m(kernel),1m(dtb),-(rootfs)"
+ "1m(env),8m(kernel),1m(dtb),-(rootfs)"
# define CONFIG_APBH_DMA
# define CONFIG_APBH_DMA_BURST
--
1.9.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH 02/10] imx6: engicam: Use bootm instead of bootz
2016-12-21 11:00 [U-Boot] [PATCH 00/10] i.MX6: engicam: Add nandboot env and FIT support Jagan Teki
2016-12-21 11:00 ` [U-Boot] [PATCH 01/10] configs: engicam: Increase nand kernel partition size Jagan Teki
@ 2016-12-21 11:00 ` Jagan Teki
2016-12-21 11:00 ` [U-Boot] [PATCH 03/10] configs: engicam: Rename nand with gpmi-name in mtdparts Jagan Teki
` (9 subsequent siblings)
11 siblings, 0 replies; 16+ messages in thread
From: Jagan Teki @ 2016-12-21 11:00 UTC (permalink / raw)
To: u-boot
From: Jagan Teki <jagan@amarulasolutions.com>
Boot Linux with uImage instead of zImage, so update
bootz with bootm.
Cc: Stefano Babic <sbabic@denx.de>
Cc: Matteo Lisi <matteo.lisi@engicam.com>
Cc: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
configs/imx6dl_icore_mmc_defconfig | 1 -
configs/imx6dl_icore_nand_defconfig | 1 -
configs/imx6dl_icore_rqs_mmc_defconfig | 1 -
configs/imx6q_icore_mmc_defconfig | 1 -
configs/imx6q_icore_nand_defconfig | 1 -
configs/imx6q_icore_rqs_mmc_defconfig | 1 -
configs/imx6ul_geam_mmc_defconfig | 1 -
configs/imx6ul_geam_nand_defconfig | 1 -
include/configs/imx6qdl_icore.h | 8 ++++----
include/configs/imx6qdl_icore_rqs.h | 8 ++++----
include/configs/imx6ul_geam.h | 8 ++++----
11 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/configs/imx6dl_icore_mmc_defconfig b/configs/imx6dl_icore_mmc_defconfig
index 5f09425..2ac0e66 100644
--- a/configs/imx6dl_icore_mmc_defconfig
+++ b/configs/imx6dl_icore_mmc_defconfig
@@ -15,7 +15,6 @@ CONFIG_SYS_MAXARGS=32
# CONFIG_CMD_IMLS is not set
# CONFIG_BLK is not set
# CONFIG_DM_MMC_OPS is not set
-CONFIG_CMD_BOOTZ=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_I2C=y
CONFIG_CMD_MII=y
diff --git a/configs/imx6dl_icore_nand_defconfig b/configs/imx6dl_icore_nand_defconfig
index af3a9f8..4e81a41 100644
--- a/configs/imx6dl_icore_nand_defconfig
+++ b/configs/imx6dl_icore_nand_defconfig
@@ -13,7 +13,6 @@ CONFIG_HUSH_PARSER=y
CONFIG_AUTO_COMPLETE=y
CONFIG_SYS_MAXARGS=32
# CONFIG_CMD_IMLS is not set
-CONFIG_CMD_BOOTZ=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_I2C=y
CONFIG_CMD_MII=y
diff --git a/configs/imx6dl_icore_rqs_mmc_defconfig b/configs/imx6dl_icore_rqs_mmc_defconfig
index 230cd20..0757371 100644
--- a/configs/imx6dl_icore_rqs_mmc_defconfig
+++ b/configs/imx6dl_icore_rqs_mmc_defconfig
@@ -15,7 +15,6 @@ CONFIG_SYS_MAXARGS=32
# CONFIG_CMD_IMLS is not set
# CONFIG_BLK is not set
# CONFIG_DM_MMC_OPS is not set
-CONFIG_CMD_BOOTZ=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_MEMTEST=y
CONFIG_CMD_MII=y
diff --git a/configs/imx6q_icore_mmc_defconfig b/configs/imx6q_icore_mmc_defconfig
index 8f812b4..551c688 100644
--- a/configs/imx6q_icore_mmc_defconfig
+++ b/configs/imx6q_icore_mmc_defconfig
@@ -15,7 +15,6 @@ CONFIG_SYS_MAXARGS=32
# CONFIG_CMD_IMLS is not set
# CONFIG_BLK is not set
# CONFIG_DM_MMC_OPS is not set
-CONFIG_CMD_BOOTZ=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_I2C=y
CONFIG_CMD_MII=y
diff --git a/configs/imx6q_icore_nand_defconfig b/configs/imx6q_icore_nand_defconfig
index 4735be8..274e62b 100644
--- a/configs/imx6q_icore_nand_defconfig
+++ b/configs/imx6q_icore_nand_defconfig
@@ -13,7 +13,6 @@ CONFIG_HUSH_PARSER=y
CONFIG_AUTO_COMPLETE=y
CONFIG_SYS_MAXARGS=32
# CONFIG_CMD_IMLS is not set
-CONFIG_CMD_BOOTZ=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_I2C=y
CONFIG_CMD_MII=y
diff --git a/configs/imx6q_icore_rqs_mmc_defconfig b/configs/imx6q_icore_rqs_mmc_defconfig
index f7c25c4..e29afa0 100644
--- a/configs/imx6q_icore_rqs_mmc_defconfig
+++ b/configs/imx6q_icore_rqs_mmc_defconfig
@@ -15,7 +15,6 @@ CONFIG_SYS_MAXARGS=32
# CONFIG_CMD_IMLS is not set
# CONFIG_BLK is not set
# CONFIG_DM_MMC_OPS is not set
-CONFIG_CMD_BOOTZ=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_MEMTEST=y
CONFIG_CMD_MII=y
diff --git a/configs/imx6ul_geam_mmc_defconfig b/configs/imx6ul_geam_mmc_defconfig
index d5be076..4aaf93d 100644
--- a/configs/imx6ul_geam_mmc_defconfig
+++ b/configs/imx6ul_geam_mmc_defconfig
@@ -15,7 +15,6 @@ CONFIG_SYS_MAXARGS=32
# CONFIG_CMD_IMLS is not set
# CONFIG_BLK is not set
# CONFIG_DM_MMC_OPS is not set
-CONFIG_CMD_BOOTZ=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_MEMTEST=y
CONFIG_CMD_MII=y
diff --git a/configs/imx6ul_geam_nand_defconfig b/configs/imx6ul_geam_nand_defconfig
index cc45602..a21c53a 100644
--- a/configs/imx6ul_geam_nand_defconfig
+++ b/configs/imx6ul_geam_nand_defconfig
@@ -15,7 +15,6 @@ CONFIG_SYS_MAXARGS=32
# CONFIG_CMD_IMLS is not set
# CONFIG_BLK is not set
# CONFIG_DM_MMC_OPS is not set
-CONFIG_CMD_BOOTZ=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_MEMTEST=y
CONFIG_CMD_MII=y
diff --git a/include/configs/imx6qdl_icore.h b/include/configs/imx6qdl_icore.h
index 0125385..d57c73e 100644
--- a/include/configs/imx6qdl_icore.h
+++ b/include/configs/imx6qdl_icore.h
@@ -38,7 +38,7 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
"script=boot.scr\0" \
"splashpos=m,m\0" \
- "image=zImage\0" \
+ "image=uImage\0" \
"console=ttymxc3\0" \
"fdt_high=0xffffffff\0" \
"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
@@ -60,16 +60,16 @@
"run mmcargs; " \
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
"if run loadfdt; then " \
- "bootz ${loadaddr} - ${fdt_addr}; " \
+ "bootm ${loadaddr} - ${fdt_addr}; " \
"else " \
"if test ${boot_fdt} = try; then " \
- "bootz; " \
+ "bootm; " \
"else " \
"echo WARN: Cannot load the DT; " \
"fi; " \
"fi; " \
"else " \
- "bootz; " \
+ "bootm; " \
"fi\0"
#define CONFIG_BOOTCOMMAND \
diff --git a/include/configs/imx6qdl_icore_rqs.h b/include/configs/imx6qdl_icore_rqs.h
index 0121563..0f39dcb 100644
--- a/include/configs/imx6qdl_icore_rqs.h
+++ b/include/configs/imx6qdl_icore_rqs.h
@@ -33,7 +33,7 @@
/* Default environment */
#define CONFIG_EXTRA_ENV_SETTINGS \
"script=boot.scr\0" \
- "image=zImage\0" \
+ "image=uImage\0" \
"console=ttymxc3\0" \
"fdt_high=0xffffffff\0" \
"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
@@ -55,16 +55,16 @@
"run mmcargs; " \
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
"if run loadfdt; then " \
- "bootz ${loadaddr} - ${fdt_addr}; " \
+ "bootm ${loadaddr} - ${fdt_addr}; " \
"else " \
"if test ${boot_fdt} = try; then " \
- "bootz; " \
+ "bootm; " \
"else " \
"echo WARN: Cannot load the DT; " \
"fi; " \
"fi; " \
"else " \
- "bootz; " \
+ "bootm; " \
"fi\0"
#define CONFIG_BOOTCOMMAND \
diff --git a/include/configs/imx6ul_geam.h b/include/configs/imx6ul_geam.h
index 787da08..7c8a420 100644
--- a/include/configs/imx6ul_geam.h
+++ b/include/configs/imx6ul_geam.h
@@ -37,7 +37,7 @@
/* Default environment */
#define CONFIG_EXTRA_ENV_SETTINGS \
"script=boot.scr\0" \
- "image=zImage\0" \
+ "image=uImage\0" \
"console=ttymxc0\0" \
"fdt_high=0xffffffff\0" \
"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
@@ -59,16 +59,16 @@
"run mmcargs; " \
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
"if run loadfdt; then " \
- "bootz ${loadaddr} - ${fdt_addr}; " \
+ "bootm ${loadaddr} - ${fdt_addr}; " \
"else " \
"if test ${boot_fdt} = try; then " \
- "bootz; " \
+ "bootm; " \
"else " \
"echo WARN: Cannot load the DT; " \
"fi; " \
"fi; " \
"else " \
- "bootz; " \
+ "bootm; " \
"fi\0"
#define CONFIG_BOOTCOMMAND \
--
1.9.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH 03/10] configs: engicam: Rename nand with gpmi-name in mtdparts
2016-12-21 11:00 [U-Boot] [PATCH 00/10] i.MX6: engicam: Add nandboot env and FIT support Jagan Teki
2016-12-21 11:00 ` [U-Boot] [PATCH 01/10] configs: engicam: Increase nand kernel partition size Jagan Teki
2016-12-21 11:00 ` [U-Boot] [PATCH 02/10] imx6: engicam: Use bootm instead of bootz Jagan Teki
@ 2016-12-21 11:00 ` Jagan Teki
2016-12-21 11:00 ` [U-Boot] [PATCH 04/10] defconfigs: engicam: Enable MMC commands in nand Jagan Teki
` (8 subsequent siblings)
11 siblings, 0 replies; 16+ messages in thread
From: Jagan Teki @ 2016-12-21 11:00 UTC (permalink / raw)
To: u-boot
From: Jagan Teki <jagan@amarulasolutions.com>
gpmi-nand is the proper name used in nand driver from Linux for all
imx related nand boards, so rename mtdparts name as gpmi-nand instead
of nand, this will eventually reflects all nand info to Linux from
u-boot like mtdparts.
Cc: Stefano Babic <sbabic@denx.de>
Cc: Matteo Lisi <matteo.lisi@engicam.com>
Cc: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
include/configs/imx6qdl_icore.h | 4 ++--
include/configs/imx6ul_geam.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/configs/imx6qdl_icore.h b/include/configs/imx6qdl_icore.h
index d57c73e..3848a6f 100644
--- a/include/configs/imx6qdl_icore.h
+++ b/include/configs/imx6qdl_icore.h
@@ -129,8 +129,8 @@
# define CONFIG_MTD_DEVICE
# define CONFIG_CMD_MTDPARTS
# define CONFIG_MTD_PARTITIONS
-# define MTDIDS_DEFAULT "nand0=nand"
-# define MTDPARTS_DEFAULT "mtdparts=nand:2m(spl),2m(uboot)," \
+# define MTDIDS_DEFAULT "nand0=gpmi-nand"
+# define MTDPARTS_DEFAULT "mtdparts=gpmi-nand:2m(spl),2m(uboot)," \
"1m(env),8m(kernel),1m(dtb),-(rootfs)"
# define CONFIG_APBH_DMA
diff --git a/include/configs/imx6ul_geam.h b/include/configs/imx6ul_geam.h
index 7c8a420..e925c8f 100644
--- a/include/configs/imx6ul_geam.h
+++ b/include/configs/imx6ul_geam.h
@@ -128,8 +128,8 @@
# define CONFIG_MTD_DEVICE
# define CONFIG_CMD_MTDPARTS
# define CONFIG_MTD_PARTITIONS
-# define MTDIDS_DEFAULT "nand0=nand"
-# define MTDPARTS_DEFAULT "mtdparts=nand:2m(spl),2m(uboot)," \
+# define MTDIDS_DEFAULT "nand0=gpmi-nand"
+# define MTDPARTS_DEFAULT "mtdparts=gpmi-nand:2m(spl),2m(uboot)," \
"1m(env),8m(kernel),1m(dtb),-(rootfs)"
# define CONFIG_APBH_DMA
--
1.9.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH 04/10] defconfigs: engicam: Enable MMC commands in nand
2016-12-21 11:00 [U-Boot] [PATCH 00/10] i.MX6: engicam: Add nandboot env and FIT support Jagan Teki
` (2 preceding siblings ...)
2016-12-21 11:00 ` [U-Boot] [PATCH 03/10] configs: engicam: Rename nand with gpmi-name in mtdparts Jagan Teki
@ 2016-12-21 11:00 ` Jagan Teki
2016-12-21 11:00 ` [U-Boot] [PATCH 05/10] defconfigs: engicam: Enable UBI commands Jagan Teki
` (7 subsequent siblings)
11 siblings, 0 replies; 16+ messages in thread
From: Jagan Teki @ 2016-12-21 11:00 UTC (permalink / raw)
To: u-boot
From: Jagan Teki <jagan@amarulasolutions.com>
For writing Linux or rootfs on to NAND, the best suitable way
is to use MMC commands since MMC driver by default enabled by
mx6_common.h, hence enabled MMC commands in nand defconfigs.
Cc: Stefano Babic <sbabic@denx.de>
Cc: Matteo Lisi <matteo.lisi@engicam.com>
Cc: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
configs/imx6dl_icore_nand_defconfig | 5 +++++
configs/imx6q_icore_nand_defconfig | 5 +++++
configs/imx6ul_geam_nand_defconfig | 5 +++++
3 files changed, 15 insertions(+)
diff --git a/configs/imx6dl_icore_nand_defconfig b/configs/imx6dl_icore_nand_defconfig
index 4e81a41..7f45744 100644
--- a/configs/imx6dl_icore_nand_defconfig
+++ b/configs/imx6dl_icore_nand_defconfig
@@ -18,8 +18,13 @@ CONFIG_CMD_I2C=y
CONFIG_CMD_MII=y
CONFIG_CMD_PING=y
CONFIG_CMD_MEMTEST=y
+CONFIG_CMD_MMC=y
CONFIG_CMD_NAND=y
CONFIG_CMD_CACHE=y
+CONFIG_CMD_EXT4=y
+CONFIG_CMD_EXT4_WRITE=y
+CONFIG_CMD_FAT=y
+CONFIG_CMD_FS_GENERIC=y
CONFIG_OF_LIBFDT=y
CONFIG_FEC_MXC=y
CONFIG_MXC_UART=y
diff --git a/configs/imx6q_icore_nand_defconfig b/configs/imx6q_icore_nand_defconfig
index 274e62b..572e33a 100644
--- a/configs/imx6q_icore_nand_defconfig
+++ b/configs/imx6q_icore_nand_defconfig
@@ -18,8 +18,13 @@ CONFIG_CMD_I2C=y
CONFIG_CMD_MII=y
CONFIG_CMD_PING=y
CONFIG_CMD_MEMTEST=y
+CONFIG_CMD_MMC=y
CONFIG_CMD_NAND=y
CONFIG_CMD_CACHE=y
+CONFIG_CMD_EXT4=y
+CONFIG_CMD_EXT4_WRITE=y
+CONFIG_CMD_FAT=y
+CONFIG_CMD_FS_GENERIC=y
CONFIG_OF_LIBFDT=y
CONFIG_FEC_MXC=y
CONFIG_MXC_UART=y
diff --git a/configs/imx6ul_geam_nand_defconfig b/configs/imx6ul_geam_nand_defconfig
index a21c53a..55fa003 100644
--- a/configs/imx6ul_geam_nand_defconfig
+++ b/configs/imx6ul_geam_nand_defconfig
@@ -17,10 +17,15 @@ CONFIG_SYS_MAXARGS=32
# CONFIG_DM_MMC_OPS is not set
CONFIG_CMD_GPIO=y
CONFIG_CMD_MEMTEST=y
+CONFIG_CMD_MMC=y
CONFIG_CMD_MII=y
CONFIG_CMD_PING=y
CONFIG_CMD_NAND=y
CONFIG_CMD_CACHE=y
+CONFIG_CMD_EXT4=y
+CONFIG_CMD_EXT4_WRITE=y
+CONFIG_CMD_FAT=y
+CONFIG_CMD_FS_GENERIC=y
CONFIG_OF_LIBFDT=y
CONFIG_FEC_MXC=y
CONFIG_MXC_UART=y
--
1.9.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH 05/10] defconfigs: engicam: Enable UBI commands
2016-12-21 11:00 [U-Boot] [PATCH 00/10] i.MX6: engicam: Add nandboot env and FIT support Jagan Teki
` (3 preceding siblings ...)
2016-12-21 11:00 ` [U-Boot] [PATCH 04/10] defconfigs: engicam: Enable MMC commands in nand Jagan Teki
@ 2016-12-21 11:00 ` Jagan Teki
2016-12-21 11:00 ` [U-Boot] [PATCH 06/10] imx6: engicam: Add nandboot env support Jagan Teki
` (6 subsequent siblings)
11 siblings, 0 replies; 16+ messages in thread
From: Jagan Teki @ 2016-12-21 11:00 UTC (permalink / raw)
To: u-boot
From: Jagan Teki <jagan@amarulasolutions.com>
Create ubifs.img:
$ mkfs.ubifs -q -r /rootfs -m 4096 -e 253952 -c 7936 -o ubifs.img
Write ubifs.img:
---------------
icorem6qdl> nand erase.part rootfs
icorem6qdl> ubi part rootfs
icorem6qdl> ubi create rootfs
icorem6qdl> ext4load mmc 0:2 ${loadaddr} ubifs.img
166592512 bytes read in 8091 ms (19.6 MiB/s)
icorem6qdl> ubi write ${loadaddr} rootfs ${filesize}
166592512 bytes written to volume rootfs
icorem6qdl> ubifsmount ubi0:rootfs
Cc: Stefano Babic <sbabic@denx.de>
Cc: Matteo Lisi <matteo.lisi@engicam.com>
Cc: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
configs/imx6dl_icore_nand_defconfig | 1 +
configs/imx6q_icore_nand_defconfig | 1 +
configs/imx6ul_geam_nand_defconfig | 1 +
include/configs/imx6qdl_icore.h | 5 +++++
include/configs/imx6ul_geam.h | 5 +++++
5 files changed, 13 insertions(+)
diff --git a/configs/imx6dl_icore_nand_defconfig b/configs/imx6dl_icore_nand_defconfig
index 7f45744..67397c3 100644
--- a/configs/imx6dl_icore_nand_defconfig
+++ b/configs/imx6dl_icore_nand_defconfig
@@ -20,6 +20,7 @@ CONFIG_CMD_PING=y
CONFIG_CMD_MEMTEST=y
CONFIG_CMD_MMC=y
CONFIG_CMD_NAND=y
+CONFIG_CMD_UBI=y
CONFIG_CMD_CACHE=y
CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
diff --git a/configs/imx6q_icore_nand_defconfig b/configs/imx6q_icore_nand_defconfig
index 572e33a..350dc0d 100644
--- a/configs/imx6q_icore_nand_defconfig
+++ b/configs/imx6q_icore_nand_defconfig
@@ -20,6 +20,7 @@ CONFIG_CMD_PING=y
CONFIG_CMD_MEMTEST=y
CONFIG_CMD_MMC=y
CONFIG_CMD_NAND=y
+CONFIG_CMD_UBI=y
CONFIG_CMD_CACHE=y
CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
diff --git a/configs/imx6ul_geam_nand_defconfig b/configs/imx6ul_geam_nand_defconfig
index 55fa003..6d8336d 100644
--- a/configs/imx6ul_geam_nand_defconfig
+++ b/configs/imx6ul_geam_nand_defconfig
@@ -21,6 +21,7 @@ CONFIG_CMD_MMC=y
CONFIG_CMD_MII=y
CONFIG_CMD_PING=y
CONFIG_CMD_NAND=y
+CONFIG_CMD_UBI=y
CONFIG_CMD_CACHE=y
CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
diff --git a/include/configs/imx6qdl_icore.h b/include/configs/imx6qdl_icore.h
index 3848a6f..55eb100 100644
--- a/include/configs/imx6qdl_icore.h
+++ b/include/configs/imx6qdl_icore.h
@@ -133,6 +133,11 @@
# define MTDPARTS_DEFAULT "mtdparts=gpmi-nand:2m(spl),2m(uboot)," \
"1m(env),8m(kernel),1m(dtb),-(rootfs)"
+/* UBI */
+# define CONFIG_CMD_UBIFS
+# define CONFIG_RBTREE
+# define CONFIG_LZO
+
# define CONFIG_APBH_DMA
# define CONFIG_APBH_DMA_BURST
# define CONFIG_APBH_DMA_BURST8
diff --git a/include/configs/imx6ul_geam.h b/include/configs/imx6ul_geam.h
index e925c8f..3e26a81 100644
--- a/include/configs/imx6ul_geam.h
+++ b/include/configs/imx6ul_geam.h
@@ -132,6 +132,11 @@
# define MTDPARTS_DEFAULT "mtdparts=gpmi-nand:2m(spl),2m(uboot)," \
"1m(env),8m(kernel),1m(dtb),-(rootfs)"
+/* UBI */
+# define CONFIG_CMD_UBIFS
+# define CONFIG_RBTREE
+# define CONFIG_LZO
+
# define CONFIG_APBH_DMA
# define CONFIG_APBH_DMA_BURST
# define CONFIG_APBH_DMA_BURST8
--
1.9.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH 06/10] imx6: engicam: Add nandboot env support
2016-12-21 11:00 [U-Boot] [PATCH 00/10] i.MX6: engicam: Add nandboot env and FIT support Jagan Teki
` (4 preceding siblings ...)
2016-12-21 11:00 ` [U-Boot] [PATCH 05/10] defconfigs: engicam: Enable UBI commands Jagan Teki
@ 2016-12-21 11:00 ` Jagan Teki
2016-12-21 11:00 ` [U-Boot] [PATCH 07/10] defconfigs: imx6: engicam: Enable FIT Jagan Teki
` (5 subsequent siblings)
11 siblings, 0 replies; 16+ messages in thread
From: Jagan Teki @ 2016-12-21 11:00 UTC (permalink / raw)
To: u-boot
From: Jagan Teki <jagan@amarulasolutions.com>
Add config options for booting Linux from NAND in UBI format.
Cc: Stefano Babic <sbabic@denx.de>
Cc: Matteo Lisi <matteo.lisi@engicam.com>
Cc: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
include/configs/imx6qdl_icore.h | 21 +++++++++++++++++++--
include/configs/imx6ul_geam.h | 21 +++++++++++++++++++--
2 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/include/configs/imx6qdl_icore.h b/include/configs/imx6qdl_icore.h
index 55eb100..9d5951f 100644
--- a/include/configs/imx6qdl_icore.h
+++ b/include/configs/imx6qdl_icore.h
@@ -47,9 +47,12 @@
"mmcdev=0\0" \
"mmcpart=1\0" \
"mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
+ "nandroot=ubi0:rootfs rootfstype=ubifs\0" \
"mmcautodetect=yes\0" \
"mmcargs=setenv bootargs console=${console},${baudrate} " \
"root=${mmcroot}\0" \
+ "ubiargs=setenv bootargs console=${console},${baudrate} " \
+ "ubi.mtd=5 root=${nandroot} ${mtdparts}\0" \
"loadbootscript=" \
"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
"bootscript=echo Running bootscript from mmc ...; " \
@@ -70,9 +73,22 @@
"fi; " \
"else " \
"bootm; " \
- "fi\0"
+ "fi\0" \
+ "nandboot=echo Booting from nand ...; " \
+ "if mtdparts; then " \
+ "echo Starting nand boot ...; " \
+ "else " \
+ "mtdparts default; " \
+ "fi; " \
+ "run ubiargs; " \
+ "nand read ${loadaddr} kernel 0x800000; " \
+ "nand read ${fdt_addr} dtb 0x100000; " \
+ "bootm ${loadaddr} - ${fdt_addr}\0"
-#define CONFIG_BOOTCOMMAND \
+#ifdef CONFIG_NAND_MXS
+# define CONFIG_BOOTCOMMAND "run nandboot"
+#else
+# define CONFIG_BOOTCOMMAND \
"mmc dev ${mmcdev};" \
"mmc dev ${mmcdev}; if mmc rescan; then " \
"if run loadbootscript; then " \
@@ -83,6 +99,7 @@
"fi; " \
"fi; " \
"fi"
+#endif
/* Miscellaneous configurable options */
#define CONFIG_SYS_MEMTEST_START 0x80000000
diff --git a/include/configs/imx6ul_geam.h b/include/configs/imx6ul_geam.h
index 3e26a81..507e743 100644
--- a/include/configs/imx6ul_geam.h
+++ b/include/configs/imx6ul_geam.h
@@ -46,9 +46,12 @@
"mmcdev=0\0" \
"mmcpart=1\0" \
"mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
+ "nandroot=ubi0:rootfs rootfstype=ubifs\0" \
"mmcautodetect=yes\0" \
"mmcargs=setenv bootargs console=${console},${baudrate} " \
"root=${mmcroot}\0" \
+ "ubiargs=setenv bootargs console=${console},${baudrate} " \
+ "ubi.mtd=5 root=${nandroot} ${mtdparts}\0" \
"loadbootscript=" \
"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
"bootscript=echo Running bootscript from mmc ...; " \
@@ -69,9 +72,22 @@
"fi; " \
"else " \
"bootm; " \
- "fi\0"
+ "fi\0" \
+ "nandboot=echo Booting from nand ...; " \
+ "if mtdparts; then " \
+ "echo Starting nand boot ...; " \
+ "else " \
+ "mtdparts default; " \
+ "fi; " \
+ "run ubiargs; " \
+ "nand read ${loadaddr} kernel 0x800000; " \
+ "nand read ${fdt_addr} dtb 0x100000; " \
+ "bootm ${loadaddr} - ${fdt_addr}\0"
-#define CONFIG_BOOTCOMMAND \
+#ifdef CONFIG_NAND_MXS
+# define CONFIG_BOOTCOMMAND "run nandboot"
+#else
+# define CONFIG_BOOTCOMMAND \
"mmc dev ${mmcdev};" \
"mmc dev ${mmcdev}; if mmc rescan; then " \
"if run loadbootscript; then " \
@@ -82,6 +98,7 @@
"fi; " \
"fi; " \
"fi"
+#endif
/* Miscellaneous configurable options */
#define CONFIG_SYS_MEMTEST_START 0x80000000
--
1.9.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH 07/10] defconfigs: imx6: engicam: Enable FIT
2016-12-21 11:00 [U-Boot] [PATCH 00/10] i.MX6: engicam: Add nandboot env and FIT support Jagan Teki
` (5 preceding siblings ...)
2016-12-21 11:00 ` [U-Boot] [PATCH 06/10] imx6: engicam: Add nandboot env support Jagan Teki
@ 2016-12-21 11:00 ` Jagan Teki
2016-12-21 11:00 ` [U-Boot] [PATCH 08/10] configs: engicam: Enable CONFIG_IMAGE_FORMAT_LEGACY Jagan Teki
` (4 subsequent siblings)
11 siblings, 0 replies; 16+ messages in thread
From: Jagan Teki @ 2016-12-21 11:00 UTC (permalink / raw)
To: u-boot
From: Jagan Teki <jagan@amarulasolutions.com>
Enable Flattened Image Tree support for all Engicam boards.
Cc: Stefano Babic <sbabic@denx.de>
Cc: Matteo Lisi <matteo.lisi@engicam.com>
Cc: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
configs/imx6dl_icore_mmc_defconfig | 3 +++
configs/imx6dl_icore_nand_defconfig | 3 +++
configs/imx6dl_icore_rqs_mmc_defconfig | 3 +++
configs/imx6q_icore_mmc_defconfig | 3 +++
configs/imx6q_icore_nand_defconfig | 3 +++
configs/imx6q_icore_rqs_mmc_defconfig | 3 +++
configs/imx6ul_geam_mmc_defconfig | 3 +++
configs/imx6ul_geam_nand_defconfig | 3 +++
include/configs/imx6qdl_icore.h | 7 +++++++
include/configs/imx6qdl_icore_rqs.h | 7 +++++++
include/configs/imx6ul_geam.h | 7 +++++++
11 files changed, 45 insertions(+)
diff --git a/configs/imx6dl_icore_mmc_defconfig b/configs/imx6dl_icore_mmc_defconfig
index 2ac0e66..9a50349 100644
--- a/configs/imx6dl_icore_mmc_defconfig
+++ b/configs/imx6dl_icore_mmc_defconfig
@@ -12,6 +12,9 @@ CONFIG_DISPLAY_CPUINFO=y
CONFIG_HUSH_PARSER=y
CONFIG_AUTO_COMPLETE=y
CONFIG_SYS_MAXARGS=32
+CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
+CONFIG_FIT_SIGNATURE=y
# CONFIG_CMD_IMLS is not set
# CONFIG_BLK is not set
# CONFIG_DM_MMC_OPS is not set
diff --git a/configs/imx6dl_icore_nand_defconfig b/configs/imx6dl_icore_nand_defconfig
index 67397c3..957bb7d 100644
--- a/configs/imx6dl_icore_nand_defconfig
+++ b/configs/imx6dl_icore_nand_defconfig
@@ -12,6 +12,9 @@ CONFIG_DISPLAY_CPUINFO=y
CONFIG_HUSH_PARSER=y
CONFIG_AUTO_COMPLETE=y
CONFIG_SYS_MAXARGS=32
+CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
+CONFIG_FIT_SIGNATURE=y
# CONFIG_CMD_IMLS is not set
CONFIG_CMD_GPIO=y
CONFIG_CMD_I2C=y
diff --git a/configs/imx6dl_icore_rqs_mmc_defconfig b/configs/imx6dl_icore_rqs_mmc_defconfig
index 0757371..9d91837 100644
--- a/configs/imx6dl_icore_rqs_mmc_defconfig
+++ b/configs/imx6dl_icore_rqs_mmc_defconfig
@@ -12,6 +12,9 @@ CONFIG_DISPLAY_CPUINFO=y
CONFIG_HUSH_PARSER=y
CONFIG_AUTO_COMPLETE=y
CONFIG_SYS_MAXARGS=32
+CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
+CONFIG_FIT_SIGNATURE=y
# CONFIG_CMD_IMLS is not set
# CONFIG_BLK is not set
# CONFIG_DM_MMC_OPS is not set
diff --git a/configs/imx6q_icore_mmc_defconfig b/configs/imx6q_icore_mmc_defconfig
index 551c688..d3d210f 100644
--- a/configs/imx6q_icore_mmc_defconfig
+++ b/configs/imx6q_icore_mmc_defconfig
@@ -12,6 +12,9 @@ CONFIG_DISPLAY_CPUINFO=y
CONFIG_HUSH_PARSER=y
CONFIG_AUTO_COMPLETE=y
CONFIG_SYS_MAXARGS=32
+CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
+CONFIG_FIT_SIGNATURE=y
# CONFIG_CMD_IMLS is not set
# CONFIG_BLK is not set
# CONFIG_DM_MMC_OPS is not set
diff --git a/configs/imx6q_icore_nand_defconfig b/configs/imx6q_icore_nand_defconfig
index 350dc0d..50ad76c 100644
--- a/configs/imx6q_icore_nand_defconfig
+++ b/configs/imx6q_icore_nand_defconfig
@@ -12,6 +12,9 @@ CONFIG_DISPLAY_CPUINFO=y
CONFIG_HUSH_PARSER=y
CONFIG_AUTO_COMPLETE=y
CONFIG_SYS_MAXARGS=32
+CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
+CONFIG_FIT_SIGNATURE=y
# CONFIG_CMD_IMLS is not set
CONFIG_CMD_GPIO=y
CONFIG_CMD_I2C=y
diff --git a/configs/imx6q_icore_rqs_mmc_defconfig b/configs/imx6q_icore_rqs_mmc_defconfig
index e29afa0..1dcb232 100644
--- a/configs/imx6q_icore_rqs_mmc_defconfig
+++ b/configs/imx6q_icore_rqs_mmc_defconfig
@@ -12,6 +12,9 @@ CONFIG_DISPLAY_CPUINFO=y
CONFIG_HUSH_PARSER=y
CONFIG_AUTO_COMPLETE=y
CONFIG_SYS_MAXARGS=32
+CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
+CONFIG_FIT_SIGNATURE=y
# CONFIG_CMD_IMLS is not set
# CONFIG_BLK is not set
# CONFIG_DM_MMC_OPS is not set
diff --git a/configs/imx6ul_geam_mmc_defconfig b/configs/imx6ul_geam_mmc_defconfig
index 4aaf93d..ca59fa5 100644
--- a/configs/imx6ul_geam_mmc_defconfig
+++ b/configs/imx6ul_geam_mmc_defconfig
@@ -12,6 +12,9 @@ CONFIG_DISPLAY_CPUINFO=y
CONFIG_HUSH_PARSER=y
CONFIG_AUTO_COMPLETE=y
CONFIG_SYS_MAXARGS=32
+CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
+CONFIG_FIT_SIGNATURE=y
# CONFIG_CMD_IMLS is not set
# CONFIG_BLK is not set
# CONFIG_DM_MMC_OPS is not set
diff --git a/configs/imx6ul_geam_nand_defconfig b/configs/imx6ul_geam_nand_defconfig
index 6d8336d..71ef06a 100644
--- a/configs/imx6ul_geam_nand_defconfig
+++ b/configs/imx6ul_geam_nand_defconfig
@@ -12,6 +12,9 @@ CONFIG_DISPLAY_CPUINFO=y
CONFIG_HUSH_PARSER=y
CONFIG_AUTO_COMPLETE=y
CONFIG_SYS_MAXARGS=32
+CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
+CONFIG_FIT_SIGNATURE=y
# CONFIG_CMD_IMLS is not set
# CONFIG_BLK is not set
# CONFIG_DM_MMC_OPS is not set
diff --git a/include/configs/imx6qdl_icore.h b/include/configs/imx6qdl_icore.h
index 9d5951f..2c07a9b 100644
--- a/include/configs/imx6qdl_icore.h
+++ b/include/configs/imx6qdl_icore.h
@@ -121,6 +121,13 @@
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + \
CONFIG_SYS_INIT_SP_OFFSET)
+/* FIT */
+#ifdef CONFIG_FIT
+# define CONFIG_HASH_VERIFY
+# define CONFIG_SHA1
+# define CONFIG_SHA256
+#endif
+
/* UART */
#ifdef CONFIG_MXC_UART
# define CONFIG_MXC_UART_BASE UART4_BASE
diff --git a/include/configs/imx6qdl_icore_rqs.h b/include/configs/imx6qdl_icore_rqs.h
index 0f39dcb..c36359b 100644
--- a/include/configs/imx6qdl_icore_rqs.h
+++ b/include/configs/imx6qdl_icore_rqs.h
@@ -99,6 +99,13 @@
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + \
CONFIG_SYS_INIT_SP_OFFSET)
+/* FIT */
+#ifdef CONFIG_FIT
+# define CONFIG_HASH_VERIFY
+# define CONFIG_SHA1
+# define CONFIG_SHA256
+#endif
+
/* UART */
#ifdef CONFIG_MXC_UART
# define CONFIG_MXC_UART_BASE UART4_BASE
diff --git a/include/configs/imx6ul_geam.h b/include/configs/imx6ul_geam.h
index 507e743..5a4f291 100644
--- a/include/configs/imx6ul_geam.h
+++ b/include/configs/imx6ul_geam.h
@@ -120,6 +120,13 @@
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + \
CONFIG_SYS_INIT_SP_OFFSET)
+/* FIT */
+#ifdef CONFIG_FIT
+# define CONFIG_HASH_VERIFY
+# define CONFIG_SHA1
+# define CONFIG_SHA256
+#endif
+
/* UART */
#ifdef CONFIG_MXC_UART
# define CONFIG_MXC_UART_BASE UART1_BASE
--
1.9.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH 08/10] configs: engicam: Enable CONFIG_IMAGE_FORMAT_LEGACY
2016-12-21 11:00 [U-Boot] [PATCH 00/10] i.MX6: engicam: Add nandboot env and FIT support Jagan Teki
` (6 preceding siblings ...)
2016-12-21 11:00 ` [U-Boot] [PATCH 07/10] defconfigs: imx6: engicam: Enable FIT Jagan Teki
@ 2016-12-21 11:00 ` Jagan Teki
2016-12-21 11:00 ` [U-Boot] [PATCH 09/10] configs: engicam: Cleanup on mmcboot env Jagan Teki
` (3 subsequent siblings)
11 siblings, 0 replies; 16+ messages in thread
From: Jagan Teki @ 2016-12-21 11:00 UTC (permalink / raw)
To: u-boot
From: Jagan Teki <jagan@amarulasolutions.com>
Enabling FIT along with Signature will make bootm to
not-understanding u-boot legacy image formats like uImage, etc.
So this patch enabling legacy image format for backward compatibility.
Cc: Stefano Babic <sbabic@denx.de>
Cc: Matteo Lisi <matteo.lisi@engicam.com>
Cc: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
include/configs/imx6qdl_icore.h | 1 +
include/configs/imx6qdl_icore_rqs.h | 1 +
include/configs/imx6ul_geam.h | 1 +
3 files changed, 3 insertions(+)
diff --git a/include/configs/imx6qdl_icore.h b/include/configs/imx6qdl_icore.h
index 2c07a9b..f25f364 100644
--- a/include/configs/imx6qdl_icore.h
+++ b/include/configs/imx6qdl_icore.h
@@ -126,6 +126,7 @@
# define CONFIG_HASH_VERIFY
# define CONFIG_SHA1
# define CONFIG_SHA256
+# define CONFIG_IMAGE_FORMAT_LEGACY
#endif
/* UART */
diff --git a/include/configs/imx6qdl_icore_rqs.h b/include/configs/imx6qdl_icore_rqs.h
index c36359b..ee25882 100644
--- a/include/configs/imx6qdl_icore_rqs.h
+++ b/include/configs/imx6qdl_icore_rqs.h
@@ -104,6 +104,7 @@
# define CONFIG_HASH_VERIFY
# define CONFIG_SHA1
# define CONFIG_SHA256
+# define CONFIG_IMAGE_FORMAT_LEGACY
#endif
/* UART */
diff --git a/include/configs/imx6ul_geam.h b/include/configs/imx6ul_geam.h
index 5a4f291..a8ee401 100644
--- a/include/configs/imx6ul_geam.h
+++ b/include/configs/imx6ul_geam.h
@@ -125,6 +125,7 @@
# define CONFIG_HASH_VERIFY
# define CONFIG_SHA1
# define CONFIG_SHA256
+# define CONFIG_IMAGE_FORMAT_LEGACY
#endif
/* UART */
--
1.9.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH 09/10] configs: engicam: Cleanup on mmcboot env
2016-12-21 11:00 [U-Boot] [PATCH 00/10] i.MX6: engicam: Add nandboot env and FIT support Jagan Teki
` (7 preceding siblings ...)
2016-12-21 11:00 ` [U-Boot] [PATCH 08/10] configs: engicam: Enable CONFIG_IMAGE_FORMAT_LEGACY Jagan Teki
@ 2016-12-21 11:00 ` Jagan Teki
2016-12-21 11:00 ` [U-Boot] [PATCH 10/10] configs: engicam: Add fitboot env support Jagan Teki
` (2 subsequent siblings)
11 siblings, 0 replies; 16+ messages in thread
From: Jagan Teki @ 2016-12-21 11:00 UTC (permalink / raw)
To: u-boot
From: Jagan Teki <jagan@amarulasolutions.com>
- Add tab space
- remove exctra 'mmc dev ${mmcdev}'
Cc: Stefano Babic <sbabic@denx.de>
Cc: Matteo Lisi <matteo.lisi@engicam.com>
Cc: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
include/configs/imx6qdl_icore.h | 14 +++++++-------
include/configs/imx6qdl_icore_rqs.h | 14 +++++++-------
include/configs/imx6ul_geam.h | 13 ++++++-------
3 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/include/configs/imx6qdl_icore.h b/include/configs/imx6qdl_icore.h
index f25f364..2c255e2 100644
--- a/include/configs/imx6qdl_icore.h
+++ b/include/configs/imx6qdl_icore.h
@@ -89,16 +89,16 @@
# define CONFIG_BOOTCOMMAND "run nandboot"
#else
# define CONFIG_BOOTCOMMAND \
- "mmc dev ${mmcdev};" \
- "mmc dev ${mmcdev}; if mmc rescan; then " \
- "if run loadbootscript; then " \
- "run bootscript; " \
- "else " \
+ "mmc dev ${mmcdev};" \
+ "if mmc rescan; then " \
+ "if run loadbootscript; then " \
+ "run bootscript; " \
+ "else " \
"if run loadimage; then " \
"run mmcboot; " \
"fi; " \
- "fi; " \
- "fi"
+ "fi; " \
+ "fi"
#endif
/* Miscellaneous configurable options */
diff --git a/include/configs/imx6qdl_icore_rqs.h b/include/configs/imx6qdl_icore_rqs.h
index ee25882..6f297c1 100644
--- a/include/configs/imx6qdl_icore_rqs.h
+++ b/include/configs/imx6qdl_icore_rqs.h
@@ -68,16 +68,16 @@
"fi\0"
#define CONFIG_BOOTCOMMAND \
- "mmc dev ${mmcdev};" \
- "mmc dev ${mmcdev}; if mmc rescan; then " \
- "if run loadbootscript; then " \
- "run bootscript; " \
- "else " \
+ "mmc dev ${mmcdev};" \
+ "if mmc rescan; then " \
+ "if run loadbootscript; then " \
+ "run bootscript; " \
+ "else " \
"if run loadimage; then " \
"run mmcboot; " \
"fi; " \
- "fi; " \
- "fi"
+ "fi; " \
+ "fi"
/* Miscellaneous configurable options */
#define CONFIG_SYS_MEMTEST_START 0x80000000
diff --git a/include/configs/imx6ul_geam.h b/include/configs/imx6ul_geam.h
index a8ee401..8d91fed 100644
--- a/include/configs/imx6ul_geam.h
+++ b/include/configs/imx6ul_geam.h
@@ -88,16 +88,15 @@
# define CONFIG_BOOTCOMMAND "run nandboot"
#else
# define CONFIG_BOOTCOMMAND \
- "mmc dev ${mmcdev};" \
- "mmc dev ${mmcdev}; if mmc rescan; then " \
- "if run loadbootscript; then " \
- "run bootscript; " \
- "else " \
+ "if mmc rescan; then " \
+ "if run loadbootscript; then " \
+ "run bootscript; " \
+ "else " \
"if run loadimage; then " \
"run mmcboot; " \
"fi; " \
- "fi; " \
- "fi"
+ "fi; " \
+ "fi"
#endif
/* Miscellaneous configurable options */
--
1.9.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH 10/10] configs: engicam: Add fitboot env support
2016-12-21 11:00 [U-Boot] [PATCH 00/10] i.MX6: engicam: Add nandboot env and FIT support Jagan Teki
` (8 preceding siblings ...)
2016-12-21 11:00 ` [U-Boot] [PATCH 09/10] configs: engicam: Cleanup on mmcboot env Jagan Teki
@ 2016-12-21 11:00 ` Jagan Teki
2016-12-29 13:37 ` [U-Boot] [PATCH 00/10] i.MX6: engicam: Add nandboot env and FIT support Jagan Teki
2017-01-02 16:52 ` Stefano Babic
11 siblings, 0 replies; 16+ messages in thread
From: Jagan Teki @ 2016-12-21 11:00 UTC (permalink / raw)
To: u-boot
From: Jagan Teki <jagan@amarulasolutions.com>
Add FIT image booting from MMC device, during MMC bootcmd
u-boot env script look for bootscript, else fit image or else
finally look for legacy image uImage.
Cc: Stefano Babic <sbabic@denx.de>
Cc: Matteo Lisi <matteo.lisi@engicam.com>
Cc: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
include/configs/imx6qdl_icore.h | 13 +++++++++++--
include/configs/imx6qdl_icore_rqs.h | 13 +++++++++++--
include/configs/imx6ul_geam.h | 13 +++++++++++--
3 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/include/configs/imx6qdl_icore.h b/include/configs/imx6qdl_icore.h
index 2c255e2..eb83d23 100644
--- a/include/configs/imx6qdl_icore.h
+++ b/include/configs/imx6qdl_icore.h
@@ -39,6 +39,7 @@
"script=boot.scr\0" \
"splashpos=m,m\0" \
"image=uImage\0" \
+ "fit_image=fit.itb\0" \
"console=ttymxc3\0" \
"fdt_high=0xffffffff\0" \
"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
@@ -59,6 +60,10 @@
"source\0" \
"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
+ "loadfit=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${fit_image}\0" \
+ "fitboot=echo Booting FIT image from mmc ...; " \
+ "run mmcargs; " \
+ "bootm ${loadaddr}\0" \
"mmcboot=echo Booting from mmc ...; " \
"run mmcargs; " \
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
@@ -94,8 +99,12 @@
"if run loadbootscript; then " \
"run bootscript; " \
"else " \
- "if run loadimage; then " \
- "run mmcboot; " \
+ "if run loadfit; then " \
+ "run fitboot; " \
+ "else " \
+ "if run loadimage; then " \
+ "run mmcboot; " \
+ "fi; " \
"fi; " \
"fi; " \
"fi"
diff --git a/include/configs/imx6qdl_icore_rqs.h b/include/configs/imx6qdl_icore_rqs.h
index 6f297c1..6f7195d 100644
--- a/include/configs/imx6qdl_icore_rqs.h
+++ b/include/configs/imx6qdl_icore_rqs.h
@@ -34,6 +34,7 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
"script=boot.scr\0" \
"image=uImage\0" \
+ "fit_image=fit.itb\0" \
"console=ttymxc3\0" \
"fdt_high=0xffffffff\0" \
"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
@@ -51,6 +52,10 @@
"source\0" \
"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
+ "loadfit=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${fit_image}\0" \
+ "fitboot=echo Booting FIT image from mmc ...; " \
+ "run mmcargs; " \
+ "bootm ${loadaddr}\0" \
"mmcboot=echo Booting from mmc ...; " \
"run mmcargs; " \
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
@@ -73,8 +78,12 @@
"if run loadbootscript; then " \
"run bootscript; " \
"else " \
- "if run loadimage; then " \
- "run mmcboot; " \
+ "if run loadfit; then " \
+ "run fitboot; " \
+ "else " \
+ "if run loadimage; then " \
+ "run mmcboot; " \
+ "fi; " \
"fi; " \
"fi; " \
"fi"
diff --git a/include/configs/imx6ul_geam.h b/include/configs/imx6ul_geam.h
index 8d91fed..23fa3ee 100644
--- a/include/configs/imx6ul_geam.h
+++ b/include/configs/imx6ul_geam.h
@@ -38,6 +38,7 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
"script=boot.scr\0" \
"image=uImage\0" \
+ "fit_image=fit.itb\0" \
"console=ttymxc0\0" \
"fdt_high=0xffffffff\0" \
"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
@@ -58,6 +59,10 @@
"source\0" \
"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
+ "loadfit=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${fit_image}\0" \
+ "fitboot=echo Booting FIT image from mmc ...; " \
+ "run mmcargs; " \
+ "bootm ${loadaddr}\0" \
"mmcboot=echo Booting from mmc ...; " \
"run mmcargs; " \
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
@@ -92,8 +97,12 @@
"if run loadbootscript; then " \
"run bootscript; " \
"else " \
- "if run loadimage; then " \
- "run mmcboot; " \
+ "if run loadfit; then " \
+ "run fitboot; " \
+ "else " \
+ "if run loadimage; then " \
+ "run mmcboot; " \
+ "fi; " \
"fi; " \
"fi; " \
"fi"
--
1.9.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH 00/10] i.MX6: engicam: Add nandboot env and FIT support
2016-12-21 11:00 [U-Boot] [PATCH 00/10] i.MX6: engicam: Add nandboot env and FIT support Jagan Teki
` (9 preceding siblings ...)
2016-12-21 11:00 ` [U-Boot] [PATCH 10/10] configs: engicam: Add fitboot env support Jagan Teki
@ 2016-12-29 13:37 ` Jagan Teki
2017-01-01 19:05 ` Jagan Teki
2017-01-02 16:52 ` Stefano Babic
11 siblings, 1 reply; 16+ messages in thread
From: Jagan Teki @ 2016-12-29 13:37 UTC (permalink / raw)
To: u-boot
Hi Stefano,
On Wed, Dec 21, 2016 at 12:00 PM, Jagan Teki <jagan@openedev.com> wrote:
> From: Jagan Teki <jagan@amarulasolutions.com>
>
> This patchset, add support for
> - legacy image boot, with bootm
> - NAND boot env support, with UBIFS as rootfs
> - FIT image boot support
>
> on i.MX6 based Engicam Quad/DualLite/Dual/Solo module kits.
>
> Jagan Teki (10):
> configs: engicam: Increase nand kernel partition size
> imx6: engicam: Use bootm instead of bootz
> configs: engicam: Rename nand with gpmi-name in mtdparts
> defconfigs: engicam: Enable MMC commands in nand
> defconfigs: engicam: Enable UBI commands
> imx6: engicam: Add nandboot env support
> defconfigs: imx6: engicam: Enable FIT
> configs: engicam: Enable CONFIG_IMAGE_FORMAT_LEGACY
> configs: engicam: Cleanup on mmcboot env
> configs: engicam: Add fitboot env support
Please pick this series, buildman works fine.
thanks!
--
Jagan Teki
Free Software Engineer | www.openedev.com
U-Boot, Linux | Upstream Maintainer
Hyderabad, India.
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH 00/10] i.MX6: engicam: Add nandboot env and FIT support
2016-12-29 13:37 ` [U-Boot] [PATCH 00/10] i.MX6: engicam: Add nandboot env and FIT support Jagan Teki
@ 2017-01-01 19:05 ` Jagan Teki
2017-01-02 16:19 ` Stefano Babic
0 siblings, 1 reply; 16+ messages in thread
From: Jagan Teki @ 2017-01-01 19:05 UTC (permalink / raw)
To: u-boot
Hi Stefano,
On Thu, Dec 29, 2016 at 2:37 PM, Jagan Teki <jagannadh.teki@gmail.com> wrote:
> Hi Stefano,
>
> On Wed, Dec 21, 2016 at 12:00 PM, Jagan Teki <jagan@openedev.com> wrote:
>> From: Jagan Teki <jagan@amarulasolutions.com>
>>
>> This patchset, add support for
>> - legacy image boot, with bootm
>> - NAND boot env support, with UBIFS as rootfs
>> - FIT image boot support
>>
>> on i.MX6 based Engicam Quad/DualLite/Dual/Solo module kits.
>>
>> Jagan Teki (10):
>> configs: engicam: Increase nand kernel partition size
>> imx6: engicam: Use bootm instead of bootz
>> configs: engicam: Rename nand with gpmi-name in mtdparts
>> defconfigs: engicam: Enable MMC commands in nand
>> defconfigs: engicam: Enable UBI commands
>> imx6: engicam: Add nandboot env support
>> defconfigs: imx6: engicam: Enable FIT
>> configs: engicam: Enable CONFIG_IMAGE_FORMAT_LEGACY
>> configs: engicam: Cleanup on mmcboot env
>> configs: engicam: Add fitboot env support
>
> Please pick this series, buildman works fine.
Since these changes related to engicam doesn't effect any other, is it
OK if I send PR for this?
thanks!
--
Jagan Teki
Free Software Engineer | www.openedev.com
U-Boot, Linux | Upstream Maintainer
Hyderabad, India.
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH 00/10] i.MX6: engicam: Add nandboot env and FIT support
2017-01-01 19:05 ` Jagan Teki
@ 2017-01-02 16:19 ` Stefano Babic
0 siblings, 0 replies; 16+ messages in thread
From: Stefano Babic @ 2017-01-02 16:19 UTC (permalink / raw)
To: u-boot
On 01/01/2017 20:05, Jagan Teki wrote:
> Hi Stefano,
>
> On Thu, Dec 29, 2016 at 2:37 PM, Jagan Teki <jagannadh.teki@gmail.com> wrote:
>> Hi Stefano,
>>
>> On Wed, Dec 21, 2016 at 12:00 PM, Jagan Teki <jagan@openedev.com> wrote:
>>> From: Jagan Teki <jagan@amarulasolutions.com>
>>>
>>> This patchset, add support for
>>> - legacy image boot, with bootm
>>> - NAND boot env support, with UBIFS as rootfs
>>> - FIT image boot support
>>>
>>> on i.MX6 based Engicam Quad/DualLite/Dual/Solo module kits.
>>>
>>> Jagan Teki (10):
>>> configs: engicam: Increase nand kernel partition size
>>> imx6: engicam: Use bootm instead of bootz
>>> configs: engicam: Rename nand with gpmi-name in mtdparts
>>> defconfigs: engicam: Enable MMC commands in nand
>>> defconfigs: engicam: Enable UBI commands
>>> imx6: engicam: Add nandboot env support
>>> defconfigs: imx6: engicam: Enable FIT
>>> configs: engicam: Enable CONFIG_IMAGE_FORMAT_LEGACY
>>> configs: engicam: Cleanup on mmcboot env
>>> configs: engicam: Add fitboot env support
>>
>> Please pick this series, buildman works fine.
>
> Since these changes related to engicam doesn't effect any other, is it
> OK if I send PR for this?
>
Generally speaking, the series should flow into -next because it was
sent after merge window is closed. But I agree, the series touches just
files for engicam - I will apply it before my (last) PR for this release.
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
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
=====================================================================
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH 00/10] i.MX6: engicam: Add nandboot env and FIT support
2016-12-21 11:00 [U-Boot] [PATCH 00/10] i.MX6: engicam: Add nandboot env and FIT support Jagan Teki
` (10 preceding siblings ...)
2016-12-29 13:37 ` [U-Boot] [PATCH 00/10] i.MX6: engicam: Add nandboot env and FIT support Jagan Teki
@ 2017-01-02 16:52 ` Stefano Babic
2017-01-02 16:58 ` Jagan Teki
11 siblings, 1 reply; 16+ messages in thread
From: Stefano Babic @ 2017-01-02 16:52 UTC (permalink / raw)
To: u-boot
On 21/12/2016 12:00, Jagan Teki wrote:
> From: Jagan Teki <jagan@amarulasolutions.com>
>
> This patchset, add support for
> - legacy image boot, with bootm
> - NAND boot env support, with UBIFS as rootfs
> - FIT image boot support
>
> on i.MX6 based Engicam Quad/DualLite/Dual/Solo module kits.
>
> Jagan Teki (10):
> configs: engicam: Increase nand kernel partition size
> imx6: engicam: Use bootm instead of bootz
> configs: engicam: Rename nand with gpmi-name in mtdparts
> defconfigs: engicam: Enable MMC commands in nand
> defconfigs: engicam: Enable UBI commands
> imx6: engicam: Add nandboot env support
> defconfigs: imx6: engicam: Enable FIT
> configs: engicam: Enable CONFIG_IMAGE_FORMAT_LEGACY
> configs: engicam: Cleanup on mmcboot env
> configs: engicam: Add fitboot env support
>
> configs/imx6dl_icore_mmc_defconfig | 4 +-
> configs/imx6dl_icore_nand_defconfig | 10 ++++-
> configs/imx6dl_icore_rqs_mmc_defconfig | 4 +-
> configs/imx6q_icore_mmc_defconfig | 4 +-
> configs/imx6q_icore_nand_defconfig | 10 ++++-
> configs/imx6q_icore_rqs_mmc_defconfig | 4 +-
> configs/imx6ul_geam_mmc_defconfig | 4 +-
> configs/imx6ul_geam_nand_defconfig | 10 ++++-
> include/configs/imx6qdl_icore.h | 77 +++++++++++++++++++++++++---------
> include/configs/imx6qdl_icore_rqs.h | 43 +++++++++++++------
> include/configs/imx6ul_geam.h | 76 ++++++++++++++++++++++++---------
> 11 files changed, 187 insertions(+), 59 deletions(-)
>
Applied (after small rebasing) to u-boot-imx, -master, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
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
=====================================================================
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH 00/10] i.MX6: engicam: Add nandboot env and FIT support
2017-01-02 16:52 ` Stefano Babic
@ 2017-01-02 16:58 ` Jagan Teki
0 siblings, 0 replies; 16+ messages in thread
From: Jagan Teki @ 2017-01-02 16:58 UTC (permalink / raw)
To: u-boot
On Mon, Jan 2, 2017 at 5:52 PM, Stefano Babic <sbabic@denx.de> wrote:
> On 21/12/2016 12:00, Jagan Teki wrote:
>> From: Jagan Teki <jagan@amarulasolutions.com>
>>
>> This patchset, add support for
>> - legacy image boot, with bootm
>> - NAND boot env support, with UBIFS as rootfs
>> - FIT image boot support
>>
>> on i.MX6 based Engicam Quad/DualLite/Dual/Solo module kits.
>>
>> Jagan Teki (10):
>> configs: engicam: Increase nand kernel partition size
>> imx6: engicam: Use bootm instead of bootz
>> configs: engicam: Rename nand with gpmi-name in mtdparts
>> defconfigs: engicam: Enable MMC commands in nand
>> defconfigs: engicam: Enable UBI commands
>> imx6: engicam: Add nandboot env support
>> defconfigs: imx6: engicam: Enable FIT
>> configs: engicam: Enable CONFIG_IMAGE_FORMAT_LEGACY
>> configs: engicam: Cleanup on mmcboot env
>> configs: engicam: Add fitboot env support
>>
>> configs/imx6dl_icore_mmc_defconfig | 4 +-
>> configs/imx6dl_icore_nand_defconfig | 10 ++++-
>> configs/imx6dl_icore_rqs_mmc_defconfig | 4 +-
>> configs/imx6q_icore_mmc_defconfig | 4 +-
>> configs/imx6q_icore_nand_defconfig | 10 ++++-
>> configs/imx6q_icore_rqs_mmc_defconfig | 4 +-
>> configs/imx6ul_geam_mmc_defconfig | 4 +-
>> configs/imx6ul_geam_nand_defconfig | 10 ++++-
>> include/configs/imx6qdl_icore.h | 77 +++++++++++++++++++++++++---------
>> include/configs/imx6qdl_icore_rqs.h | 43 +++++++++++++------
>> include/configs/imx6ul_geam.h | 76 ++++++++++++++++++++++++---------
>> 11 files changed, 187 insertions(+), 59 deletions(-)
>>
>
> Applied (after small rebasing) to u-boot-imx, -master, thanks !
Thanks.
--
Jagan Teki
Free Software Engineer | www.openedev.com
U-Boot, Linux | Upstream Maintainer
Hyderabad, India.
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2017-01-02 16:58 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-12-21 11:00 [U-Boot] [PATCH 00/10] i.MX6: engicam: Add nandboot env and FIT support Jagan Teki
2016-12-21 11:00 ` [U-Boot] [PATCH 01/10] configs: engicam: Increase nand kernel partition size Jagan Teki
2016-12-21 11:00 ` [U-Boot] [PATCH 02/10] imx6: engicam: Use bootm instead of bootz Jagan Teki
2016-12-21 11:00 ` [U-Boot] [PATCH 03/10] configs: engicam: Rename nand with gpmi-name in mtdparts Jagan Teki
2016-12-21 11:00 ` [U-Boot] [PATCH 04/10] defconfigs: engicam: Enable MMC commands in nand Jagan Teki
2016-12-21 11:00 ` [U-Boot] [PATCH 05/10] defconfigs: engicam: Enable UBI commands Jagan Teki
2016-12-21 11:00 ` [U-Boot] [PATCH 06/10] imx6: engicam: Add nandboot env support Jagan Teki
2016-12-21 11:00 ` [U-Boot] [PATCH 07/10] defconfigs: imx6: engicam: Enable FIT Jagan Teki
2016-12-21 11:00 ` [U-Boot] [PATCH 08/10] configs: engicam: Enable CONFIG_IMAGE_FORMAT_LEGACY Jagan Teki
2016-12-21 11:00 ` [U-Boot] [PATCH 09/10] configs: engicam: Cleanup on mmcboot env Jagan Teki
2016-12-21 11:00 ` [U-Boot] [PATCH 10/10] configs: engicam: Add fitboot env support Jagan Teki
2016-12-29 13:37 ` [U-Boot] [PATCH 00/10] i.MX6: engicam: Add nandboot env and FIT support Jagan Teki
2017-01-01 19:05 ` Jagan Teki
2017-01-02 16:19 ` Stefano Babic
2017-01-02 16:52 ` Stefano Babic
2017-01-02 16:58 ` Jagan Teki
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.