From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew McClintock Date: Mon, 23 May 2011 13:29:12 -0500 Subject: [U-Boot] [PATCH 2/3] common/cmd_nand.c: add ifdef protection for do_bootm In-Reply-To: <1306175353-2983-1-git-send-email-msm@freescale.com> References: <1306175353-2983-1-git-send-email-msm@freescale.com> Message-ID: <1306175353-2983-2-git-send-email-msm@freescale.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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 --- 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