[U-Boot] [PATCH v3 7/7] malloc_f: enable SYS_MALLOC_F by default if DM is on

[Simon Glass]

Hi Masahiro,

On 19 February 2015 at 22:25, Masahiro Yamada <yamada.m at jp.panasonic.com> wrote:
> To use Derive Model before relocation, CONFIG_SYS_MALLOC_F

Driver

> must be enabled.  This should probably be a common requirement
> for all the boards with Driver Model implementation.
> Let's handle it globally rather than per-SoC or per-board.

This seems reasonable to me.

Reviewed-by: Simon Glass <sjg at chromium.org>

>
> Signed-off-by: Masahiro Yamada <yamada.m at jp.panasonic.com>
> ---
>
> Changes in v3:
>   - Newly added
>
> Changes in v2: None
>
>  Kconfig                                 | 1 +
>  arch/arm/cpu/armv7/exynos/Kconfig       | 3 ---
>  arch/arm/cpu/armv7/omap3/Kconfig        | 3 ---
>  arch/arm/cpu/armv7/tegra-common/Kconfig | 3 ---
>  arch/arm/cpu/armv7/uniphier/Kconfig     | 3 ---
>  arch/x86/Kconfig                        | 3 ---
>  board/amcc/canyonlands/Kconfig          | 4 ----
>  board/ti/am335x/Kconfig                 | 3 ---
>  8 files changed, 1 insertion(+), 22 deletions(-)
>
> diff --git a/Kconfig b/Kconfig
> index a66a97f..2ddec81 100644
> --- a/Kconfig
> +++ b/Kconfig
> @@ -54,6 +54,7 @@ config CC_OPTIMIZE_FOR_SIZE
>
>  config SYS_MALLOC_F
>         bool "Enable malloc() pool before relocation"
> +       default y if DM
>         help
>           Before relocation memory is very limited on many platforms. Still,
>           we can provide a small malloc() pool if needed. Driver model in
> diff --git a/arch/arm/cpu/armv7/exynos/Kconfig b/arch/arm/cpu/armv7/exynos/Kconfig
> index 9e47ed3..bd7540a 100644
> --- a/arch/arm/cpu/armv7/exynos/Kconfig
> +++ b/arch/arm/cpu/armv7/exynos/Kconfig
> @@ -80,9 +80,6 @@ config DM_SPI_FLASH
>  config DM_GPIO
>         default y
>
> -config SYS_MALLOC_F
> -       default y
> -
>  source "board/samsung/smdkv310/Kconfig"
>  source "board/samsung/trats/Kconfig"
>  source "board/samsung/universal_c210/Kconfig"
> diff --git a/arch/arm/cpu/armv7/omap3/Kconfig b/arch/arm/cpu/armv7/omap3/Kconfig
> index b3d5ef3..a38d471 100644
> --- a/arch/arm/cpu/armv7/omap3/Kconfig
> +++ b/arch/arm/cpu/armv7/omap3/Kconfig
> @@ -102,9 +102,6 @@ config DM_GPIO
>  config DM_SERIAL
>         default y if DM
>
> -config SYS_MALLOC_F
> -       default y if DM
> -
>  config SYS_SOC
>         default "omap3"
>
> diff --git a/arch/arm/cpu/armv7/tegra-common/Kconfig b/arch/arm/cpu/armv7/tegra-common/Kconfig
> index 2003fc8..b1c4f2a 100644
> --- a/arch/arm/cpu/armv7/tegra-common/Kconfig
> +++ b/arch/arm/cpu/armv7/tegra-common/Kconfig
> @@ -17,9 +17,6 @@ config TEGRA124
>
>  endchoice
>
> -config SYS_MALLOC_F
> -       default y
> -
>  config ARCH_MALLOC_F_LEN
>         hex
>         default 0x1800
> diff --git a/arch/arm/cpu/armv7/uniphier/Kconfig b/arch/arm/cpu/armv7/uniphier/Kconfig
> index b6dc75f..20e20a5 100644
> --- a/arch/arm/cpu/armv7/uniphier/Kconfig
> +++ b/arch/arm/cpu/armv7/uniphier/Kconfig
> @@ -48,9 +48,6 @@ config DCC_MICRO_SUPPORT_CARD
>
>  endchoice
>
> -config SYS_MALLOC_F
> -       default y
> -
>  config CMD_PINMON
>         bool "Enable boot mode pins monitor command"
>         default y
> diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
> index 0e49dd3..46caa6d 100644
> --- a/arch/x86/Kconfig
> +++ b/arch/x86/Kconfig
> @@ -76,9 +76,6 @@ config DM_GPIO
>  config DM_SERIAL
>         default y
>
> -config SYS_MALLOC_F
> -       default y
> -
>  config ARCH_MALLOC_F_LEN
>         hex
>         default 0x800
> diff --git a/board/amcc/canyonlands/Kconfig b/board/amcc/canyonlands/Kconfig
> index c0dbd18..46efa7a 100644
> --- a/board/amcc/canyonlands/Kconfig
> +++ b/board/amcc/canyonlands/Kconfig
> @@ -39,8 +39,4 @@ config DM
>  config DM_SERIAL
>         default y
>
> -config SYS_MALLOC_F
> -       bool
> -       default y
> -
>  endif
> diff --git a/board/ti/am335x/Kconfig b/board/ti/am335x/Kconfig
> index 8c45892..7cb006f 100644
> --- a/board/ti/am335x/Kconfig
> +++ b/board/ti/am335x/Kconfig
> @@ -47,7 +47,4 @@ config DM_GPIO
>  config DM_SERIAL
>         default y if DM
>
> -config SYS_MALLOC_F
> -       default y if DM
> -
>  endif
> --
> 1.9.1
>

Regards,
Simon