diff --git a/arch/tricore/src/common/tricore_internal.h b/arch/tricore/src/common/tricore_internal.h index 21907a82d0..3485f7393d 100644 --- a/arch/tricore/src/common/tricore_internal.h +++ b/arch/tricore/src/common/tricore_internal.h @@ -190,8 +190,8 @@ extern uintptr_t _lc_ge_data[]; /* End+1 of .data */ #define _edata _lc_ge_data #define _eheap __USTACK0_END #else -extern uintptr_t __HEAP[]; /* End+1 of .data */ -extern uintptr_t __A0_MEM[]; /* End+1 of .data */ +extern uintptr_t __HEAP[]; /* End+1 of .data */ +extern uintptr_t __A0_MEM[]; /* End+1 of .data */ #define _sdata LCF_DSPR0_START #define _edata __A0_MEM #define _eheap __USTACK0_END @@ -250,7 +250,7 @@ void tricore_earlyserialinit(void); /* System Timer *************************************************************/ struct oneshot_lowerhalf_s * -tricore_systimer_initialize(void *tbase, int irq, uint64_t freq); +tricore_systimer_initialize(volatile void *tbase, int irq, uint64_t freq); /* Debug ********************************************************************/ diff --git a/arch/tricore/src/common/tricore_systimer.c b/arch/tricore/src/common/tricore_systimer.c index 5547a84f5e..5bda6b1654 100644 --- a/arch/tricore/src/common/tricore_systimer.c +++ b/arch/tricore/src/common/tricore_systimer.c @@ -44,7 +44,7 @@ struct tricore_systimer_lowerhalf_s { struct oneshot_lowerhalf_s lower; - void *tbase; + volatile void *tbase; uint64_t freq; uint64_t alarm; oneshot_callback_t callback; @@ -307,7 +307,7 @@ static int tricore_systimer_interrupt(int irq, void *context, void *arg) ****************************************************************************/ struct oneshot_lowerhalf_s * -tricore_systimer_initialize(void *tbase, int irq, uint64_t freq) +tricore_systimer_initialize(volatile void *tbase, int irq, uint64_t freq) { struct tricore_systimer_lowerhalf_s *priv = &g_systimer_lower; diff --git a/arch/tricore/src/common/tricore_trapcall.c b/arch/tricore/src/common/tricore_trapcall.c index 88fa318543..ec7f21feb5 100644 --- a/arch/tricore/src/common/tricore_trapcall.c +++ b/arch/tricore/src/common/tricore_trapcall.c @@ -63,5 +63,5 @@ void tricore_trapcall(volatile void *trap) CURRENT_REGS = regs; up_irq_save(); - PANIC_WITH_REGS("Trap", CURRENT_REGS); + PANIC_WITH_REGS("Trap", (void *)CURRENT_REGS); } diff --git a/arch/tricore/src/tc3xx/tc3xx_serial.c b/arch/tricore/src/tc3xx/tc3xx_serial.c index cf6e87bbfc..801255177a 100644 --- a/arch/tricore/src/tc3xx/tc3xx_serial.c +++ b/arch/tricore/src/tc3xx/tc3xx_serial.c @@ -100,10 +100,10 @@ struct up_dev_s { - void *uartbase; /* Base address of UART registers */ - void *pins; /* Pin configuration */ - uint32_t baud; /* Configured baud */ - uint8_t irq; /* IRQ associated with this UART */ + volatile void *uartbase; /* Base address of UART registers */ + const void *pins; /* Pin configuration */ + uint32_t baud; /* Configured baud */ + uint8_t irq; /* IRQ associated with this UART */ }; /****************************************************************************