x86: Increase SYS_MALLOC_F_LEN to 0x1000

A few x86 platforms use a SYS_MALLOC_F_LEN value of 0x1000 or higher.
With the impending move to having DEVRES enabled by default, we will
need a little more room here. Raise the default value.

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/Kconfig b/Kconfig
index c435fb4318260c87618f232e7b600bad531cd38a..ce25ea24a60f8e081c805fb17f61e62305367fc1 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -299,8 +299,8 @@ config SYS_MALLOC_F_LEN
                         ROCKCHIP_RV1108
        default 0x600 if ARCH_ZYNQMP_R5 || ARCH_ZYNQMP
        default 0x800 if ARCH_ZYNQ || ROCKCHIP_RK3128 || ROCKCHIP_RK3188 || \
-                        ROCKCHIP_RK322X || X86
-       default 0x1000 if ARCH_MESON || ARCH_BMIPS || ARCH_MTMIPS
+                        ROCKCHIP_RK322X
+       default 0x1000 if ARCH_MESON || ARCH_BMIPS || ARCH_MTMIPS || X86
        default 0x1800 if ARCH_TEGRA
        default 0x4000 if SANDBOX || RISCV || ARCH_APPLE || ROCKCHIP_RK3368 || \
                          ROCKCHIP_RK3399

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 5aa134b6bcbed30b2515f586dd6e8ed4088d98c0..48b033e7e27ceccd0ceff73cc5b131f81a627867 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -133,9 +133,6 @@ source "arch/x86/cpu/tangier/Kconfig"
 config AHCI
        default y
 
-config SYS_MALLOC_F_LEN
-       default 0x800
-
 config RAMBASE
        hex
        default 0x100000

diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig
index a3210bc4a5ce9669093a2eb7baba076fc8fe27f6..6bea902c947a0dd03640eeef44229a8f6582c944 100644 (file)
--- a/configs/qemu-x86_defconfig
+++ b/configs/qemu-x86_defconfig
@@ -1,6 +1,5 @@
 CONFIG_X86=y
 CONFIG_TEXT_BASE=0xFFF00000
-CONFIG_SYS_MALLOC_F_LEN=0x1000
 CONFIG_BLOBLIST_SIZE_RELOC=0x40000
 CONFIG_NR_DRAM_BANKS=8
 CONFIG_ENV_SIZE=0x40000