i386: Fix race condition when using SC520 timers

[u-boot] / lib_avr32 / bootm.c

diff --git a/lib_avr32/bootm.c b/lib_avr32/bootm.c
index 8a6109de14d03c3d51adcc8dc202221f66a32c8b..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 <zlib.h>
+#include <u-boot/zlib.h>
 #include <asm/byteorder.h>
-#include <asm/addrspace.h>
+#include <asm/arch/addrspace.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");
-       int     ret;
+
+       if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
+               return 1;
 
        theKernel = (void *)images->ep;
 
@@ -202,6 +204,6 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
 
        theKernel(ATAG_MAGIC, params_start);
        /* does not return */
-error:
+
        return 1;
 }