i386: Fix link collisions resulting from gcc4.4.1 upgrade

[u-boot] / lib_nios2 / bootm.c

diff --git a/lib_nios2/bootm.c b/lib_nios2/bootm.c
index c0be4fdbf4d7816ea3cf7451240a23b3bb636d00..53fd5691ad7dd9c288d0b252fa061db0f99edd6b 100644 (file)
--- a/lib_nios2/bootm.c
+++ b/lib_nios2/bootm.c
@@ -29,12 +29,14 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
 {
        void (*kernel)(void) = (void (*)(void))images->ep;
 
+       if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
+               return 1;
+
        /* For now we assume the Microtronix linux ... which only
         * needs to be called ;-)
         */
        kernel ();
        /* does not return */
 
-error:
        return 1;
 }