imx6: engicam: Use bootm instead of bootz

[people/ms/u-boot.git] / include / configs / imx6qdl_icore.h

diff --git a/include/configs/imx6qdl_icore.h b/include/configs/imx6qdl_icore.h
index f8a1263eed211a7ad033d932d0ae6ae4527799b1..d57c73e9069a5b7af1fb6f9530e9f09953d1bc19 100644 (file)
--- a/include/configs/imx6qdl_icore.h
+++ b/include/configs/imx6qdl_icore.h
@@ -37,7 +37,8 @@
 /* Default environment */
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "script=boot.scr\0" \
-       "image=zImage\0" \
+       "splashpos=m,m\0" \
+       "image=uImage\0" \
        "console=ttymxc3\0" \
        "fdt_high=0xffffffff\0" \
        "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
@@ -59,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 \
@@ -130,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
@@ -149,6 +150,19 @@
 # define CONFIG_PHY_SMSC
 #endif
 
+/* Framebuffer */
+#ifdef CONFIG_VIDEO_IPUV3
+# define CONFIG_IPUV3_CLK              260000000
+# define CONFIG_IMX_VIDEO_SKIP
+
+# define CONFIG_SPLASH_SCREEN
+# define CONFIG_SPLASH_SCREEN_ALIGN
+# define CONFIG_BMP_16BPP
+# define CONFIG_VIDEO_BMP_RLE8
+# define CONFIG_VIDEO_LOGO
+# define CONFIG_VIDEO_BMP_LOGO
+#endif
+
 /* SPL */
 #ifdef CONFIG_SPL
 # ifdef CONFIG_NAND_MXS