From patchwork Fri Feb 20 17:10:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 442066 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 376ED140188 for ; Sat, 21 Feb 2015 04:11:22 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E7F9D4A036; Fri, 20 Feb 2015 18:11:01 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 34seYibFIJf4; Fri, 20 Feb 2015 18:11:01 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 603C24A046; Fri, 20 Feb 2015 18:11:01 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 54AF84B67F for ; Fri, 20 Feb 2015 18:10:54 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Mj2I-rErlcQE for ; Fri, 20 Feb 2015 18:10:54 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-pd0-f180.google.com (mail-pd0-f180.google.com [209.85.192.180]) by theia.denx.de (Postfix) with ESMTPS id 566B94B62B for ; Fri, 20 Feb 2015 18:10:46 +0100 (CET) Received: by pdev10 with SMTP id v10so8832463pde.10 for ; Fri, 20 Feb 2015 09:10:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=1/Zb48OaYtKUFEPVbDslJduIr9vCL5zmDsU2pGxx7Ac=; b=gfOU0bqOcqgBjkucCAePT6IP8ONcS6+i6PxMB5hu0ammtvhWISOL1HLk8IlSSecbFM e+6pLG5c5Vc2KeBcxz16HkrGTwIpxIRBKgMTkPQp+q/lmTHnLNPKygnil+0yzlJvCfej 1FJBaeY/pBw3xzvssGYqZgJO1HhDgiYyjcw12C4/ezq0BnJAUQ3VVtiByVIf+d4MOLr9 66S6n5nTjzvzq9FuGZjug0u2qV8epyblzNv/gUJ5JC5r/qI8IKoYB8kYa7p+eAjysVFC ojDtKwOTk3bO042cXEvSMSGPM95oJPRi3Mdz9st0dKLL9TUnf13JnJ4RyxOQvc5j/oq9 4mcw== X-Received: by 10.66.65.195 with SMTP id z3mr18591067pas.10.1424452245009; Fri, 20 Feb 2015 09:10:45 -0800 (PST) Received: from oscar.sesame (112.136.111.193.er.eaccess.ne.jp. [112.136.111.193]) by mx.google.com with ESMTPSA id ao5sm18025993pbc.66.2015.02.20.09.10.40 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 Feb 2015 09:10:44 -0800 (PST) From: Masahiro Yamada To: u-boot@lists.denx.de Date: Sat, 21 Feb 2015 02:10:01 +0900 Message-Id: <1424452201-2960-7-git-send-email-yamada.m@jp.panasonic.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1424452201-2960-1-git-send-email-yamada.m@jp.panasonic.com> References: <1424452201-2960-1-git-send-email-yamada.m@jp.panasonic.com> Cc: Alexey Brodkin , Michal Simek , Tom Warren , Tom Rini , Stefan Roese Subject: [U-Boot] [PATCH v4 6/6] malloc_f: enable SYS_MALLOC_F by default if DM is on X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" To use Derive Model before relocation, CONFIG_SYS_MALLOC_F 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. Signed-off-by: Masahiro Yamada --- 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 64c095c..ac3e001 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 8b3bcbd..ddb6435 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 SYS_MALLOC_F_LEN default 0x1800 if SYS_MALLOC_F 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 65909e7..be7fc09 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 SYS_MALLOC_F_LEN default 0x800 if SYS_MALLOC_F 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