From patchwork Mon Aug 27 23:18:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 180295 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 CA86D2C00C6 for ; Tue, 28 Aug 2012 09:20:48 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D4BED28101; Tue, 28 Aug 2012 01:20:33 +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 3n6th1su9Wci; Tue, 28 Aug 2012 01:20:33 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B7958280E5; Tue, 28 Aug 2012 01:19:47 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 55A3F280C2 for ; Tue, 28 Aug 2012 01:19:18 +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 sXo37O8DClh3 for ; Tue, 28 Aug 2012 01:19: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-pz0-f44.google.com (mail-pz0-f44.google.com [209.85.210.44]) by theia.denx.de (Postfix) with ESMTPS id 356E128095 for ; Tue, 28 Aug 2012 01:18:59 +0200 (CEST) Received: by mail-pz0-f44.google.com with SMTP id f8so2777158dad.3 for ; Mon, 27 Aug 2012 16:18:59 -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=a2trUsEyxZOMBZ8swp6MU9mRD38EY4lUYuPXhRhmqK0fvRc+89E1vJkwSm+kcKCW50 5lWPKETxTYGLtV9iU9OBotkQvgATn0DXcSWD9kZV1bWMSVUx5D1euc3aYoF7vCMwgKmt yvhAu9qrLMxsACGfgKq+P4/v8qYlYCMRgOgopfi1PZiSQczZtI2iBSbSqt0vQ9TKj82+ AX2k65SmGsKp45m3v4BOLsxVy41RlbbwD1BPKXrINYIH0HzhZH8X403CzLYrdYv/KzYA vVk6xS2UR62bZfmbvszhH6qEy9mH7Hozda/K17TiOdzHWPmvEJoX38aaf+hgCKry02TZ 3/3g== Received: by 10.66.76.226 with SMTP id n2mr33276913paw.67.1346109539799; Mon, 27 Aug 2012 16:18:59 -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 wn1sm15616267pbc.57.2012.08.27.16.18.58 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 27 Aug 2012 16:18:59 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Date: Mon, 27 Aug 2012 16:18:30 -0700 Message-Id: <1346109527-17182-9-git-send-email-trini@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1346109527-17182-1-git-send-email-trini@ti.com> References: <1346109527-17182-1-git-send-email-trini@ti.com> Cc: Sudhakar Rajashekhara , Christian Riesch Subject: [U-Boot] [PATCH v5 08/25] 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();