Commit 5bcae13ee44bac430d8e8a2dd6a64d22a6de0d25
1 parent
d2b2ffe310
Exists in
v2017.01-smarct4x
and in
37 other branches
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>
Showing 1 changed file with 5 additions and 8 deletions Side-by-side Diff
include/configs/vexpress_aemv8a.h
| ... | ... | @@ -8,8 +8,6 @@ |
| 8 | 8 | #ifndef __VEXPRESS_AEMV8A_H |
| 9 | 9 | #define __VEXPRESS_AEMV8A_H |
| 10 | 10 | |
| 11 | -#define DEBUG | |
| 12 | - | |
| 13 | 11 | #ifdef CONFIG_BASE_FVP |
| 14 | 12 | #ifndef CONFIG_SEMIHOSTING |
| 15 | 13 | #error CONFIG_BASE_FVP requires CONFIG_SEMIHOSTING |
| ... | ... | @@ -134,7 +132,7 @@ |
| 134 | 132 | #define CONFIG_SYS_MEMTEST_END (V2M_BASE + 0x80000000) |
| 135 | 133 | |
| 136 | 134 | /* Size of malloc() pool */ |
| 137 | -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024) | |
| 135 | +#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (8 << 20)) | |
| 138 | 136 | |
| 139 | 137 | /* SMSC91C111 Ethernet Configuration */ |
| 140 | 138 | #define CONFIG_SMC91111 1 |
| ... | ... | @@ -215,10 +213,9 @@ |
| 215 | 213 | #else |
| 216 | 214 | |
| 217 | 215 | #define CONFIG_EXTRA_ENV_SETTINGS \ |
| 218 | - "kernel_addr_r=0x200000\0" \ | |
| 219 | - "initrd_addr_r=0xa00000\0" \ | |
| 220 | - "initrd_size=0x2000000\0" \ | |
| 221 | - "fdt_addr_r=0x100000\0" \ | |
| 216 | + "kernel_addr_r=0x80000000\0" \ | |
| 217 | + "initrd_addr_r=0x88000000\0" \ | |
| 218 | + "fdt_addr_r=0x83000000\0" \ | |
| 222 | 219 | "fdt_high=0xa0000000\0" |
| 223 | 220 | |
| 224 | 221 | #define CONFIG_BOOTARGS "console=ttyAMA0 root=/dev/ram0" |
| ... | ... | @@ -239,7 +236,7 @@ |
| 239 | 236 | #define CONFIG_SYS_HUSH_PARSER |
| 240 | 237 | #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE |
| 241 | 238 | #define CONFIG_SYS_LONGHELP |
| 242 | -#define CONFIG_CMDLINE_EDITING 1 | |
| 239 | +#define CONFIG_CMDLINE_EDITING | |
| 243 | 240 | #define CONFIG_SYS_MAXARGS 64 /* max command args */ |
| 244 | 241 | |
| 245 | 242 | #endif /* __VEXPRESS_AEMV8A_H */ |