From patchwork Fri Aug 28 20:50:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 512033 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 527091401C7 for ; Sat, 29 Aug 2015 06:51:38 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=TtHfHJu1; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 61C854B718; Fri, 28 Aug 2015 22:51:22 +0200 (CEST) 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 eIXEl4SfTqIi; Fri, 28 Aug 2015 22:51:22 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 739624B714; Fri, 28 Aug 2015 22:51:01 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2D9134B6D5 for ; Fri, 28 Aug 2015 22:50:51 +0200 (CEST) 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 ElmmCK3Ht6Np for ; Fri, 28 Aug 2015 22:50:51 +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-ig0-f179.google.com (mail-ig0-f179.google.com [209.85.213.179]) by theia.denx.de (Postfix) with ESMTPS id 436634B6B3 for ; Fri, 28 Aug 2015 22:50:44 +0200 (CEST) Received: by igph8 with SMTP id h8so19493563igp.0 for ; Fri, 28 Aug 2015 13:50:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=oq8s7NE2Dl8IY9H7X9jjj/trhfYN4bRztNhXpR5RtNY=; b=TtHfHJu1cumRPw/9vHV6r8kjRyQ8jJpNudTXtBNlO3tgCSQ4n48QD8IKz1zZX+z3Qe Im698t/QZZ4hHXLV/Ha36IGwV21bhT5DDOHVCam7oDdymgtmytEvGlr7DcPfjwDKiG3p uXarCtgZT1P+s4S5BqA4T5etgCNEYEvHIGMUahdmXnBZGRGRVOh/8dxkVgj2JX8btlpF dWwPu/EB5eSULkAcbUTs1OZTj5kesMZ1T5keHbHYRzIahI7uUVIJBIXl+93m50WzniwI EcgtmkTImGPhMFgI7jsFWE6d5RkRCMP22BR48nS9IRiS7GO9dXxSJLRYEkhbJ3XO1t/6 tSKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=oq8s7NE2Dl8IY9H7X9jjj/trhfYN4bRztNhXpR5RtNY=; b=McHEpXeP6MXaTQMnHM3brgzi0m2VXsN1e8RdmH4q5hugUiP4DzWEY32qd/odFIebSA ul9Tk9Uah+bfT7MB4Q71Fe38cgtA9K3Sg2oikhoy9fBm5YBqRJ+ZHsVe4CGaACxZa8FR FCYqf2Y5K/B4fsxojHJBlcxXH3frQioRX7cHGTwHAzdmPCXYYcnsQ+R+/VI38MHm6ABB dVLxq9FfD45ktYHZS0z6DuYPw7NMBCJ8teHibMb7xiSIviwm6yRSS1J9uMpNdGaftehF CuXoXYptCQB+RvRcMeqsPSwGZf7pxyfKMMUIDtYjS3HH62vfea19A2QbZ3wrwgLjjJ2+ 951g== X-Gm-Message-State: ALoCoQkCpG14HAIwVNQP38Urq5A6UadVVKIuTlBtv8raMA/X1cDjsTsj/G5GvZgrPAHVmtdD+lSj X-Received: by 10.50.154.10 with SMTP id vk10mr4984159igb.39.1440795043200; Fri, 28 Aug 2015 13:50:43 -0700 (PDT) Received: from kaki.bld.corp.google.com ([2620:0:1005:1100:c53d:5649:3237:1b22]) by smtp.gmail.com with ESMTPSA id yr6sm3000168igb.14.2015.08.28.13.50.41 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Aug 2015 13:50:41 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 7CD20221036; Fri, 28 Aug 2015 14:50:40 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Fri, 28 Aug 2015 14:50:23 -0600 Message-Id: <1440795028-7303-4-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.5.0.457.gab17608 In-Reply-To: <1440795028-7303-1-git-send-email-sjg@chromium.org> References: <1440795028-7303-1-git-send-email-sjg@chromium.org> Cc: Tom Rini Subject: [U-Boot] [PATCH v2 3/8] board_init_f_mem(): Don't create an unused early malloc() area 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" Change the #ifdef so that the early malloc() area is not set up in SPL if CONFIG_SYS_SPL_MALLOC_START is defined. In that case it would never actually be used, and just chews up stack space. Signed-off-by: Simon Glass Tested-by: Masahiro Yamada --- Changes in v2: None common/init/board_init.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/init/board_init.c b/common/init/board_init.c index b6a1a17..65391a5 100644 --- a/common/init/board_init.c +++ b/common/init/board_init.c @@ -50,7 +50,8 @@ ulong board_init_f_mem(ulong top) #endif arch_setup_gd(gd_ptr); -#if defined(CONFIG_SYS_MALLOC_F) +#if defined(CONFIG_SYS_MALLOC_F) && \ + (!defined(CONFIG_SPL_BUILD) || !defined(CONFIG_SYS_SPL_MALLOC_START)) top -= CONFIG_SYS_MALLOC_F_LEN; gd->malloc_base = top; #endif