[U-Boot] [PATCH 2/3] common/cmd_nand.c: add ifdef protection for do_bootm

Matthew McClintock msm at freescale.com
Mon May 23 20:29:12 CEST 2011


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 at 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




More information about the U-Boot mailing list