[U-Boot] [PATCH 02/10] imx6: engicam: Use bootm instead of bootz

public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed

From: Jagan Teki <jagan@openedev.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 02/10] imx6: engicam: Use bootm instead of bootz
Date: Wed, 21 Dec 2016 12:00:21 +0100	[thread overview]
Message-ID: <1482318029-21701-3-git-send-email-jagan@openedev.com> (raw)
In-Reply-To: <1482318029-21701-1-git-send-email-jagan@openedev.com>

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

next prev parent reply	other threads:[~2016-12-21 11:00 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 [this message]
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

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:5f09425 dfblob:2ac0e66 dfblob:af3a9f8 dfblob:4e81a41
dfblob:230cd20 dfblob:0757371 dfblob:8f812b4 dfblob:551c688
dfblob:4735be8 dfblob:274e62b dfblob:f7c25c4 dfblob:e29afa0
dfblob:d5be076 dfblob:4aaf93d dfblob:cc45602 dfblob:a21c53a
dfblob:0125385 dfblob:d57c73e dfblob:0121563 dfblob:0f39dcb
dfblob:787da08 dfblob:7c8a420 )
 OR (
bs:"[U-Boot] [PATCH 02/10] imx6: engicam: Use bootm instead of bootz" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1482318029-21701-3-git-send-email-jagan@openedev.com \
    --to=jagan@openedev.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox