From patchwork Tue Apr 3 10:16:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_Bie=C3=9Fmann?= X-Patchwork-Id: 150374 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 BA4BEB6FBB for ; Tue, 3 Apr 2012 20:16:44 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C09132807D; Tue, 3 Apr 2012 12:16:41 +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 VsZU1fBw8ztV; Tue, 3 Apr 2012 12:16:41 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2D4542807E; Tue, 3 Apr 2012 12:16:40 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2CFF42807E for ; Tue, 3 Apr 2012 12:16:38 +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 x4rOKQKWJE7d for ; Tue, 3 Apr 2012 12:16:37 +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-bk0-f44.google.com (mail-bk0-f44.google.com [209.85.214.44]) by theia.denx.de (Postfix) with ESMTPS id 7ADE52807D for ; Tue, 3 Apr 2012 12:16:36 +0200 (CEST) Received: by bkuw5 with SMTP id w5so3062407bku.3 for ; Tue, 03 Apr 2012 03:16:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:mime-version :content-type:content-transfer-encoding; bh=//KtME1B0D+4PzsUnXNBBPlfVInwMOy9SsFaHXDD5TY=; b=hXQRkzJ/23r/wcy8tYkqp358BOjd9YLI72Svc4dhK9sZnF7lbrHtbsnWkEh7ZTz/uj KyrnyTyNiEUkYJ3kTau17XEIOtppuQvaGh0ITALqEw7gtaQEPVo+buHXNjLgN8eGRtUp i8262u4pVY4zdr1IcMd41McgPrxgHhLGKeq5TaSR/wThwvSKXtHT89fYu50LqtoEjRMu VqFxyfs/gwFbykxjSbulasiZBQewD7JbbTrFJ35FtzGmtjFKj9UCYLC4AYc4Ws+9p40M WGRHH9ioFDM6iIsBuXIu+Gbsvw0XBFV5UOVrPBXWPZWgKJpdRtYwVSwLzyuel+YljgsC Wdkg== Received: by 10.204.145.70 with SMTP id c6mr5246113bkv.41.1333448195676; Tue, 03 Apr 2012 03:16:35 -0700 (PDT) Received: from azuregos.er.corscience.de (DSL01.212.114.252.242.ip-pool.NEFkom.net. [212.114.252.242]) by mx.google.com with ESMTPS id c4sm44679190bkh.0.2012.04.03.03.16.34 (version=SSLv3 cipher=OTHER); Tue, 03 Apr 2012 03:16:34 -0700 (PDT) From: =?UTF-8?q?Andreas=20Bie=C3=9Fmann?= To: u-boot@lists.denx.de Date: Tue, 3 Apr 2012 12:16:27 +0200 Message-Id: <1333448187-7456-1-git-send-email-andreas.devel@googlemail.com> X-Mailer: git-send-email 1.7.9.1 MIME-Version: 1.0 Cc: =?UTF-8?q?Andreas=20Bie=C3=9Fmann?= Subject: [U-Boot] [PATCH] bootm: fix usage of lmb_reserve() 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: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de From: Andreas Bießmann commit 44f074c771c4b70d250b0d7ed2f7513488c678bb brakes compiling avr32 boards which do not have CONFIG_LMB. This patch re-add the empty lmb_reserve() define to opt-out respective code parts in do_bootm() and do_bootm_subcommand(). This patch fixes errors like this: ---8<--- cmd_bootm.c: In function 'do_bootm_subcommand': cmd_bootm.c:518: error: 'bootm_headers_t' has no member named 'lmb' cmd_bootm.c: In function 'do_bootm': cmd_bootm.c:665: error: 'bootm_headers_t' has no member named 'lmb' --->8--- Signed-off-by: Andreas Bießmann --- common/cmd_bootm.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 9ad2535..7d72c7a 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -186,6 +186,8 @@ static void boot_start_lmb(bootm_headers_t *images) board_lmb_reserve(&images->lmb); } #else +/* we want to opt-out access to images.lmb by precompiler !*/ +# define lmb_reserve(lmb, base, size) static inline void boot_start_lmb(bootm_headers_t *images) { } #endif