diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-08-17 18:24:13 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-08-17 18:24:13 +0200 |
| commit | 9ed887caecb9ecb0c68773a1870d143b9f28d3da (patch) | |
| tree | 08c0259674f532de0d272740e4b7dcd778132fe0 /include/configs/mx6sabre_common.h | |
| parent | 425faf74cd8189c87919f7e72a0101c684ee3b9f (diff) | |
| parent | 326ea986ac150acdc7656d57fca647db80b50158 (diff) | |
| download | talos-obmc-uboot-9ed887caecb9ecb0c68773a1870d143b9f28d3da.tar.gz talos-obmc-uboot-9ed887caecb9ecb0c68773a1870d143b9f28d3da.zip | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs/mx6sabre_common.h')
| -rw-r--r-- | include/configs/mx6sabre_common.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index dad8618c0a..bf6113b2aa 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -12,6 +12,7 @@ #define CONFIG_MX6 #include "mx6_common.h" +#include <asm/sizes.h> #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO @@ -24,7 +25,7 @@ #define CONFIG_REVISION_TAG /* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024) +#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M) #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT |
