| Message ID | 1412801889-14400-40-git-send-email-jeroen@myspectrum.nl |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
Hi Jeroen, On Wed, 8 Oct 2014 22:57:59 +0200, Jeroen Hofstee <jeroen@myspectrum.nl> wrote: > Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl> > --- > arch/arm/include/asm/u-boot-arm.h | 15 +++++++++++++++ > arch/arm/lib/interrupts.c | 1 + > 2 files changed, 16 insertions(+) > > diff --git a/arch/arm/include/asm/u-boot-arm.h b/arch/arm/include/asm/u-boot-arm.h > index b16694c..f97f3dd 100644 > --- a/arch/arm/include/asm/u-boot-arm.h > +++ b/arch/arm/include/asm/u-boot-arm.h > @@ -45,4 +45,19 @@ void reset_timer_masked (void); > ulong get_timer_masked (void); > void udelay_masked (unsigned long usec); > > +/* calls to c from vectors.S */ > +void bad_mode(void); > +void do_undefined_instruction(struct pt_regs *pt_regs); > +void do_software_interrupt(struct pt_regs *pt_regs); > +void do_prefetch_abort(struct pt_regs *pt_regs); > +void do_data_abort(struct pt_regs *pt_regs); > +void do_not_used(struct pt_regs *pt_regs); > +#ifdef CONFIG_ARM64 > +void do_fiq(struct pt_regs *pt_regs, unsigned int esr); > +void do_irq(struct pt_regs *pt_regs, unsigned int esr); > +#else > +void do_fiq(struct pt_regs *pt_regs); > +void do_irq(struct pt_regs *pt_regswq); > +#endif > + > #endif /* _U_BOOT_ARM_H_ */ > diff --git a/arch/arm/lib/interrupts.c b/arch/arm/lib/interrupts.c > index f6b7c03..9019736 100644 > --- a/arch/arm/lib/interrupts.c > +++ b/arch/arm/lib/interrupts.c > @@ -21,6 +21,7 @@ > > #include <common.h> > #include <asm/proc-armv/ptrace.h> > +#include <asm/u-boot-arm.h> > > DECLARE_GLOBAL_DATA_PTR; > Acked-by: Albert ARIBAUD <albert.u.boot@aribaud.net> Amicalement,
On Wed, Oct 08, 2014 at 10:57:59PM +0200, Jeroen Hofstee wrote: > Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl> > Acked-by: Albert ARIBAUD <albert.u.boot@aribaud.net> Applied to u-boot/master, thanks!
diff --git a/arch/arm/include/asm/u-boot-arm.h b/arch/arm/include/asm/u-boot-arm.h index b16694c..f97f3dd 100644 --- a/arch/arm/include/asm/u-boot-arm.h +++ b/arch/arm/include/asm/u-boot-arm.h @@ -45,4 +45,19 @@ void reset_timer_masked (void); ulong get_timer_masked (void); void udelay_masked (unsigned long usec); +/* calls to c from vectors.S */ +void bad_mode(void); +void do_undefined_instruction(struct pt_regs *pt_regs); +void do_software_interrupt(struct pt_regs *pt_regs); +void do_prefetch_abort(struct pt_regs *pt_regs); +void do_data_abort(struct pt_regs *pt_regs); +void do_not_used(struct pt_regs *pt_regs); +#ifdef CONFIG_ARM64 +void do_fiq(struct pt_regs *pt_regs, unsigned int esr); +void do_irq(struct pt_regs *pt_regs, unsigned int esr); +#else +void do_fiq(struct pt_regs *pt_regs); +void do_irq(struct pt_regs *pt_regswq); +#endif + #endif /* _U_BOOT_ARM_H_ */ diff --git a/arch/arm/lib/interrupts.c b/arch/arm/lib/interrupts.c index f6b7c03..9019736 100644 --- a/arch/arm/lib/interrupts.c +++ b/arch/arm/lib/interrupts.c @@ -21,6 +21,7 @@ #include <common.h> #include <asm/proc-armv/ptrace.h> +#include <asm/u-boot-arm.h> DECLARE_GLOBAL_DATA_PTR;
Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl> --- arch/arm/include/asm/u-boot-arm.h | 15 +++++++++++++++ arch/arm/lib/interrupts.c | 1 + 2 files changed, 16 insertions(+)