public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Matthew McClintock <msm@freescale.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 2/3] common/cmd_nand.c: add ifdef protection for do_bootm
Date: Mon, 23 May 2011 13:29:12 -0500	[thread overview]
Message-ID: <1306175353-2983-2-git-send-email-msm@freescale.com> (raw)
In-Reply-To: <1306175353-2983-1-git-send-email-msm@freescale.com>

Right now we do not check if do_bootm is actually built into this
u-boot. Instead check define and only call do_bootm if it's actually
available.

Signed-off-by: Matthew McClintock <msm@freescale.com>
---
 common/cmd_nand.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/common/cmd_nand.c b/common/cmd_nand.c
index 7bd37de..44161da 100644
--- a/common/cmd_nand.c
+++ b/common/cmd_nand.c
@@ -806,9 +806,11 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,
 		local_args[0] = cmd;
 		local_args[1] = NULL;
 
+#ifdef	CONFIG_CMD_BOOTM
 		printf("Automatic boot of image at addr 0x%08lx ...\n", addr);
 
 		do_bootm(cmdtp, 0, 1, local_args);
+#endif
 		return 1;
 	}
 	return 0;
-- 
1.7.3.4

  reply	other threads:[~2011-05-23 18:29 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-23 18:29 [U-Boot] [PATCH 1/3] disk/part.c: Make features optional Matthew McClintock
2011-05-23 18:29 ` Matthew McClintock [this message]
2011-05-23 18:29   ` [U-Boot] [PATCH 3/3] common/cmd_ximg.c: add ifdef protection for gzip uncompression Matthew McClintock
2011-05-24  3:10     ` Mike Frysinger
2011-05-24 15:48       ` [U-Boot] [PATCH v2 " Matthew McClintock
2011-07-26 12:28         ` Wolfgang Denk
2011-05-24  3:12   ` [U-Boot] [PATCH 2/3] common/cmd_nand.c: add ifdef protection for do_bootm Mike Frysinger
2011-05-24 15:47     ` [U-Boot] [PATCH v2 " Matthew McClintock
2011-06-01 15:10       ` Mike Frysinger
2011-06-01 15:55         ` McClintock Matthew-B29882
2011-06-01 16:59           ` Mike Frysinger
2011-06-01 17:58             ` McClintock Matthew-B29882
2011-06-01 17:56         ` Scott Wood
2011-06-01 19:21         ` Wolfgang Denk
2011-06-02 14:56           ` Mike Frysinger
2011-05-23 21:21 ` [U-Boot] [PATCH 1/3] disk/part.c: Make features optional Kumar Gala
2011-05-23 21:49   ` [U-Boot] [PATCH v2 " Matthew McClintock
2011-05-24  3:08     ` Mike Frysinger
2011-05-24 15:31       ` [U-Boot] [PATCH v3 " Matthew McClintock

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1306175353-2983-2-git-send-email-msm@freescale.com \
    --to=msm@freescale.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox