Merge branch 'master' of git://git.denx.de/u-boot-net

[platform/kernel/u-boot.git] / include / configs / display5.h

diff --git a/include/configs/display5.h b/include/configs/display5.h
index c4cd2ff..6d00699 100644 (file)
--- a/include/configs/display5.h
+++ b/include/configs/display5.h
@@ -36,9 +36,7 @@
  */
 
 #ifndef CONFIG_SPL_BUILD
-#define CONFIG_MTD_DEVICE
 #define CONFIG_SPI_FLASH_MTD
-#define CONFIG_MTD_PARTITIONS
 #endif
 
 /* Below values are "dummy" - only to avoid build break */
@@ -56,7 +54,6 @@
 
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (16 * 1024 * 1024)
-#define CONFIG_MISC_INIT_R
 
 /*#define CONFIG_MXC_UART*/
 #define CONFIG_MXC_UART_BASE           UART5_BASE
@@ -86,7 +83,6 @@
 #define CONFIG_FEC_XCV_TYPE            RGMII
 #define CONFIG_ETHPRIME                        "FEC"
 #define CONFIG_FEC_MXC_PHYADDR         0
-#define CONFIG_MII
 #endif
 
 /* MMC Configs */
@@ -116,34 +112,23 @@
        "name=kernel_raw1,start=128K,size=8M,uuid=${uuid_gpt_kernel_raw1};" \
        "name=rootfs1,size=1528M,uuid=${uuid_gpt_rootfs1};" \
        "name=kernel_raw2,size=8M,uuid=${uuid_gpt_kernel_raw2};" \
-       "name=rootfs2,size=1528M,uuid=${uuid_gpt_rootfs2};" \
+       "name=rootfs2,size=512M,uuid=${uuid_gpt_rootfs2};" \
        "name=data,size=-,uuid=${uuid_gpt_data}\0"
 
-#define FACTORY_PROCEDURE \
-       "echo '#######################';" \
-       "echo '# Factory Boot        #';" \
-       "echo '#######################';" \
-       "env default -a;" \
-       "saveenv;" \
-       "gpt write mmc ${mmcdev} ${partitions};" \
-       "run tftp_sf_SPL;" \
-       "run tftp_sf_uboot;" \
-       TFTP_UPDATE_KERNEL \
-       "run tftp_sf_fitImg_SWU;" \
-       "run tftp_sf_initramfs_SWU;" \
-       TFTP_UPDATE_ROOTFS \
-       "echo '#######################';" \
-       "echo '# END - OK            #';" \
-       "echo '#######################';" \
-       "setenv bootcmd 'env default -a; saveenv; run falcon_setup; reset';" \
-       "setenv boot_os 'n';" \
-       "saveenv;" \
-       "reset;"
-
 #define SWUPDATE_RECOVERY_PROCEDURE \
        "echo '#######################';" \
        "echo '# RECOVERY SWUupdate  #';" \
        "echo '#######################';" \
+       "echo '#######################';" \
+       "echo '# GPT verify          #';" \
+       "if gpt verify mmc ${mmcdev} ${partitions}; then " \
+               "echo '# OK !                #';" \
+       "else " \
+               "echo '# FAILED !            #';" \
+               "echo '# GPT RESTORATION     #';" \
+               "gpt write mmc ${mmcdev} ${partitions};" \
+       "fi;" \
+       "echo '#######################';" \
        "setenv loadaddr_swu_initramfs 0x14000000;" \
        "setenv bootargs console=${console} " \
                "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \
@@ -160,7 +145,7 @@
                      "rootwait rootfstype=ext4 rw; " \
        "run set_kernel_part;" \
        "part start mmc ${mmcdev} ${kernel_part} lba_start; " \
-       "mmc read ${loadaddr} ${lba_start} 0x2000; " \
+       "mmc read ${loadaddr} ${lba_start} ${fitImg_fw_sz}; " \
        "setenv fdt_conf imx6q-${board}-${display}.dtb; "
 
 /* All the numbers are in LBAs */
