diff options
| -rw-r--r-- | c/src/exec/score/cpu/m68k/cpu_asm.s | 2 | ||||
| -rw-r--r-- | c/src/exec/score/cpu/m68k/m68k.h | 17 | ||||
| -rw-r--r-- | make/custom/gen68360.cfg | 7 |
3 files changed, 1 insertions, 25 deletions
diff --git a/c/src/exec/score/cpu/m68k/cpu_asm.s b/c/src/exec/score/cpu/m68k/cpu_asm.s index 0251335909..6f02897bec 100644 --- a/c/src/exec/score/cpu/m68k/cpu_asm.s +++ b/c/src/exec/score/cpu/m68k/cpu_asm.s @@ -238,7 +238,7 @@ bframe: clrl SYM (_ISR_Signals_to_thread_executing) movec msp,a0 | a0 = master stack pointer movew #0,a0@- | push format word movel #SYM(_ISR_Dispatch),a0@- | push return addr - movew sr,a0@- | push existing sr + movew a0@(6),a0@- | push saved sr movec a0,msp | set master stack pointer #else jsr SYM (_Thread_Dispatch) | Perform context switch diff --git a/c/src/exec/score/cpu/m68k/m68k.h b/c/src/exec/score/cpu/m68k/m68k.h index e7869b6ffa..5f4c3597b5 100644 --- a/c/src/exec/score/cpu/m68k/m68k.h +++ b/c/src/exec/score/cpu/m68k/m68k.h @@ -148,23 +148,6 @@ extern "C" { # define M68K_HAS_FPSP_PACKAGE 0 # endif -#elif defined(__mc68060__) - -#define CPU_MODEL_NAME "m68060" -#define M68K_HAS_VBR 1 -#define M68K_HAS_SEPARATE_STACKS 0 -#define M68K_HAS_BFFFO 1 -#define M68K_HAS_PREINDEXING 1 -#define M68K_HAS_EXTB_L 1 -#define M68K_HAS_MISALIGNED 1 -# if defined (__HAVE_68881__) -# define M68K_HAS_FPU 1 -# define M68K_HAS_FPSP_PACKAGE 1 -# else -# define M68K_HAS_FPU 0 -# define M68K_HAS_FPSP_PACKAGE 0 -# endif - #elif defined(__mc68302__) #define CPU_MODEL_NAME "m68302" #define M68K_HAS_VBR 0 diff --git a/make/custom/gen68360.cfg b/make/custom/gen68360.cfg index fb1493d788..cf2293f746 100644 --- a/make/custom/gen68360.cfg +++ b/make/custom/gen68360.cfg @@ -19,13 +19,6 @@ include $(RTEMS_ROOT)/make/custom/default.cfg # This is the actual bsp directory used during the build process. RTEMS_BSP_FAMILY=gen68360 -## Target compiler config file, if any -CONFIG.$(TARGET_ARCH).CC = $(RTEMS_ROOT)/make/compilers/gcc-target-default.cfg - -# We may install in a CPU model based directory but this is still -# a gen68360 based bsp. -RTEMS_BSP=gen68360 - # # You must use versions of gcc and gas that support the -mcpu32 option. # |