From patchwork Tue Sep 25 00:30:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 186650 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 9123E2C019E for ; Tue, 25 Sep 2012 10:33:01 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B9B72280CE; Tue, 25 Sep 2012 02:32:54 +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 pTcUMdxc5Dtt; Tue, 25 Sep 2012 02:32:54 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6A272280D2; Tue, 25 Sep 2012 02:32:02 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B0B14280A2 for ; Tue, 25 Sep 2012 02:31:48 +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 7UCvN1bpCMjJ for ; Tue, 25 Sep 2012 02:31:48 +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 E38E928096 for ; Tue, 25 Sep 2012 02:31:36 +0200 (CEST) Received: by mail-pb0-f44.google.com with SMTP id ro8so2664714pbb.3 for ; Mon, 24 Sep 2012 17:31:36 -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=WRjLx7yCueM9DbB+ZVJPGVivRyWpqtnInNHvraGsj09O6oe+ntggPjxLnQneMpwAcX TKTTmDV1G1L6Tj5GH8CWOwVKBt+iEBXVlpIDQnNb3FQQMNVlVeKvf7AKRZXWbwGoeFOU Zx8hot7lfThNA2Tp+KvKbqZ5vc21I5HZiM9PiobJJUyudsUWKmiImymHBTdopQGVdsXI F8oo4/9S7pVqwkJDyDPexiGRGVPFLZcGt5yJ7XA+b+ykUaR+LuXASXcj/V/5zTMZBrgS I2BI0mMc9F9xSOb5IgxoW7zzgLeS1fW39VAiui5Nm2lXD5ck00yHfRamYUmeeFinl3g6 0kag== Received: by 10.68.229.6 with SMTP id sm6mr40747400pbc.120.1348533096542; Mon, 24 Sep 2012 17:31:36 -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 pj10sm10377538pbb.46.2012.09.24.17.31.34 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 24 Sep 2012 17:31:35 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Date: Mon, 24 Sep 2012 17:30:47 -0700 Message-Id: <1348533068-13038-10-git-send-email-trini@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1348533068-13038-1-git-send-email-trini@ti.com> References: <1348533068-13038-1-git-send-email-trini@ti.com> Cc: Sudhakar Rajashekhara , Christian Riesch Subject: [U-Boot] [PATCH v7 09/29] 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();