From patchwork Wed Aug 22 23:19:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 179432 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 569382C0084 for ; Thu, 23 Aug 2012 09:20:58 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4F64D280AB; Thu, 23 Aug 2012 01:20:55 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 OaoN6ENyvlHR; Thu, 23 Aug 2012 01:20:55 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 132D4280B4; Thu, 23 Aug 2012 01:20:38 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6BD9A28097 for ; Thu, 23 Aug 2012 01:20:17 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 MgseqvMBeZNS for ; Thu, 23 Aug 2012 01:20:17 +0200 (CEST) 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-pb0-f44.google.com (mail-pb0-f44.google.com [209.85.160.44]) by theia.denx.de (Postfix) with ESMTPS id 3B24F28099 for ; Thu, 23 Aug 2012 01:20:02 +0200 (CEST) Received: by mail-pb0-f44.google.com with SMTP id rr4so192818pbb.3 for ; Wed, 22 Aug 2012 16:20:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=oI3dHhjq9c+GOmN+txYMDzG2Nc3qk8cSemigAADurj4=; b=aD6mDFiwJUYZ7pb6kKHMwrNzPPrCEFtacdeRkswpqtbrcXToLyI/jIYoJulhaQfB3z BeIOOcE8Fyz562fKfc7MQYXcwNrPD51/lDlXfPPfhfpGPuYIA3xBGYHg3YjSqIPdeprD DYdCS8AeUBPaOxXPG3e3kdKHEOXhRHkjGWBJ9NL/om97zaVEoCekmeXef3Y8srkQM6iy wM2g+t793xpNMws1JZPQdbTJBAq7xf3nZQ4JO97kcyTX1FrfPdD4GDU/M3/C/MXWV8YT kqwugziJCT8aN4I3CZ1cRPltT2ZThzi0X4N9dXnmhd6oIO1kBkJkDezlmEdZ8GsbB5Lj IEmw== Received: by 10.68.231.10 with SMTP id tc10mr56360947pbc.107.1345677602763; Wed, 22 Aug 2012 16:20:02 -0700 (PDT) Received: from localhost.localdomain (ip68-230-54-74.ph.ph.cox.net. [68.230.54.74]) by mx.google.com with ESMTPS id oc2sm4594989pbb.69.2012.08.22.16.20.01 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 22 Aug 2012 16:20:02 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Date: Wed, 22 Aug 2012 16:19:34 -0700 Message-Id: <1345677585-15696-9-git-send-email-trini@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1345677585-15696-1-git-send-email-trini@ti.com> References: <1345677585-15696-1-git-send-email-trini@ti.com> Cc: Sudhakar Rajashekhara , Christian Riesch Subject: [U-Boot] [PATCH v3 08/19] ARM: SPL: Only call mem_malloc_init if configured X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de We can only attempt to setup a malloc pool if CONFIG_SYS_SPL_MALLOC_START is defined, and not all boards require it. Make the call depend on the define. Signed-off-by: Tom Rini --- arch/arm/cpu/armv7/omap-common/spl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/cpu/armv7/omap-common/spl.c b/arch/arm/cpu/armv7/omap-common/spl.c index 4d33f99..71a467e 100644 --- a/arch/arm/cpu/armv7/omap-common/spl.c +++ b/arch/arm/cpu/armv7/omap-common/spl.c @@ -149,8 +149,10 @@ void board_init_r(gd_t *id, ulong dummy) u32 boot_device; debug(">>spl:board_init_r()\n"); +#ifdef CONFIG_SYS_SPL_MALLOC_START mem_malloc_init(CONFIG_SYS_SPL_MALLOC_START, CONFIG_SYS_SPL_MALLOC_SIZE); +#endif #ifdef CONFIG_SPL_BOARD_INIT spl_board_init();