summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-06-18 23:44:22 -0400
committerTom Rini <trini@konsulko.com>2016-06-18 23:44:22 -0400
commit2372b0012925f9100980151f4a28347c82feaba8 (patch)
tree24f0ddbc313b19201dac8e7be7cb8f7e615f6e7f /include
parente677724884c175e978b463cf941ecb9310d3b900 (diff)
parent67ef2c133f099d3d719058eb73aeec8f1574655c (diff)
downloadblackbird-obmc-uboot-2372b0012925f9100980151f4a28347c82feaba8.tar.gz
blackbird-obmc-uboot-2372b0012925f9100980151f4a28347c82feaba8.zip
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'include')
-rw-r--r--include/configs/warp7.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/include/configs/warp7.h b/include/configs/warp7.h
index f112fa5f16..fc0e51a9ae 100644
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -16,9 +16,10 @@
#define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR
/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M)
+#define CONFIG_SYS_MALLOC_LEN (35 * SZ_1M)
#define CONFIG_BOARD_EARLY_INIT_F
+#define CONFIG_BOARD_LATE_INIT
/* MMC Config*/
#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC3_BASE_ADDR
@@ -27,10 +28,7 @@
#define CONFIG_SYS_MMC_IMG_LOAD_PART 1
#define CONFIG_DFU_ENV_SETTINGS \
- "dfu_alt_info=image raw 0 0x800000;"\
- "u-boot raw 0 0x4000;"\
- "bootimg part 0 1;"\
- "rootfs part 0 2\0" \
+ "dfu_alt_info=boot raw 0x2 0x400 mmcpart 1\0" \
#define CONFIG_EXTRA_ENV_SETTINGS \
CONFIG_DFU_ENV_SETTINGS \
OpenPOWER on IntegriCloud