sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More changes for PIC32MZ build under XC32

Browse Source
This commit is contained in:
Gregory Nutt 2015-03-21 16:38:24 -06:00
parent 4726c1e460
commit 0a13a27fca
3 changed files with 48 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/mips/include/types.h
View File

@ -92,4 +92,3 @@ typedef unsigned int irqstate_t;
****************************************************************************/ ****************************************************************************/
#endif /* __ARCH_MIPS_INCLUDE_TYPES_H */ #endif /* __ARCH_MIPS_INCLUDE_TYPES_H */

21
arch/mips/src/mips32/Kconfig
View File

@ -17,18 +17,22 @@ config MIPS32_TOOLCHAIN_GNU_ELF
This option should work for any modern GNU toolchain (GCC 4.5 or newer) This option should work for any modern GNU toolchain (GCC 4.5 or newer)
configured for mips32-elf. configured for mips32-elf.
config MIPS32_TOOLCHAIN_MICROCHIPL
bool "Microchip C32 toolchain under Linux"
depends on HOST_LINUX
config MIPS32_TOOLCHAIN_MICROCHIPL_XC32 config MIPS32_TOOLCHAIN_MICROCHIPL_XC32
bool "Microchip XC32 toolchain under Linux" bool "Microchip XC32 toolchain under Linux"
depends on HOST_LINUX depends on HOST_LINUX
config MIPS32_TOOLCHAIN_MICROCHIPL
bool "Microchip C32 toolchain under Linux"
depends on HOST_LINUX
config MIPS32_TOOLCHAIN_MICROCHIPL_LITE config MIPS32_TOOLCHAIN_MICROCHIPL_LITE
bool "Microchip C32 toolchain under Linux (Lite edition)" bool "Microchip C32 toolchain under Linux (Lite edition)"
depends on HOST_LINUX depends on HOST_LINUX
config MIPS32_TOOLCHAIN_MICROCHIPW_XC32
bool "Microchip XC32 toolchain under Windows"
depends on HOST_WINDOWS
config MIPS32_TOOLCHAIN_MICROCHIPW config MIPS32_TOOLCHAIN_MICROCHIPW
bool "Microchip C32 toolchain under Windows" bool "Microchip C32 toolchain under Windows"
depends on HOST_WINDOWS depends on HOST_WINDOWS
@ -51,6 +55,15 @@ config MIPS32_TOOLCHAIN_PINGUINOL
endchoice endchoice
config MIPS32_TOOLCHAIN_MICROCHIP_XC32_LICENSED
bool "Licensed Microchip XC32 toolchain"
default n
depends on MIPS32_TOOLCHAIN_MICROCHIPL_XC32 || MIPS32_TOOLCHAIN_MICROCHIPW_XC32
---help---
If you are using the unlicensed, free XC32 compiler then select this
option so that the build system will not attend to enable
optimization.
config MIPS32_FRAMEPOINTER config MIPS32_FRAMEPOINTER
bool "ABI Uses Frame Pointer" bool "ABI Uses Frame Pointer"
default n default n

41
arch/mips/src/mips32/Toolchain.defs
View File

