From patchwork Thu Dec 6 00:46:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 204073 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 414BA2C0134 for ; Thu, 6 Dec 2012 11:50:44 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7C9294A17B; Thu, 6 Dec 2012 01:50:42 +0100 (CET) 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 rkZteDncM3kb; Thu, 6 Dec 2012 01:50:42 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 02A7F4A127; Thu, 6 Dec 2012 01:50:22 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5C4DA4A12B for ; Thu, 6 Dec 2012 01:50:19 +0100 (CET) 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 5a5IO-0DqLMx for ; Thu, 6 Dec 2012 01:50:18 +0100 (CET) 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-gg0-f202.google.com (mail-gg0-f202.google.com [209.85.161.202]) by theia.denx.de (Postfix) with ESMTPS id 12C6B4A116 for ; Thu, 6 Dec 2012 01:50:15 +0100 (CET) Received: by mail-gg0-f202.google.com with SMTP id k1so753301ggn.3 for ; Wed, 05 Dec 2012 16:50:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=azpOfR6Lb73HBpsEHZKKFnJAvbz3KZwgH2Ci8bc1Zw8=; b=kqyrW1lpaP1jI8cupz7sNG/BXFc++hwUXGANqIj348nRmyW3cXPafqHB5KP3N/y0Ui uO2Z8TI8vae1L2eADYQQXwjiXr1J6f0342xKcoR5E2cmSXFD9J2J/39n3Y5RHYFdtGeg dbtJMmBEKO/TefozOBrfSCCr/jv1nDTpFuJh6y6VEEk+BJq3Y/3eNuQWIgw1KFBMz45r VOxXCiYjmfy0WkewJe9M62XPflcsHzIDpRrKFwDOe/JkNiPBLmAtMU0rBkSDGNHD/569 8ARQDU3Higo6lfEB/kdNOLNEu6mx2U/8ipqatwl55t7m1ilQkPrzWLn7GwEEK00MavWk ctvQ== Received: by 10.236.81.239 with SMTP id m75mr12486456yhe.13.1354755014647; Wed, 05 Dec 2012 16:50:14 -0800 (PST) Received: from wpzn4.hot.corp.google.com (216-239-44-65.google.com [216.239.44.65]) by gmr-mx.google.com with ESMTPS id i63si522798yhk.5.2012.12.05.16.50.14 (version=TLSv1/SSLv3 cipher=AES128-SHA); Wed, 05 Dec 2012 16:50:14 -0800 (PST) Received: from kaka.mtv.corp.google.com (kaka.mtv.corp.google.com [172.22.73.79]) by wpzn4.hot.corp.google.com (Postfix) with ESMTP id 89A7782004A; Wed, 5 Dec 2012 16:50:14 -0800 (PST) Received: by kaka.mtv.corp.google.com (Postfix, from userid 121222) id 3C7481609AD; Wed, 5 Dec 2012 16:50:14 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Date: Wed, 5 Dec 2012 16:46:31 -0800 Message-Id: <1354754807-21449-5-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1354754807-21449-1-git-send-email-sjg@chromium.org> References: <1354754807-21449-1-git-send-email-sjg@chromium.org> X-Gm-Message-State: ALoCoQlEt3nBjkTIw8yw5R0sgdBSziR0O9tpMdpWI+9JfTL3BxmPCVl4D/nXrrv1KsqRxBpjQaKkItMbgZ2oOmu0R8GnBJrMm4r/21eViyVVyDjB+E3baLeQiztGEG5uP4xNEAUQ5YAzwtjzHsNnu/rBGQFBKj7AT2BtkVYccAWnHd6cEfJSzW61OoXrtRoOuJux8KpfYLR4 Cc: Tom Rini Subject: [U-Boot] [PATCH v3 04/20] Fix use of conditional LMB 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 This code was not guarded with CONFIG_LMB so failed to build on x86. Signed-off-by: Simon Glass --- Changes in v3: None Changes in v2: None common/cmd_bootm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 4dbe952..f7595c0 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -537,7 +537,7 @@ static int do_bootm_subcommand(cmd_tbl_t *cmdtp, int flag, int argc, } break; #endif -#if defined(CONFIG_OF_LIBFDT) +#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_LMB) case BOOTM_STATE_FDT: { boot_fdt_add_mem_rsv_regions(&images.lmb,