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 | |
parent | 8c8dc4c61518124eb35f4dd9d8466378ba247e9c (diff) | |
parent | d5eb6dcf44f5c889dd80c81cf3b06385a27f8baf (diff) |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'include')
-rw-r--r-- | include/configs/hummingboard.h | 3 | ||||
-rw-r--r-- | include/configs/mx25pdk.h | 2 | ||||
-rw-r--r-- | include/configs/mx31pdk.h | 3 | ||||
-rw-r--r-- | include/configs/mx35pdk.h | 2 | ||||
-rw-r--r-- | include/configs/mx51evk.h | 2 | ||||
-rw-r--r-- | include/configs/mx53ard.h | 1 | ||||
-rw-r--r-- | include/configs/mx53loco.h | 2 | ||||
-rw-r--r-- | include/configs/mx6_common.h | 2 | ||||
-rw-r--r-- | include/configs/mx6qarm2.h | 2 | ||||
-rw-r--r-- | include/configs/mx6sabre_common.h | 6 | ||||
-rw-r--r-- | include/configs/mx6slevk.h | 2 | ||||
-rw-r--r-- | include/configs/mx6sxsabresd.h | 2 | ||||
-rw-r--r-- | include/configs/mxs.h | 3 | ||||
-rw-r--r-- | include/configs/nitrogen6x.h | 3 | ||||
-rw-r--r-- | include/configs/novena.h | 3 | ||||
-rw-r--r-- | include/configs/wandboard.h | 3 | ||||
-rw-r--r-- | include/configs/warp.h | 13 |
17 files changed, 12 insertions, 42 deletions
diff --git a/include/configs/hummingboard.h b/include/configs/hummingboard.h index 34dbdce1a6c..973f2c5d073 100644 --- a/include/configs/hummingboard.h +++ b/include/configs/hummingboard.h @@ -185,9 +185,6 @@ #define CONFIG_SYS_HUSH_PARSER #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 1024 - -/* 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 diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h index c02e29be9ad..bfbfc68a136 100644 --- a/include/configs/mx25pdk.h +++ b/include/configs/mx25pdk.h @@ -229,8 +229,6 @@ #define CONFIG_SYS_HUSH_PARSER #define CONFIG_AUTO_COMPLETE -/* 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 diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h index 2a3e53c7928..1282a6e77e3 100644 --- a/include/configs/mx31pdk.h +++ b/include/configs/mx31pdk.h @@ -121,9 +121,6 @@ */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ -/* Print Buffer Size */ -#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ - sizeof(CONFIG_SYS_PROMPT)+16) /* max number of command args */ #define CONFIG_SYS_MAXARGS 16 /* Boot Argument Buffer Size */ diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index 857dd071f45..f8cd39d74dd 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -139,8 +139,6 @@ #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ -/* Print Buffer Size */ -#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */ diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index d6e8ec4e13e..b0c97171ed7 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -222,8 +222,6 @@ #define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ -/* Print Buffer Size */ -#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */ diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h index 134d6804bcf..9b003fc4e6d 100644 --- a/include/configs/mx53ard.h +++ b/include/configs/mx53ard.h @@ -186,7 +186,6 @@ /* Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ -#define CONFIG_SYS_PROMPT "MX53ARD U-Boot > " #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index 8d8b93cca5b..8f92234471d 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -184,8 +184,6 @@ #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ -/* Print Buffer Size */ -#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */ diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 29b72b2e9dd..e0528ce4b92 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -28,8 +28,6 @@ #define CONFIG_SYS_PL310_BASE L2_PL310_BASE #endif -#define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE - #define CONFIG_MP #define CONFIG_MXC_GPT_HCLK diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h index 76cfef123cd..5412dd3c51d 100644 --- a/include/configs/mx6qarm2.h +++ b/include/configs/mx6qarm2.h @@ -153,8 +153,6 @@ #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 256 -/* 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 diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index f0e37f0ca6d..b72522bf522 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -111,12 +111,10 @@ "setenv get_cmd tftp; " \ "fi; " \ "if ${get_cmd} ${update_sd_firmware_filename}; then " \ - "if mmc dev ${emmcdev} && " \ - "mmc open ${emmcdev} 1; then " \ + "if mmc dev ${emmcdev} 1; then " \ "setexpr fw_sz ${filesize} / 0x200; " \ "setexpr fw_sz ${fw_sz} + 1; " \ "mmc write ${loadaddr} 0x2 ${fw_sz}; " \ - "mmc close ${emmcdev} 1; " \ "fi; " \ "fi\0" #else @@ -278,6 +276,7 @@ #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP +#ifndef CONFIG_SPL #define CONFIG_CI_UDC #define CONFIG_USBD_HS #define CONFIG_USB_GADGET_DUALSPEED @@ -291,5 +290,6 @@ #define CONFIG_G_DNL_VENDOR_NUM 0x0525 #define CONFIG_G_DNL_PRODUCT_NUM 0xa4a5 #define CONFIG_G_DNL_MANUFACTURER "FSL" +#endif #endif /* __MX6QSABRE_COMMON_CONFIG_H */ diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 122141846e5..21c654b6b12 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -169,8 +169,6 @@ #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 256 -/* 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 diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index a2901294a63..a29d62f023a 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -134,8 +134,6 @@ #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 1024 -/* Print Buffer Size */ -#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) #define CONFIG_SYS_MAXARGS 256 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE diff --git a/include/configs/mxs.h b/include/configs/mxs.h index dea8227aeb7..38b1e9377c3 100644 --- a/include/configs/mxs.h +++ b/include/configs/mxs.h @@ -94,9 +94,6 @@ /* U-Boot general configuration */ #define CONFIG_SYS_LONGHELP #define CONFIG_SYS_CBSIZE 1024 /* Console I/O buffer size */ -#define CONFIG_SYS_PBSIZE \ - (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) - /* Print buffer size */ #define CONFIG_SYS_MAXARGS 32 /* Max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot argument buffer size */ diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index 6d379ed7ad3..8ef4b733ca4 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -325,9 +325,6 @@ #define CONFIG_SYS_PROMPT "U-Boot > " #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 1024 - -/* Print Buffer Size */ -#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) #define CONFIG_SYS_MAXARGS 48 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE diff --git a/include/configs/novena.h b/include/configs/novena.h index 074110c9395..3809c6c59b3 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -58,9 +58,6 @@ /* U-Boot general configurations */ #define CONFIG_SYS_LONGHELP #define CONFIG_SYS_CBSIZE 1024 /* Console I/O buffer size */ -#define CONFIG_SYS_PBSIZE \ - (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) - /* Print buffer size */ #define CONFIG_SYS_MAXARGS 32 /* Max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot argument buffer size */ diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 117d1f7087a..b586803916c 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -249,9 +249,6 @@ #define CONFIG_SYS_HUSH_PARSER #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 256 - -/* 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 diff --git a/include/configs/warp.h b/include/configs/warp.h index bcdd1125f98..2eb429e5ddd 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=" \ |