From patchwork Tue Feb 26 14:54:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Schwierzeck X-Patchwork-Id: 223232 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 2C2072C0292 for ; Wed, 27 Feb 2013 01:54:44 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 792954A097; Tue, 26 Feb 2013 15:54:39 +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 kybnAcMrfoNI; Tue, 26 Feb 2013 15:54:39 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 552804A058; Tue, 26 Feb 2013 15:54:37 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id F09AC4A058 for ; Tue, 26 Feb 2013 15:54:35 +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 26i-CoaTPyPN for ; Tue, 26 Feb 2013 15:54:35 +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-bk0-f50.google.com (mail-bk0-f50.google.com [209.85.214.50]) by theia.denx.de (Postfix) with ESMTPS id 201FE4A04B for ; Tue, 26 Feb 2013 15:54:33 +0100 (CET) Received: by mail-bk0-f50.google.com with SMTP id jg9so1883958bkc.9 for ; Tue, 26 Feb 2013 06:54:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=r9glOKKipUB8snD13NkKl/lZW7TFsC+8irezDB/lilc=; b=H3W+VnUE9W9xAHpPHIsRPcv2sdOnqhNMNgor+jziFMEq2sRVMmVNHmYeK/lGu7Xouq alUKeuX9VouKI+itwCJHclsXTHcEbmi+ifjFt7x4iZa/Fx868fmh7hkwiOSmDfi+9wt8 uAxluidB74RQVpofM9/8qd9J00HZw/qeJmZX9tkhnaAio9XfmwiwyCidHLpx17bUZAAt pflbb55aRRfXLMr0S6ogTXhZ5uoWFEThEckVX91wIJGRaOddBaTu5whA3CRJUiU12r7M C0ztFAPv+POrCqvyW4cUQlc6ijzJdWBXBV4r1cyYOxznAhjMdHXfkopiWNRHmWjx1piP o/Fg== X-Received: by 10.204.149.87 with SMTP id s23mr6844906bkv.33.1361890472833; Tue, 26 Feb 2013 06:54:32 -0800 (PST) Received: from pc000853.sas.sys.sphairon.com (dslb-094-222-045-082.pools.arcor-ip.net. [94.222.45.82]) by mx.google.com with ESMTPS id s10sm4886003bkt.10.2013.02.26.06.54.31 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 26 Feb 2013 06:54:32 -0800 (PST) From: Daniel Schwierzeck To: u-boot@lists.denx.de Date: Tue, 26 Feb 2013 15:54:19 +0100 Message-Id: <1361890459-10324-1-git-send-email-daniel.schwierzeck@gmail.com> X-Mailer: git-send-email 1.8.1.1 Cc: Tom Rini Subject: [U-Boot] [PATCH] bootm: fix conditional compilation for bootm ramdisk subcommand 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 All code related to the bootm ramdisk subcommand is conditionally enabled by CONFIG_SYS_BOOT_RAMDISK_HIGH except for the help message. Replace the CONFIG_ARCH defines by CONFIG_SYS_BOOT_RAMDISK_HIGH to fix this. Signed-off-by: Daniel Schwierzeck --- common/cmd_bootm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 1b8a8c1..221187f 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -1055,7 +1055,7 @@ static char bootm_help_text[] = "issued in the order below (it's ok to not issue all sub-commands):\n" "\tstart [addr [arg ...]]\n" "\tloados - load OS image\n" -#if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_SPARC) +#if defined(CONFIG_SYS_BOOT_RAMDISK_HIGH) "\tramdisk - relocate initrd, set env initrd_start/initrd_end\n" #endif #if defined(CONFIG_OF_LIBFDT)