@@ -194,13 +179,11 @@
               "mmc write ${loadaddr} ${lba_start} ${fw_sz}; " \
           "; fi\0" \
 
-/* To save some considerable time, we only once download the rootfs image */
-/* and store it on 'active' and 'backup' rootfs partitions */
 #define TFTP_UPDATE_ROOTFS \
        "setenv rootfs_part ${rootfs_part_active};" \
        "run tftp_mmc_rootfs;" \
-       "part start mmc ${mmcdev} ${rootfs_part_backup} lba_start;" \
-       "mmc write ${loadaddr} ${lba_start} ${fw_sz};" \
+       "run tftp_mmc_rootfs_bkp;" \
+
 
 #define TFTP_UPDATE_RECOVERY_SWU_KERNEL \
        "tftp_sf_fitImg_SWU=" \
@@ -211,7 +194,7 @@
        "; fi\0"          \
 
 #define TFTP_UPDATE_RECOVERY_SWU_INITRAMFS \
-       "swu_initramfs_file=swupdate-image-display5.ext3.gz.u-boot\0" \
+       "swu_initramfs_file=swupdate-image-display5.ext4.gz.u-boot\0" \
        "tftp_sf_initramfs_SWU=" \
            "if tftp ${loadaddr} ${swu_initramfs_file}; then " \
                "sf probe;" \
@@ -257,19 +240,18 @@
        "bootdelay=1\0" \
        "baudrate=115200\0" \
        "bootcmd=" CONFIG_BOOTCOMMAND "\0" \
-       "factory=" FACTORY_PROCEDURE "\0" \
-       "bootlimit=3\0" \
        "ethact=FEC\0" \
        "netdev=eth0\0" \
        "boot_os=y\0" \
        "hostname=display5\0" \
        "loadaddr=0x12000000\0" \
        "fdtaddr=0x12800000\0" \
-       "console=ttymxc4,115200 quiet\0" \
+       "console=ttymxc4,115200 quiet cma=256M\0" \
        "fdtfile=imx6q-display5.dtb\0" \
        "fdt_high=0xffffffff\0" \
        "initrd_high=0xffffffff\0" \
        "kernel_file=fitImage\0" \
+       "fitImg_fw_sz=0x2200\0" \
        "up=run tftp_sf_SPL; run tftp_sf_uboot\0" \
        "download_kernel=" \
                "tftpboot ${loadaddr} ${kernel_file};\0" \
@@ -348,7 +330,12 @@
        "rootfs_part_active=2\0" \
        "rootfs_part_backup=4\0" \
        "rootfs_file=core-image-lwn-display5.ext4\0" \
+       "rootfs_file_backup=core-image-lwn-backup-display5.ext4\0" \
        __TFTP_UPDATE_ROOTFS \
+       "tftp_mmc_rootfs_bkp=" \
+          "setenv rootfs_part ${rootfs_part_backup};" \
+          "setenv rootfs_file ${rootfs_file_backup};" \
+          "run tftp_mmc_rootfs\0" \
        TFTP_UPDATE_RECOVERY_SWU_KERNEL \
        TFTP_UPDATE_RECOVERY_SWU_INITRAMFS \
        "\0" \
@@ -367,7 +354,6 @@
 #define CONFIG_SYS_HZ                  1000
 
 /* Physical Memory Map */
-#define CONFIG_NR_DRAM_BANKS           1
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
 
@@ -380,8 +366,11 @@
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* Commands */
-#define CONFIG_MTD_PARTITIONS
-#define CONFIG_MTD_DEVICE
+
+/* Watchdog */
+#define CONFIG_HW_WATCHDOG
+#define CONFIG_IMX_WATCHDOG
+#define CONFIG_WATCHDOG_TIMEOUT_MSECS   15000
 
 /* ENV config */
 #ifdef CONFIG_ENV_IS_IN_SPI_FLASH