imx6: engicam: Use bootm instead of bootz

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>

diff --git a/configs/imx6dl_icore_mmc_defconfig b/configs/imx6dl_icore_mmc_defconfig
index f17fdca1cfd22ae1f9a0d84897b06874878e8e27..dc9012819f23e4bcc71dd47c741eb0f13c7f5085 100644 (file)
--- a/configs/imx6dl_icore_mmc_defconfig
+++ b/configs/imx6dl_icore_mmc_defconfig
@@ -16,7 +16,6 @@ CONFIG_DEFAULT_FDT_FILE="imx6dl-icore.dtb"
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="icorem6qdl> "
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="icorem6qdl> "

-CONFIG_CMD_BOOTZ=y

 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MMC=y
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MMC=y

diff --git a/configs/imx6dl_icore_nand_defconfig b/configs/imx6dl_icore_nand_defconfig
index 16d9d2d2e8d72bda7aecfc66d1ee3e94de3d635e..400097da282473bae679c61e20261965f315c88a 100644 (file)
--- a/configs/imx6dl_icore_nand_defconfig
+++ b/configs/imx6dl_icore_nand_defconfig
@@ -15,7 +15,6 @@ CONFIG_SPL=y
 CONFIG_SPL_DMA_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="icorem6qdl> "
 CONFIG_SPL_DMA_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="icorem6qdl> "

-CONFIG_CMD_BOOTZ=y

 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_NAND=y

diff --git a/configs/imx6dl_icore_rqs_mmc_defconfig b/configs/imx6dl_icore_rqs_mmc_defconfig
index c3044b4d83cc2608d8ee8bb8b6c8dfe63494eeb1..a362fb24f25f7a5e59b39e6d6449c730d0b2e844 100644 (file)
--- a/configs/imx6dl_icore_rqs_mmc_defconfig
+++ b/configs/imx6dl_icore_rqs_mmc_defconfig
@@ -15,7 +15,6 @@ CONFIG_DEFAULT_FDT_FILE="imx6dl-icore-rqs.dtb"
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="icorem6qdl-rqs> "
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="icorem6qdl-rqs> "

-CONFIG_CMD_BOOTZ=y

 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MMC=y
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MMC=y

diff --git a/configs/imx6q_icore_mmc_defconfig b/configs/imx6q_icore_mmc_defconfig
index f9cee87779a18bc19baed2d7313e66d44fcca7c3..a94879116520a699ca6aa660e9abc2bdc08b3429 100644 (file)
--- a/configs/imx6q_icore_mmc_defconfig
+++ b/configs/imx6q_icore_mmc_defconfig
@@ -16,7 +16,6 @@ CONFIG_DEFAULT_FDT_FILE="imx6q-icore.dtb"
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="icorem6qdl> "
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="icorem6qdl> "

-CONFIG_CMD_BOOTZ=y

 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MMC=y
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MMC=y

diff --git a/configs/imx6q_icore_nand_defconfig b/configs/imx6q_icore_nand_defconfig
index 5221a719a81ad755eec4a3cd23dfc1375e7aca2d..ba9a976e987aa185750136d1b9a56134a09733d9 100644 (file)
--- a/configs/imx6q_icore_nand_defconfig
+++ b/configs/imx6q_icore_nand_defconfig
@@ -15,7 +15,6 @@ CONFIG_SPL=y
 CONFIG_SPL_DMA_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="icorem6qdl> "
 CONFIG_SPL_DMA_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="icorem6qdl> "

-CONFIG_CMD_BOOTZ=y

 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_NAND=y

diff --git a/configs/imx6q_icore_rqs_mmc_defconfig b/configs/imx6q_icore_rqs_mmc_defconfig
index 1fbebc3877eabc0cd10ba1cf7ae37ed5b7600845..a895cca8d4b20a46af8d5ad13cf357c93cd3119f 100644 (file)
--- a/configs/imx6q_icore_rqs_mmc_defconfig
+++ b/configs/imx6q_icore_rqs_mmc_defconfig
@@ -15,7 +15,6 @@ CONFIG_DEFAULT_FDT_FILE="imx6q-icore-rqs.dtb"
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="icorem6qdl-rqs> "
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="icorem6qdl-rqs> "

-CONFIG_CMD_BOOTZ=y

 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MMC=y
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MMC=y

