Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cpu/mips32r2_common: include newlib_syscalls_mips_uhi in Makefile.dep #14344

Merged
merged 1 commit into from
Jun 24, 2020
Merged

cpu/mips32r2_common: include newlib_syscalls_mips_uhi in Makefile.dep #14344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions boards/6lowpan-clicker/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
ifneq (,$(filter saul_default,$(USEMODULE)))
USEMODULE += saul_gpio
endif

USEMODULE += newlib_syscalls_mips_uhi
1 change: 0 additions & 1 deletion boards/6lowpan-clicker/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
APPDEPS += $(RIOTCPU)/$(CPU)/$(CPU_MODEL)/$(CPU_MODEL).S
USE_UHI_SYSCALLS = 1

# use pic32prog by default to program this board
PROGRAMMER ?= pic32prog
Expand Down
2 changes: 2 additions & 0 deletions boards/pic32-wifire/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
ifneq (,$(filter saul_default,$(USEMODULE)))
USEMODULE += saul_gpio
endif

USEMODULE += newlib_syscalls_mips_uhi
1 change: 0 additions & 1 deletion boards/pic32-wifire/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
APPDEPS += $(RIOTCPU)/$(CPU)/$(CPU_MODEL)/$(CPU_MODEL).S
USE_UHI_SYSCALLS = 1

PORT_LINUX ?= /dev/ttyUSB0
include $(RIOTMAKE)/tools/serial.inc.mk
Expand Down
7 changes: 2 additions & 5 deletions cpu/mips32r2_common/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@ USEMODULE += newlib
# mips32 needs periph_timer for its gettimeofday() implementation
FEATURES_REQUIRED += periph_timer

ifeq ($(USE_UHI_SYSCALLS),1)
#Use UHI to handle syscalls
USEMODULE += newlib_syscalls_mips_uhi
else
#Use RIOT to handle syscalls (default)
#Use RIOT to handle syscalls (default)
ifeq (,$(filter newlib_syscalls_mips_uhi,$(USEMODULE)))
USEMODULE += newlib_syscalls_default
endif
8 changes: 3 additions & 5 deletions cpu/mips32r2_common/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
INCLUDES += -I$(RIOTCPU)/mips32r2_common/include

ifeq ($(USE_UHI_SYSCALLS),1)
#Use UHI to handle syscalls
LINKFLAGS += -luhi
CFLAGS += -DHAVE_HEAP_STATS
endif
# NOTE: This can be turned into normal conditional syntax once #9913 is fixed
CFLAGS += $(if $(filter newlib_syscalls_mips_uhi,$(USEMODULE)),-DHAVE_HEAP_STATS,)
LINKFLAGS += $(if $(filter newlib_syscalls_mips_uhi,$(USEMODULE)),-luhi,)