riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mips: Clean-up makefiles

Browse Source
This commit is contained in:
Neil Jones 2017-04-10 10:59:40 +01:00
parent 7b824fe7fe
commit af70c0844c
9 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
boards/mips-malta/Makefile.include
View File

@ -1,4 +1,5 @@
export CPU = mips32r2_common export CPU = mips32r2_common
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include/ export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include/
export USE_HARD_FLOAT = 1 #export USE_HARD_FLOAT = 1
export USE_DSP = 1 export USE_DSP = 1
export USE_UHI_SYSCALLS = 1

10
boards/mips-malta/include/periph_conf.h
View File

@ -41,16 +41,6 @@ extern "C" {
*/ */
#define UART_NUMOF (0) #define UART_NUMOF (0)
/**
* @brief Enable DSP context save + restore.
*/
#define MIPS_DSP (1)
/**
* @brief Enable FPU context save + restore.
*/
#define MIPS_HARD_FLOAT (1)
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

1
boards/pic32-clicker/Makefile.include
View File

@ -2,3 +2,4 @@ export CPU = mips_pic32mx
export CPU_MODEL=p32mx470f512h export CPU_MODEL=p32mx470f512h
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include/ export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include/
export APPDEPS += $(RIOTCPU)/$(CPU)/$(CPU_MODEL)/$(CPU_MODEL).S export APPDEPS += $(RIOTCPU)/$(CPU)/$(CPU_MODEL)/$(CPU_MODEL).S
export USE_UHI_SYSCALLS = 1

1
boards/pic32-wifire/Makefile.include
View File

@ -2,3 +2,4 @@ export CPU = mips_pic32mz
export CPU_MODEL=p32mz2048efg100 export CPU_MODEL=p32mz2048efg100
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include/ export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include/
export APPDEPS += $(RIOTCPU)/$(CPU)/$(CPU_MODEL)/$(CPU_MODEL).S export APPDEPS += $(RIOTCPU)/$(CPU)/$(CPU_MODEL)/$(CPU_MODEL).S
export USE_UHI_SYSCALLS = 1

1
cpu/mips32r2_common/Makefile.include
View File

@ -4,7 +4,6 @@ export APP_START=0x80000000
include $(RIOTMAKE)/arch/mips.inc.mk include $(RIOTMAKE)/arch/mips.inc.mk
export LINKFLAGS += -Tuhi32.ld
export USEMODULE += periph export USEMODULE += periph
export USEMODULE += newlib export USEMODULE += newlib

3
cpu/mips32r2_common/newlib_syscalls_mips_uhi/syscalls.c
View File

@ -12,7 +12,7 @@
* *
* @file * @file
* @brief Newlib system call implementation for use with the mips-mti-elf * @brief Newlib system call implementation for use with the mips-mti-elf
* toolchain newlib incoporating as sem-hosting interface caled 'UHI' * toolchain newlib incorporating as semi-hosting interface called 'UHI'
* *
* @author Neil Jones <neil.jones@imgtec.com> * @author Neil Jones <neil.jones@imgtec.com>
* *
@ -69,7 +69,6 @@ void _exit(int n)
{ {
exit(n); exit(n);
pm_off(); pm_off();
while(1);
} }
/** /**

14
cpu/mips_pic32mx/Makefile.include
View File

@ -1,6 +1,3 @@
export MEMORY_BASE=0x80000000
export MEMORY_SIZE=128K
export APP_START=0x80000000
export ROMABLE = 1 export ROMABLE = 1
include $(RIOTMAKE)/arch/mips.inc.mk include $(RIOTMAKE)/arch/mips.inc.mk
@ -9,7 +6,18 @@ include $(RIOTCPU)/mips_pic32_common/Makefile.include
# define build specific options # define build specific options
export CFLAGS += -march=m4k -DSKIP_COPY_TO_RAM export CFLAGS += -march=m4k -DSKIP_COPY_TO_RAM
export USEMODULE += mips_pic32_common
export USEMODULE += periph export USEMODULE += periph
export USEMODULE += newlib
ifeq ($(USE_UHI_SYSCALLS),1)
#Use UHI to handle syscalls
export LINKFLAGS += -luhi
export USEMODULE += newlib_syscalls_mips_uhi
else
#Use RIOT to handle syscalls (default)
export USEMODULE += newlib_syscalls_default
endif
export LINKFLAGS += -Wl,--defsym,__use_excpt_boot=0 $(CFLAGS) export LINKFLAGS += -Wl,--defsym,__use_excpt_boot=0 $(CFLAGS)
export LINKFLAGS += -Tpic32mx512_12_128_uhi.ld export LINKFLAGS += -Tpic32mx512_12_128_uhi.ld

15
cpu/mips_pic32mz/Makefile.include
View File

@ -1,6 +1,3 @@
export MEMORY_BASE=0x80000000
export MEMORY_SIZE=512K
export APP_START=0x80000000
export ROMABLE = 1 export ROMABLE = 1
include $(RIOTMAKE)/arch/mips.inc.mk include $(RIOTMAKE)/arch/mips.inc.mk
@ -10,7 +7,19 @@ include $(RIOTCPU)/mips_pic32_common/Makefile.include
export CFLAGS += -march=m5101 -mmicromips -DSKIP_COPY_TO_RAM export CFLAGS += -march=m5101 -mmicromips -DSKIP_COPY_TO_RAM
export CFLAGS += -DMIPS_MICROMIPS export CFLAGS += -DMIPS_MICROMIPS
export USEMODULE += mips_pic32_common
export USEMODULE += periph export USEMODULE += periph
export USEMODULE += newlib
ifeq ($(USE_UHI_SYSCALLS),1)
#Use UHI to handle syscalls
export LINKFLAGS += -luhi
export USEMODULE += newlib_syscalls_mips_uhi
else
#Use RIOT to handle syscalls (default)
export USEMODULE += newlib_syscalls_default
endif
export LINKFLAGS += -Wl,--defsym,__use_excpt_boot=0 $(CFLAGS) export LINKFLAGS += -Wl,--defsym,__use_excpt_boot=0 $(CFLAGS)
export LINKFLAGS += -Tpic32mz2048_uhi.ld export LINKFLAGS += -Tpic32mz2048_uhi.ld

4
makefiles/arch/mips.inc.mk
View File

@ -41,7 +41,7 @@ export CFLAGS_OPT = -Os
export CFLAGS += $(CFLAGS_CPU) $(CFLAGS_LINK) $(CFLAGS_OPT) $(CFLAGS_DBG) export CFLAGS += $(CFLAGS_CPU) $(CFLAGS_LINK) $(CFLAGS_OPT) $(CFLAGS_DBG)
ifeq ($(USE_HARD_FLOAT),1) ifeq ($(USE_HARD_FLOAT),1)
export CFLAGS += -mhard-float export CFLAGS += -mhard-float -DMIPS_HARD_FLOAT
else else
#hard-float is the default so we must set soft-float #hard-float is the default so we must set soft-float
export CFLAGS += -msoft-float export CFLAGS += -msoft-float
@ -49,7 +49,7 @@ else
endif endif
ifeq ($(USE_DSP),1) ifeq ($(USE_DSP),1)
export CFLAGS += -mdsp export CFLAGS += -mdsp -DMIPS_DSP
endif endif
ifeq ($(TOOLCHAIN),llvm) ifeq ($(TOOLCHAIN),llvm)