diff --git a/configs/imx6ul_geam_mmc_defconfig b/configs/imx6ul_geam_mmc_defconfig
index 4740de5834040b3f08c4ba5f63a4cae879c66be0..e8cc82600aa3aecf14ca1ef84aca96aecc05ee7c 100644 (file)
--- a/configs/imx6ul_geam_mmc_defconfig
+++ b/configs/imx6ul_geam_mmc_defconfig
@@ -15,7 +15,6 @@ CONFIG_DEFAULT_FDT_FILE="imx6ul-geam-kit.dtb"
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="geam6ul> "
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="geam6ul> "

-CONFIG_CMD_BOOTZ=y

 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MMC=y
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MMC=y

diff --git a/configs/imx6ul_geam_nand_defconfig b/configs/imx6ul_geam_nand_defconfig
index 4eb72b8b1022cda2314b1a1d9bc3bbe847cf00dc..fe40b58491bf91689b45f43d917ed2c9bb14e60b 100644 (file)
--- a/configs/imx6ul_geam_nand_defconfig
+++ b/configs/imx6ul_geam_nand_defconfig
@@ -14,7 +14,6 @@ CONFIG_SPL=y
 CONFIG_SPL_DMA_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="geam6ul> "
 CONFIG_SPL_DMA_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="geam6ul> "

-CONFIG_CMD_BOOTZ=y

 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_NAND=y

diff --git a/include/configs/imx6qdl_icore.h b/include/configs/imx6qdl_icore.h
index 012538570799e4b6116f8c401db2c848c3373884..d57c73e9069a5b7af1fb6f9530e9f09953d1bc19 100644 (file)
--- 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" \
 #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" \
        "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 " \
                "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 " \
                        "else " \
                                "if test ${boot_fdt} = try; then " \

-                                       "bootz; " \
+                                       "bootm; " \

                                "else " \
                                        "echo WARN: Cannot load the DT; " \
                                "fi; " \
                        "fi; " \
                "else " \
                                "else " \
                                        "echo WARN: Cannot load the DT; " \
                                "fi; " \
                        "fi; " \
                "else " \

-                       "bootz; " \
+                       "bootm; " \

                "fi\0"
 
 #define CONFIG_BOOTCOMMAND \
                "fi\0"
 
 #define CONFIG_BOOTCOMMAND \

diff --git a/include/configs/imx6qdl_icore_rqs.h b/include/configs/imx6qdl_icore_rqs.h
index 01215631b6b6cd107039d5ef68705f3f972fa2fe..0f39dcbf35f4361dba5676a8870f1761ea7ff6fb 100644 (file)
--- 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" \
 /* 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" \
        "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 " \
                "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 " \
                        "else " \
                                "if test ${boot_fdt} = try; then " \

-                                       "bootz; " \
+                                       "bootm; " \

                                "else " \
                                        "echo WARN: Cannot load the DT; " \
                                "fi; " \
                        "fi; " \
                "else " \
                                "else " \
                                        "echo WARN: Cannot load the DT; " \
                                "fi; " \
                        "fi; " \
                "else " \

-                       "bootz; " \
+                       "bootm; " \

                "fi\0"
 
 #define CONFIG_BOOTCOMMAND \
                "fi\0"
 
 #define CONFIG_BOOTCOMMAND \

diff --git a/include/configs/imx6ul_geam.h b/include/configs/imx6ul_geam.h
index 787da08260189de3eedecca98517caf9bd90f6e7..7c8a420d0dc575b00f0d27c2b81eeea179189bc1 100644 (file)
--- 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" \
 /* 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" \
        "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 " \
                "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 " \
                        "else " \
                                "if test ${boot_fdt} = try; then " \

-                                       "bootz; " \
+                                       "bootm; " \

                                "else " \
                                        "echo WARN: Cannot load the DT; " \
                                "fi; " \
                        "fi; " \
                "else " \
                                "else " \
                                        "echo WARN: Cannot load the DT; " \
                                "fi; " \
                        "fi; " \
                "else " \

-                       "bootz; " \
+                       "bootm; " \

                "fi\0"
 
 #define CONFIG_BOOTCOMMAND \
                "fi\0"
 
 #define CONFIG_BOOTCOMMAND \