[U-Boot] [PATCH 4/4] bootm: allow people to disable this command

Mike Frysinger vapier at gentoo.org
Wed Nov 4 22:46:36 CET 2009


Signed-off-by: Mike Frysinger <vapier at gentoo.org>
---
 common/cmd_bootm.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index ce174d7..ab636c0 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -57,6 +57,10 @@
 #include <lzma/LzmaTools.h>
 #endif /* CONFIG_LZMA */
 
+ulong load_addr = CONFIG_SYS_LOAD_ADDR;	/* Default Load Address */
+
+#ifndef CONFIG_SYS_NO_BOOTM
+
 DECLARE_GLOBAL_DATA_PTR;
 
 extern int gunzip (void *dst, int dstlen, unsigned char *src, unsigned long *lenp);
@@ -147,7 +151,6 @@ static boot_os_fn *boot_os[] = {
 #endif
 };
 
-ulong load_addr = CONFIG_SYS_LOAD_ADDR;	/* Default Load Address */
 static bootm_headers_t images;		/* pointers to os/initrd/fdt images */
 
 /* Allow for arch specific config before we boot */
@@ -1453,3 +1456,5 @@ static int do_bootm_integrity (int flag, int argc, char *argv[],
 	return 1;
 }
 #endif
+
+#endif /* CONFIG_SYS_NO_BOOTM */
-- 
1.6.5.2



More information about the U-Boot mailing list