summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-08-14 06:42:37 -0400
committerTom Rini <trini@ti.com>2014-08-30 07:46:41 -0400
commit5bcae13ee44bac430d8e8a2dd6a64d22a6de0d25 (patch)
treea75805bb8ff5c3c53eac3275af903661bd1f3b47 /include
parentd2b2ffe3107dc2b43352b391129bc84340be0b35 (diff)
downloadu-boot-imx-5bcae13ee44bac430d8e8a2dd6a64d22a6de0d25.zip
u-boot-imx-5bcae13ee44bac430d8e8a2dd6a64d22a6de0d25.tar.gz
u-boot-imx-5bcae13ee44bac430d8e8a2dd6a64d22a6de0d25.tar.bz2
vexpress_aemv8a.h: Clean up the config
- Drop DEBUG - Drop defines we can use the default of. - Provide a larger malloc pool. - Correct default locations for kernel / initrd / device tree Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'include')
-rw-r--r--include/configs/vexpress_aemv8a.h13
1 files changed, 5 insertions, 8 deletions
diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
index 1905d13..6f31fcf 100644
--- a/include/configs/vexpress_aemv8a.h
+++ b/include/configs/vexpress_aemv8a.h
@@ -8,8 +8,6 @@
#ifndef __VEXPRESS_AEMV8A_H
#define __VEXPRESS_AEMV8A_H
-#define DEBUG
-
#ifdef CONFIG_BASE_FVP
#ifndef CONFIG_SEMIHOSTING
#error CONFIG_BASE_FVP requires CONFIG_SEMIHOSTING
@@ -134,7 +132,7 @@
#define CONFIG_SYS_MEMTEST_END (V2M_BASE + 0x80000000)
/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024)
+#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (8 << 20))
/* SMSC91C111 Ethernet Configuration */
#define CONFIG_SMC91111 1
@@ -215,10 +213,9 @@
#else
#define CONFIG_EXTRA_ENV_SETTINGS \
- "kernel_addr_r=0x200000\0" \
- "initrd_addr_r=0xa00000\0" \
- "initrd_size=0x2000000\0" \
- "fdt_addr_r=0x100000\0" \
+ "kernel_addr_r=0x80000000\0" \
+ "initrd_addr_r=0x88000000\0" \
+ "fdt_addr_r=0x83000000\0" \
"fdt_high=0xa0000000\0"
#define CONFIG_BOOTARGS "console=ttyAMA0 root=/dev/ram0"
@@ -239,7 +236,7 @@
#define CONFIG_SYS_HUSH_PARSER
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING 1
+#define CONFIG_CMDLINE_EDITING
#define CONFIG_SYS_MAXARGS 64 /* max command args */
#endif /* __VEXPRESS_AEMV8A_H */