Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions arch/tricore/include/irq.h
Original file line number Diff line number Diff line change
Expand Up @@ -147,14 +147,14 @@
/* FPU registers */

#ifdef CONFIG_ARCH_TC1V6
# define FPU_SYNC_TRAP_REG CPU_FPU_TRAP_CON
# define FPU_ASYNC_TRAP_REG CPU_FPU_TRAP_CON
# define FPU_SYNC_TRAP_REG 0xA000
# define FPU_ASYNC_TRAP_REG 0xA000
#else
# define FPU_SYNC_TRAP_REG CPU_FPU_SYNC_TRAP_CON
# define FPU_ASYNC_TRAP_REG CPU_FPU_TRAP_CON
# define FPU_SYNC_TRAP_REG 0xA030
# define FPU_ASYNC_TRAP_REG 0xA000
#endif
#define FPU_TRAP_FZE_SHIFT 20
#define FPU_TRAP_TCL_SHIFT 1
#define FPU_TRAP_FZE_SHIFT 20
#define FPU_TRAP_TCL_SHIFT 1

#ifndef __ASSEMBLY__

Expand Down
2 changes: 1 addition & 1 deletion arch/tricore/src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ distclean:: clean
ifeq ($(BOARDMAKE),y)
$(Q) $(MAKE) -C board distclean
endif
$(call DELFILE, $(CSRCS:.c=.ddc) $(ASRCS:.S=.dds)
$(call DELFILE, $(CSRCS:.c=.ddc) $(ASRCS:.S=.dds))
$(call DELFILE, Make.dep)
$(call DELFILE, .depend)

Expand Down
6 changes: 3 additions & 3 deletions arch/tricore/src/common/tricore_fpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

#include <string.h>

#include "tricore_internal.h"
#include <arch/irq.h>

/****************************************************************************
* Public Functions
Expand All @@ -42,8 +42,8 @@ void tricore_fpuinit(void)
{
/* FPU zero-divide trap enable */

__mtcr(FPU_SYNC_TRAP_REG,
__mfcr(FPU_SYNC_TRAP_REG) | (1U << FPU_TRAP_FZE_SHIFT));
tricore_mtcr(FPU_SYNC_TRAP_REG, tricore_mfcr(FPU_SYNC_TRAP_REG) |
(1U << FPU_TRAP_FZE_SHIFT));
}

/****************************************************************************
Expand Down
Loading