From patchwork Wed Aug 15 21:30:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 177831 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 0E8142C007F for ; Thu, 16 Aug 2012 07:32:12 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 05F342821B; Wed, 15 Aug 2012 23:31:56 +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 96bSlTqty8Td; Wed, 15 Aug 2012 23:31:55 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8D09428228; Wed, 15 Aug 2012 23:31:29 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 58A1B281E2 for ; Wed, 15 Aug 2012 23:31:21 +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 CWdwe2m6JCjD for ; Wed, 15 Aug 2012 23:31:21 +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 AADC9281E4 for ; Wed, 15 Aug 2012 23:31:01 +0200 (CEST) Received: by mail-pb0-f44.google.com with SMTP id rr4so473025pbb.3 for ; Wed, 15 Aug 2012 14:31:01 -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=DJMo73DLpo5OsV08ERhaOtwrWfy8ak0Hv4ZV7aZhkW4=; b=QpFwaVcC+Ca1CAUVo0DePI1tIocNA/+M+7Pe2zJTelyxr6mNGKph3z/K7FlFosUst5 FM9LwpB5mCMA4X7pFE8PZZaHNJ9b06cEIykCmgeM1dKplWT2zg2rKapkQpNPQQG+BRq2 vLvS8RR9FkqEFxtRMa1zNUHzmFmfxx5r1YiaQbdl6702107PLFGNRHXb58GS2QTDoKN7 91OThTtLyvX78jqHky/w8Qf7iusXlLu5P4dszW6WINJUdNfRtLXYf4FYQL2Im7YF2UHf IsxA83nhKQuqggYeG10c/ozMILSit56k9V3G9Ijk7endVyH3+ZKPZRQjkP3EvtO9It6x HOMg== Received: by 10.68.219.226 with SMTP id pr2mr28502730pbc.1.1345066261223; Wed, 15 Aug 2012 14:31:01 -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 kp3sm1128717pbc.64.2012.08.15.14.30.59 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 15 Aug 2012 14:31:00 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Date: Wed, 15 Aug 2012 14:30:46 -0700 Message-Id: <1345066254-6911-10-git-send-email-trini@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1345066254-6911-1-git-send-email-trini@ti.com> References: <1345066254-6911-1-git-send-email-trini@ti.com> Cc: Sudhakar Rajashekhara , Heiko Schocher , Christian Riesch Subject: [U-Boot] [PATCH 09/17] 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/lib/spl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/lib/spl.c b/arch/arm/lib/spl.c index 4d33f99..71a467e 100644 --- a/arch/arm/lib/spl.c +++ b/arch/arm/lib/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();