projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
env: only build env_embedded and envcrc when needed
[oweals/u-boot.git]
/
lib_avr32
/
bootm.c
diff --git
a/lib_avr32/bootm.c
b/lib_avr32/bootm.c
index 35240e2eed6b73241af4da6dc8a43fb189718082..6a3172a9a0c11efda750ebe77d91ba03a1b61dd0 100644
(file)
--- a/
lib_avr32/bootm.c
+++ b/
lib_avr32/bootm.c
@@
-22,9
+22,9
@@
#include <common.h>
#include <command.h>
#include <image.h>
#include <common.h>
#include <command.h>
#include <image.h>
-#include <zlib.h>
+#include <
u-boot/
zlib.h>
#include <asm/byteorder.h>
#include <asm/byteorder.h>
-#include <asm/addrspace.h>
+#include <asm/a
rch/a
ddrspace.h>
#include <asm/io.h>
#include <asm/setup.h>
#include <asm/arch/clk.h>
#include <asm/io.h>
#include <asm/setup.h>
#include <asm/arch/clk.h>
@@
-176,7
+176,9
@@
int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
void (*theKernel)(int magic, void *tagtable);
struct tag *params, *params_start;
char *commandline = getenv("bootargs");
void (*theKernel)(int magic, void *tagtable);
struct tag *params, *params_start;
char *commandline = getenv("bootargs");
- int ret;
+
+ if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
+ return 1;
theKernel = (void *)images->ep;
theKernel = (void *)images->ep;