configs: engicam: Add fitboot env support

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>

diff --git a/include/configs/imx6qdl_icore.h b/include/configs/imx6qdl_icore.h
index 2c255e23dc63fee7a988b9869b228f6c6732be66..eb83d237ed89aecd11d7da79f1d1845f35135882 100644 (file)
--- 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 6f297c1941b5453cc60a9f1a132af3796c0d7254..6f7195d9016547491f479490aeb5bbcdcfec4260 100644 (file)
--- 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 8d91fed0827b288a4cc089fd8ed633e28e9045b9..23fa3ee1628e342823eb346384d6234f2e599642 100644 (file)
--- 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"