diff options
| author | Tom Rini <trini@konsulko.com> | 2020-09-30 09:21:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-09-30 09:21:43 -0400 |
| commit | 01114adfc1e0bf3cf5e2f3da858bb2c8e9810c1c (patch) | |
| tree | 64ab9c9d1c2a5f3cc96b4c0fef1990cb73c1b356 /arch/riscv/lib/interrupts.c | |
| parent | 527fad0b2484bf1dd4c443c4c8f4384aa256938f (diff) | |
| parent | 924de3216e9efdf1cdc71b8632099213aac03f2c (diff) | |
Merge branch 'next' of https://gitlab.denx.de/u-boot/custodians/u-boot-riscv into next
- Disable CMD_IRQ for RISC-V.
- Update sipeed/maix doc
- Obtain reg of SiFive RAM via dev_read_addr_index() instead of regmap API.
- Cleans up RISC-V timer drivers and converts them to DM.
- Correctly handle IPIs already pending upon prior stage bootloader (on the K210)
Diffstat (limited to 'arch/riscv/lib/interrupts.c')
| -rw-r--r-- | arch/riscv/lib/interrupts.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/riscv/lib/interrupts.c b/arch/riscv/lib/interrupts.c index cd47e644872..ad870e98d8f 100644 --- a/arch/riscv/lib/interrupts.c +++ b/arch/riscv/lib/interrupts.c @@ -78,7 +78,8 @@ static void _exit_trap(ulong code, ulong epc, ulong tval, struct pt_regs *regs) printf("EPC: " REG_FMT " RA: " REG_FMT " TVAL: " REG_FMT "\n", epc, regs->ra, tval); - if (gd->flags & GD_FLG_RELOC) + /* Print relocation adjustments, but only if gd is initialized */ + if (gd && gd->flags & GD_FLG_RELOC) printf("EPC: " REG_FMT " RA: " REG_FMT " reloc adjusted\n\n", epc - gd->reloc_off, regs->ra - gd->reloc_off); |