diff options
| author | Tom Rini <trini@konsulko.com> | 2020-09-21 11:01:07 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-09-21 11:01:07 -0400 |
| commit | 10431c4eaaf9fb387ba3243b37b7405b65d2e676 (patch) | |
| tree | bd7cfe7a8248bee4d51e8bfcd7da968816c8efb6 /include | |
| parent | 400f84c5baaec9b8a9f30e4ea77785e6f9e00c4b (diff) | |
| parent | 40edea3a07ebb89e86c9bde8c94000c8f6613be7 (diff) | |
| download | u-boot-10431c4eaaf9fb387ba3243b37b7405b65d2e676.tar.gz u-boot-10431c4eaaf9fb387ba3243b37b7405b65d2e676.tar.xz u-boot-10431c4eaaf9fb387ba3243b37b7405b65d2e676.zip | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86
- Several ACPI bug fixes
- Intel edison: Move config SYS_MALLOC_LEN to Kconfig
- Use "emmc" in ApolloLake FSP devicetree bindings
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/edison.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/configs/edison.h b/include/configs/edison.h index 606c656a72..0e1205bdb5 100644 --- a/include/configs/edison.h +++ b/include/configs/edison.h @@ -23,10 +23,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (256 * 1024) -#define CONFIG_SYS_MALLOC_LEN (128 * 1024 * 1024) - -/* Environment */ - /* RTC */ #define CONFIG_SYS_ISA_IO_BASE_ADDRESS 0 |