From patchwork Thu Nov 22 19:12:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 201137 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 5006C2C0089 for ; Fri, 23 Nov 2012 06:15:20 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C08354A029; Thu, 22 Nov 2012 20:15:17 +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 7YszZNfO-XFs; Thu, 22 Nov 2012 20:15:17 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4DF634A04C; Thu, 22 Nov 2012 20:14:52 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 677524A033 for ; Thu, 22 Nov 2012 20:14:49 +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 IwR0a777-h3u for ; Thu, 22 Nov 2012 20:14:48 +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 8047A4A028 for ; Thu, 22 Nov 2012 20:14:46 +0100 (CET) Received: by mail-gg0-f202.google.com with SMTP id i4so964192ggm.3 for ; Thu, 22 Nov 2012 11:14:45 -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=sPwn6KgM5RktXZEApeq7WRCeTBjEaXDg7pTKXck+Zs4=; b=L69kTFHwxlVonVZ4GoevvFVDDwwxJcn8O3EDb7EIEps4wGZutsguHvZA8GfnWQx40E DXEblSNvoKmbIhGs8ld0V3CKEQwr1u7kgyiW6jGD7/HXXE9PQVGADFa1PvaO2pkzGKcF Nv/mPbtTTSxJIgQ1Esj4Qch9dCtHsPVEYYTfIF4rtixLJpevUv7bML0Hq+z5HjvPCa9X tTLozhxx0X6Ac6HQucXra2/JcnS0gHpesx2Kl5TwDKmorxhoxIIua4s8i6ncAsNDP0U2 ddRimaAi34hjOLJOR4/GSM2Bmd1r4b26sSDwZVKT7Rmjdc1vBKQ2msh2L+H2cIjQDr4j QYGA== Received: by 10.236.85.51 with SMTP id t39mr853775yhe.15.1353611685863; Thu, 22 Nov 2012 11:14:45 -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 r10si151180ann.1.2012.11.22.11.14.45 (version=TLSv1/SSLv3 cipher=AES128-SHA); Thu, 22 Nov 2012 11:14:45 -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 BE12B82004A; Thu, 22 Nov 2012 11:14:45 -0800 (PST) Received: by kaka.mtv.corp.google.com (Postfix, from userid 121222) id 6DF98160973; Thu, 22 Nov 2012 11:14:45 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Date: Thu, 22 Nov 2012 11:12:48 -0800 Message-Id: <1353611587-18186-5-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1353611587-18186-1-git-send-email-sjg@chromium.org> References: <1353611587-18186-1-git-send-email-sjg@chromium.org> X-Gm-Message-State: ALoCoQnJ/BGiH6TvU5EAFvVtjMyM2Qmk8l2YU7tk8tsl3Q+jqNrYAOh/djdUebzvo7ZCDJjPDezHSDroS+5NQrXLCfUlOb7Zoc9UZyt8XgwAsersFS7luiUdRsiVmmFwGhaZrhOr9MzWc7vKd3Mjczmz2i7MFhIpim8mrfaxAhpxoNa3CMylV6Xbwpi8yTKPRUKSyrflEAp+ Cc: Tom Rini Subject: [U-Boot] [PATCH v2 04/23] 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 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 d256ddf..299d805 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,