diff options
| author | Tom Rini <trini@konsulko.com> | 2020-04-27 17:50:35 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-04-27 17:50:35 -0400 |
| commit | 9b20a794a71151a3a690242b5161b4ca5effd3e7 (patch) | |
| tree | 6b212ab26b722b8fc7e92218e1eafa22073e96f2 /arch/mips/lib/bootm.c | |
| parent | 37b02289029853033fd662cd4b010336cfb282ad (diff) | |
| parent | 3fd023143237a5271a21ccec4b94440df257a5a7 (diff) | |
Merge tag 'mips-pull-2020-04-27' of https://gitlab.denx.de/u-boot/custodians/u-boot-mips
- brcmnand: fix missing code path from Linux driver
- bmips: fix build error when disabling USB
- mips: add option to restore original exception vector base
- mips: fix off-by-one error when clearing gd_data
- mips: minor fixes for compatibility with generic SPL framework
- spl: refactor legacy image loading
- spl: add LZMA decompression support for legacy images
- Makefile: add target to build LZMA compressed U-Boot images
- mtmips: refactor and rewrite low-level init code
- mtmips: add and enable SPL support with LZMA
- mtmips: add support for MT7628 reference board
- mtmips: add support for VoCore/VoCore2 board
Diffstat (limited to 'arch/mips/lib/bootm.c')
| -rw-r--r-- | arch/mips/lib/bootm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c index 8c0d7672f24..f1db6d23b84 100644 --- a/arch/mips/lib/bootm.c +++ b/arch/mips/lib/bootm.c @@ -294,6 +294,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 |