mirror of
https://github.com/RIOT-OS/RIOT.git
synced 2025-12-31 09:21:19 +01:00
Merge pull request #14413 from aabadie/pr/mips/toolchain_update_adapt
mips: adapt for toolchain update (2020.06-01)
This commit is contained in:
commit
632a3613b5
@ -1,5 +1,10 @@
|
||||
include $(RIOTCPU)/mips32r2_common/Makefile.include
|
||||
|
||||
# The 2020.06-01 toolchain provides POSIX defines for pthread which conflicts
|
||||
# with the one in RIOT. The following CFLAGS skip the inclusion of the types
|
||||
# shipped by the toolchain.
|
||||
CFLAGS += -D_SYS__PTHREADTYPES_H_
|
||||
|
||||
CFLAGS += -DCPU_FAM_$(call uppercase_and_underscore,$(CPU_FAM))
|
||||
|
||||
INCLUDES += -I$(RIOTCPU)/mips_pic32_common/include
|
||||
|
||||
@ -201,9 +201,9 @@ int gpio_init(gpio_t pin, gpio_mode_t mode)
|
||||
pu = 1;
|
||||
break;
|
||||
case GPIO_OD_PU:
|
||||
pu = 1;
|
||||
pu = 1; /* fall-through */
|
||||
case GPIO_OD:
|
||||
od = 1;
|
||||
od = 1; /* fall-through */
|
||||
case GPIO_OUT:
|
||||
output = 1;
|
||||
break;
|
||||
|
||||
@ -18,7 +18,6 @@ OFLAGS += \
|
||||
--change-section-lma .init-0x80000000 \
|
||||
--change-section-lma .fini-0x80000000 \
|
||||
--change-section-lma .eh_frame-0x80000000 \
|
||||
--change-section-lma .jcr-0x80000000 \
|
||||
--change-section-lma .ctors-0x80000000 \
|
||||
--change-section-lma .dtors-0x80000000 \
|
||||
--change-section-lma .rodata-0x80000000 \
|
||||
|
||||
@ -21,7 +21,6 @@ OFLAGS += \
|
||||
--change-section-lma .init-0x80000000 \
|
||||
--change-section-lma .fini-0x80000000 \
|
||||
--change-section-lma .eh_frame-0x80000000 \
|
||||
--change-section-lma .jcr-0x80000000 \
|
||||
--change-section-lma .ctors-0x80000000 \
|
||||
--change-section-lma .dtors-0x80000000 \
|
||||
--change-section-lma .rodata-0x80000000 \
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user