@ -49,24 +49,30 @@ ifeq ($(filter y, \
CONFIG_MIPS32_TOOLCHAIN ?= GNU_ELF CONFIG_MIPS32_TOOLCHAIN ?= GNU_ELF
endif endif
ifeq ($(filter y, \
$(CONFIG_MIPS32_TOOLCHAIN_MICROCHIPL) \
),y)
CONFIG_MIPS32_TOOLCHAIN ?= MICROCHIPL
endif
ifeq ($(filter y, \ ifeq ($(filter y, \
$(CONFIG_MIPS32_TOOLCHAIN_MICROCHIPL_XC32) \ $(CONFIG_MIPS32_TOOLCHAIN_MICROCHIPL_XC32) \
),y) ),y)
CONFIG_MIPS32_TOOLCHAIN ?= MICROCHIPL_XC32 CONFIG_MIPS32_TOOLCHAIN ?= MICROCHIPL_XC32
endif endif
ifeq ($(filter y, \
$(CONFIG_MIPS32_TOOLCHAIN_MICROCHIPL) \
),y)
CONFIG_MIPS32_TOOLCHAIN ?= MICROCHIPL
endif
ifeq ($(filter y, \ ifeq ($(filter y, \
$(CONFIG_MIPS32_TOOLCHAIN_MICROCHIPL_LITE) \ $(CONFIG_MIPS32_TOOLCHAIN_MICROCHIPL_LITE) \
),y) ),y)
CONFIG_MIPS32_TOOLCHAIN ?= MICROCHIPL_LITE CONFIG_MIPS32_TOOLCHAIN ?= MICROCHIPL_LITE
endif endif
ifeq ($(filter y, \
$(CONFIG_MIPS32_TOOLCHAIN_MICROCHIPW_XC32) \
),y)
CONFIG_MIPS32_TOOLCHAIN ?= MICROCHIPW_XC32
endif
ifeq ($(filter y, \ ifeq ($(filter y, \
$(CONFIG_MIPS32_TOOLCHAIN_MICROCHIPW) \ $(CONFIG_MIPS32_TOOLCHAIN_MICROCHIPW) \
),y) ),y)
@ -142,6 +148,18 @@ ifeq ($(CONFIG_MIPS32_TOOLCHAIN),GNU_ELF)
LDSCRIPT = mips-elf-debug.ld LDSCRIPT = mips-elf-debug.ld
endif endif
# Microchip XC32 toolchain under Linux
ifeq ($(CONFIG_MIPS32_TOOLCHAIN),MICROCHIPL_XC32)
CROSSDEV ?= xc32-
ifeq ($(CONFIG_MIPS32_TOOLCHAIN_MICROCHIP_XC32_LICENSED),y)
MAXOPTIMIZATION ?= -O2
endif
ARCHCPUFLAGS = -mprocessor=$(MIPS_MPROCESSOR) -march=$(MIPS_MARCH) -EL $(MIPS_MICROMIPS) -msmart-io=0
LDFLAGS += -nostartfiles -nodefaultlibs
LDSCRIPT = xc32-debug.ld
endif
# Microchip C32 toolchain under Linux # Microchip C32 toolchain under Linux
ifeq ($(CONFIG_MIPS32_TOOLCHAIN),MICROCHIPL) ifeq ($(CONFIG_MIPS32_TOOLCHAIN),MICROCHIPL)
@ -154,11 +172,16 @@ ifeq ($(CONFIG_MIPS32_TOOLCHAIN),MICROCHIPL)
LDSCRIPT = xc32-debug.ld LDSCRIPT = xc32-debug.ld
endif endif
# Microchip XC32 toolchain under Linux # Microchip XC32 toolchain under Windows
ifeq ($(CONFIG_MIPS32_TOOLCHAIN),MICROCHIPL_XC32) ifeq ($(CONFIG_MIPS32_TOOLCHAIN),MICROCHIPW_XC32)
CROSSDEV ?= xc32- CROSSDEV ?= xc32-
ifneq ($(CONFIG_WINDOWS_NATIVE),y)
WINTOOL = y
endif
ifeq ($(CONFIG_MIPS32_TOOLCHAIN_MICROCHIP_XC32_LICENSED),y)
MAXOPTIMIZATION ?= -O2 MAXOPTIMIZATION ?= -O2
endif
ARCHCPUFLAGS = -mprocessor=$(MIPS_MPROCESSOR) -march=$(MIPS_MARCH) -EL $(MIPS_MICROMIPS) -msmart-io=0 ARCHCPUFLAGS = -mprocessor=$(MIPS_MPROCESSOR) -march=$(MIPS_MARCH) -EL $(MIPS_MICROMIPS) -msmart-io=0
LDFLAGS += -nostartfiles -nodefaultlibs LDFLAGS += -nostartfiles -nodefaultlibs
LDSCRIPT = xc32-debug.ld LDSCRIPT = xc32-debug.ld
@ -168,7 +191,6 @@ endif
ifeq ($(CONFIG_MIPS32_TOOLCHAIN),MICROCHIPW) ifeq ($(CONFIG_MIPS32_TOOLCHAIN),MICROCHIPW)
CROSSDEV ?= pic32- CROSSDEV ?= pic32-
# CROSSDEV ?= xc32-
ifneq ($(CONFIG_WINDOWS_NATIVE),y) ifneq ($(CONFIG_WINDOWS_NATIVE),y)
WINTOOL = y WINTOOL = y
endif endif
@ -183,7 +205,6 @@ endif
ifeq ($(CONFIG_MIPS32_TOOLCHAIN),MICROCHIPL_LITE) ifeq ($(CONFIG_MIPS32_TOOLCHAIN),MICROCHIPL_LITE)
CROSSDEV ?= pic32- CROSSDEV ?= pic32-
# CROSSDEV ?= xc32-
# MAXOPTIMIZATION ?= -O2 # MAXOPTIMIZATION ?= -O2
ARCHCPUFLAGS = -mprocessor=$(MIPS_MPROCESSOR) $(MIPS_MICROMIPS) -mno-float -mlong32 -membedded-data ARCHCPUFLAGS = -mprocessor=$(MIPS_MPROCESSOR) $(MIPS_MICROMIPS) -mno-float -mlong32 -membedded-data
ARCHPICFLAGS = -fpic -membedded-pic ARCHPICFLAGS = -fpic -membedded-pic