libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3514 from uselessboard/master 

MIPS: fix FPU compile error for ls1bdev
This commit is contained in:
Bernard Xiong 2020-04-10 20:52:04 +08:00 committed by GitHub
parent 446091fc10 ab8e5e5a17
commit 00f5094150
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
bsp/ls1bdev/.gitignore vendored Normal file
View File

1
bsp/ls1bdev/drivers/board.c
View File

@ -16,6 +16,7 @@
#include <rtthread.h>
#include <rthw.h>
#include <mips_fpu.h>
#include "board.h"
#include "uart.h"

2
bsp/ls1bdev/rtconfig.py
View File

@ -36,7 +36,7 @@ OBJDUMP = PREFIX + 'objdump'
OBJCPY = PREFIX + 'objcopy'
READELF = PREFIX + 'readelf'
DEVICE = ' -mips32'
DEVICE = ' -mips32r2'
CFLAGS = DEVICE + ' -EL -G0 -mno-abicalls -fno-pic -fno-builtin -fno-exceptions -ffunction-sections -fomit-frame-pointer'
AFLAGS = ' -c' + DEVICE + ' -EL -fno-pic -fno-builtin -mno-abicalls -x assembler-with-cpp'
LFLAGS = DEVICE + ' -nostartfiles -EL -Wl,--gc-sections,-Map=rtthread.map,-cref,-u,Reset_Handler -T ls1b_ram.lds'

4
libcpu/mips/common/mips_fpu.h
View File

@ -18,7 +18,7 @@
* init hardware FPU
*/
#ifdef RT_USING_FPU
inline void rt_hw_fpu_init(void)
rt_inline void rt_hw_fpu_init(void)
{
rt_uint32_t c0_status = 0;
rt_uint32_t c1_status = 0;
@ -38,7 +38,7 @@ inline void rt_hw_fpu_init(void)
return ;
}
#else
inline void rt_hw_fpu_init(void){} /* Do nothing */
rt_inline void rt_hw_fpu_init(void){} /* Do nothing */
#endif
#endif

6
libcpu/mips/common/mips_regs.h
View File

@ -999,7 +999,7 @@ do { \
#define write_32bit_cp0_set1_register(register,value) \
__asm__ __volatile__( \
"ctc0\t%0,"STR(register)"\n\t" \
"ctc0\t%0,$"STR(register)"\n\t" \
"nop" \
: : "r" (value));
@ -1037,14 +1037,14 @@ do { \
__asm__ __volatile__( \
".set\tpush\n\t" \
".set\treorder\n\t" \
"cfc1\t%0,"STR(source)"\n\t" \
"cfc1\t%0,$"STR(source)"\n\t" \
".set\tpop" \
: "=r" (__res)); \
__res;})
#define write_32bit_cp1_register(register,value) \
__asm__ __volatile__( \
"ctc1\t%0,"STR(register)"\n\t" \
"ctc1\t%0,$"STR(register)"\n\t" \
"nop" \
: : "r" (value));