Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34055b80 authored by Greg Ungerer's avatar Greg Ungerer
Browse files

m68k: use mmu fpu.h for non-mmu builds as well 



None of the currently support m68knommu targets have an FPU.
Use the mmu version of fpu.h for all m68k.

Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 375d1c7e

arch/m68k/include/asm/fpu.h

+19 −3
Original line number Diff line number Diff line 
#ifdef __uClinux__

#include "fpu_no.h"

#ifndef __M68K_FPU_H

#define __M68K_FPU_H





/*

 * MAX floating point unit state size (FSAVE/FRESTORE)

 */



#if defined(CONFIG_M68020) || defined(CONFIG_M68030)

#define FPSTATESIZE (216)

#elif defined(CONFIG_M68040)

#define FPSTATESIZE (96)

#elif defined(CONFIG_M68KFPU_EMU)

#define FPSTATESIZE (28)

#elif defined(CONFIG_M68060)

#define FPSTATESIZE (12)

#else

#include "fpu_mm.h"

#define FPSTATESIZE (0)

#endif



#endif /* __M68K_FPU_H */

arch/m68k/include/asm/fpu_mm.h

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
#ifndef __M68K_FPU_H

#define __M68K_FPU_H





/*

 * MAX floating point unit state size (FSAVE/FRESTORE)

 */



#if defined(CONFIG_M68020) || defined(CONFIG_M68030)

#define FPSTATESIZE (216)

#elif defined(CONFIG_M68040)

#define FPSTATESIZE (96)

#elif defined(CONFIG_M68KFPU_EMU)

#define FPSTATESIZE (28)

#elif defined(CONFIG_M68060)

#define FPSTATESIZE (12)

#else

#define FPSTATESIZE (0)

#endif



#endif /* __M68K_FPU_H */

arch/m68k/include/asm/fpu_no.h

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
#ifndef __M68KNOMMU_FPU_H

#define __M68KNOMMU_FPU_H





/*

 * MAX floating point unit state size (FSAVE/FRESTORE)

 */

#if defined(CONFIG_M68020) || defined(CONFIG_M68030)

#define FPSTATESIZE (216/sizeof(unsigned char))

#elif defined(CONFIG_M68040)

#define FPSTATESIZE (96/sizeof(unsigned char))

#elif defined(CONFIG_M68KFPU_EMU)

#define FPSTATESIZE (28/sizeof(unsigned char))

#elif defined(CONFIG_M68060)

#define FPSTATESIZE (12/sizeof(unsigned char))

#else

/* Assume no FP unit present then... */

#define FPSTATESIZE (2) /* dummy size */

#endif



#endif /* __M68K_FPU_H */