[U-Boot] [PATCH v2 2/3] common/cmd_nand.c: add ifdef protection for do_bootm
Matthew McClintock
msm at freescale.com
Tue May 24 17:47:39 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>
---
v2: Add ifdef protect for the whole autostart/autoboot block as it's not
supported when the bootm command is not available
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..8fa5d3f 100644
--- a/common/cmd_nand.c
+++ b/common/cmd_nand.c
@@ -799,6 +799,7 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,
load_addr = addr;
+#ifdef CONFIG_CMD_BOOTM
/* Check if we should attempt an auto-start */
if (((ep = getenv("autostart")) != NULL) && (strcmp(ep, "yes") == 0)) {
char *local_args[2];
@@ -811,6 +812,7 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,
do_bootm(cmdtp, 0, 1, local_args);
return 1;
}
+#endif
return 0;
}
--
1.7.3.4
More information about the U-Boot
mailing list