projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-mips
[platform/kernel/u-boot.git]
/
include
/
configs
/
mx6sabre_common.h
diff --git
a/include/configs/mx6sabre_common.h
b/include/configs/mx6sabre_common.h
index
dad8618
..
f97a37c
100644
(file)
--- a/
include/configs/mx6sabre_common.h
+++ b/
include/configs/mx6sabre_common.h
@@
-12,6
+12,7
@@
#define CONFIG_MX6
#include "mx6_common.h"
#define CONFIG_MX6
#include "mx6_common.h"
+#include <asm/sizes.h>
#define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO
@@
-24,7
+25,7
@@
#define CONFIG_REVISION_TAG
/* Size of malloc() pool */
#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
#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOARD_LATE_INIT
@@
-184,7
+185,6
@@
#define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
-#define CONFIG_SYS_HZ 1000
#define CONFIG_CMDLINE_EDITING
#define CONFIG_STACKSIZE (128 * 1024)
#define CONFIG_CMDLINE_EDITING
#define CONFIG_STACKSIZE (128 * 1024)