diff options
| author | Tom Rini <trini@konsulko.com> | 2015-03-10 19:09:18 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-03-10 19:09:18 -0400 |
| commit | b79dadf846e5e140e261bbfa4decd024357702d7 (patch) | |
| tree | bbfed4207c806f34ceb4b608e62cc4fbfa98f91f /arch/arm/lib/interrupts.c | |
| parent | 1fc42018a0fe833a4332f8f32d6aeb675f3dcd1d (diff) | |
| parent | d5338c693e6a35a7108c184839d688a7377d117c (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-tegra
Conflicts:
README
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/arm/lib/interrupts.c')
| -rw-r--r-- | arch/arm/lib/interrupts.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/arch/arm/lib/interrupts.c b/arch/arm/lib/interrupts.c index 4dacfd941f..06f46795c3 100644 --- a/arch/arm/lib/interrupts.c +++ b/arch/arm/lib/interrupts.c @@ -137,10 +137,15 @@ void show_regs (struct pt_regs *regs) flags = condition_codes (regs); - printf ("pc : [<%08lx>] lr : [<%08lx>]\n" - "sp : %08lx ip : %08lx fp : %08lx\n", - instruction_pointer (regs), - regs->ARM_lr, regs->ARM_sp, regs->ARM_ip, regs->ARM_fp); + printf("pc : [<%08lx>] lr : [<%08lx>]\n", + instruction_pointer(regs), regs->ARM_lr); + if (gd->flags & GD_FLG_RELOC) { + printf("reloc pc : [<%08lx>] lr : [<%08lx>]\n", + instruction_pointer(regs) - gd->reloc_off, + regs->ARM_lr - gd->reloc_off); + } + printf("sp : %08lx ip : %08lx fp : %08lx\n", + regs->ARM_sp, regs->ARM_ip, regs->ARM_fp); printf ("r10: %08lx r9 : %08lx r8 : %08lx\n", regs->ARM_r10, regs->ARM_r9, regs->ARM_r8); printf ("r7 : %08lx r6 : %08lx r5 : %08lx r4 : %08lx\n", |