command: Remove the cmd_tbl_t typedef

[oweals/u-boot.git] / arch / mips / lib / bootm.c

diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c
index 6a462f3e5a5edf45ecb9f704d85d5bae6897a80a..cbc4413d5dade00c4b04ee5d9737990d413701df 100644 (file)
--- a/arch/mips/lib/bootm.c
+++ b/arch/mips/lib/bootm.c
@@ -5,8 +5,11 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
+#include <env.h>
 #include <image.h>
 #include <fdt_support.h>
+#include <lmb.h>
 #include <asm/addrspace.h>
 #include <asm/io.h>
 
@@ -293,6 +296,9 @@ static void boot_jump_linux(bootm_headers_t *images)
        bootstage_report();
 #endif
 
+       if (CONFIG_IS_ENABLED(RESTORE_EXCEPTION_VECTOR_BASE))
+               trap_restore();
+
        if (images->ft_len)
                kernel(-2, (ulong)images->ft_addr, 0, 0);
        else
@@ -300,8 +306,8 @@ static void boot_jump_linux(bootm_headers_t *images)
                        linux_extra);
 }
 
-int do_bootm_linux(int flag, int argc, char * const argv[],
-                       bootm_headers_t *images)
+int do_bootm_linux(int flag, int argc, char *const argv[],
+                  bootm_headers_t *images)
 {
        /* No need for those on MIPS */
        if (flag & BOOTM_STATE_OS_BD_T)