diff options
| author | Tom Rini <trini@konsulko.com> | 2021-08-11 08:31:13 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-08-11 08:31:13 -0400 |
| commit | aba3fa1d3f1dc8f7049317b8d6ea1d8cb8935e5e (patch) | |
| tree | 3dcf1dc7077ccd14c1fa885b363f0534f86de683 /include/configs/meson64.h | |
| parent | 3e5b62f78888740530e6f3a2e989f4c361a9d52b (diff) | |
| parent | 33b51765583e6cbe1888f068da795bea599bad18 (diff) | |
| download | u-boot-aba3fa1d3f1dc8f7049317b8d6ea1d8cb8935e5e.tar.gz | |
Merge tag 'u-boot-amlogic-20210810' of https://source.denx.de/u-boot/custodians/u-boot-amlogic
- odroid-n2: fix fdtfile suffix for n2-plus
- sei610 & meson64_android cleanups to prepare android 11 boot support
- use Android BCB mechanism for reboot reason instead of HW reboot flag
- Switch meson64_android boot flow to use abootimg for A/B, AVB and DTBO support
Diffstat (limited to 'include/configs/meson64.h')
| -rw-r--r-- | include/configs/meson64.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/configs/meson64.h b/include/configs/meson64.h index fb7f16d148..f9bb0240d2 100644 --- a/include/configs/meson64.h +++ b/include/configs/meson64.h @@ -32,7 +32,9 @@ #define CONFIG_CPU_ARMV8 #define CONFIG_REMAKE_ELF #define CONFIG_SYS_MAXARGS 32 +#ifndef CONFIG_SYS_MALLOC_LEN #define CONFIG_SYS_MALLOC_LEN (32 << 20) +#endif #define CONFIG_SYS_CBSIZE 1024 #define CONFIG_SYS_SDRAM_BASE 0 |