diff options
author | Tom Rini <trini@konsulko.com> | 2015-03-18 07:07:43 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-03-18 07:07:43 -0400 |
commit | a538ae997ae4cb375ba5362b50ba3f5b35f9519b (patch) | |
tree | 3f709a9137f1af222c125e17a0075290dfe740f8 /include/configs/warp.h | |
parent | 8c8dc4c61518124eb35f4dd9d8466378ba247e9c (diff) | |
parent | d5eb6dcf44f5c889dd80c81cf3b06385a27f8baf (diff) | |
download | talos-obmc-uboot-a538ae997ae4cb375ba5362b50ba3f5b35f9519b.tar.gz talos-obmc-uboot-a538ae997ae4cb375ba5362b50ba3f5b35f9519b.zip |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'include/configs/warp.h')
-rw-r--r-- | include/configs/warp.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/include/configs/warp.h b/include/configs/warp.h index bcdd1125f9..2eb429e5dd 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -28,7 +28,7 @@ #define CONFIG_REVISION_TAG /* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (3 * SZ_1M) +#define CONFIG_SYS_MALLOC_LEN (35 * SZ_1M) /* Increase due to DFU */ #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT @@ -42,6 +42,7 @@ #define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_FORCE_VSELECT +#define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE #define CONFIG_MMC #define CONFIG_CMD_MMC @@ -81,9 +82,6 @@ #define CONFIG_HW_WATCHDOG #define CONFIG_IMX_WATCHDOG #define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000 /* 30s */ - -/* Print Buffer Size */ -#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE @@ -150,6 +148,12 @@ #define CONFIG_G_DNL_PRODUCT_NUM 0xa4a5 #define CONFIG_G_DNL_MANUFACTURER "FSL" +#define CONFIG_CMD_DFU +#define CONFIG_DFU_FUNCTION +#define CONFIG_DFU_MMC +#define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_32M +#define DFU_DEFAULT_POLL_TIMEOUT 300 + #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ @@ -164,6 +168,7 @@ "mmcdev=0\0" \ "mmcpart=1\0" \ "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \ + "dfu_alt_info=boot raw 0x2 0x400 mmcpart 1\0" \ "mmcargs=setenv bootargs console=${console},${baudrate} " \ "root=${mmcroot}\0" \ "loadbootscript=" \ |