diff options
| author | Bernard Xiong <[email protected]> | 2020-04-10 20:52:04 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-04-10 20:52:04 +0800 |
| commit | 00f50941500ba250bb53e0beb84d75395140f2bd (patch) | |
| tree | 6210b51678669df5adf9e42ad14aab042bda4c5d | |
| parent | 446091fc103d279ea6ffb835041d9660fb99a0db (diff) | |
| parent | ab8e5e5a17bad4a31cc9321817ff8319ed03ea1f (diff) | |
Merge pull request #3514 from uselessboard/master
MIPS: fix FPU compile error for ls1bdev
| -rw-r--r-- | bsp/ls1bdev/.gitignore | 0 | ||||
| -rw-r--r-- | bsp/ls1bdev/drivers/board.c | 1 | ||||
| -rw-r--r-- | bsp/ls1bdev/rtconfig.py | 2 | ||||
| -rw-r--r-- | libcpu/mips/common/mips_fpu.h | 4 | ||||
| -rw-r--r-- | libcpu/mips/common/mips_regs.h | 6 |
5 files changed, 7 insertions, 6 deletions
diff --git a/bsp/ls1bdev/.gitignore b/bsp/ls1bdev/.gitignore new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/bsp/ls1bdev/.gitignore diff --git a/bsp/ls1bdev/drivers/board.c b/bsp/ls1bdev/drivers/board.c index e25c6267d5..a3f907f664 100644 --- a/bsp/ls1bdev/drivers/board.c +++ b/bsp/ls1bdev/drivers/board.c @@ -16,6 +16,7 @@ #include <rtthread.h> #include <rthw.h> +#include <mips_fpu.h> #include "board.h" #include "uart.h" diff --git a/bsp/ls1bdev/rtconfig.py b/bsp/ls1bdev/rtconfig.py index 13605429c1..a2c78a926a 100644 --- a/bsp/ls1bdev/rtconfig.py +++ b/bsp/ls1bdev/rtconfig.py @@ -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' diff --git a/libcpu/mips/common/mips_fpu.h b/libcpu/mips/common/mips_fpu.h index d6351f7655..50df3746a5 100644 --- a/libcpu/mips/common/mips_fpu.h +++ b/libcpu/mips/common/mips_fpu.h @@ -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 diff --git a/libcpu/mips/common/mips_regs.h b/libcpu/mips/common/mips_regs.h index c5dd727e23..a13e24b539 100644 --- a/libcpu/mips/common/mips_regs.h +++ b/libcpu/mips/common/mips_regs.h @@ -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)); |