Patchwork [U-Boot] bootm: fix conditional compilation for bootm ramdisk subcommand

login
register
mail settings
Submitter Daniel Schwierzeck
Date Feb. 26, 2013, 2:54 p.m.
Message ID <1361890459-10324-1-git-send-email-daniel.schwierzeck@gmail.com>
Download mbox | patch
Permalink /patch/223232/
State Accepted
Delegated to: Tom Rini
Headers show

Comments

Daniel Schwierzeck - Feb. 26, 2013, 2:54 p.m.
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 <daniel.schwierzeck@gmail.com>
---
 common/cmd_bootm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Tom Rini - March 4, 2013, 9:28 p.m.
On Tue, Feb 26, 2013 at 04:54:19AM -0000, Daniel Schwierzeck wrote:

> 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 <daniel.schwierzeck@gmail.com>

Applied to u-boot/master, thanks!

Patch

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)