Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-20 20:44:39 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

build: Replace WINTOOL with CYGWIN_WINTOOL Kconfig

Browse Source 
so the correct value can be determinated by Kconfig system automatically

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao
2020-05-18 22:18:15 +08:00
committed by patacongo
parent 05ebb39998
commit bd656888f2
312 changed files with 469 additions and 713 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Kconfig
+8
View File
@@ -60,6 +60,14 @@ config TOOLCHAIN_WINDOWS
Selected internally if the selected Windows environment is compatible
with the use of Windows native toolchains.
config CYGWIN_WINTOOL
bool
default n
depends on WINDOWS_CYGWIN
---help---
Selected internally if Cygwin environment with the use of Windows
native toolchains.
choice
prompt "Windows Build Environment"
default WINDOWS_CYGWIN
TODO
+1 -1
View File
@@ -1331,7 +1331,7 @@ o Binary loaders (binfmt/)
That will not work for windows-based tools because they require Windows
style paths. The solution is to do something like this:
if ($(WINTOOL)y)
if ($(CONFIG_CYGWIN_WINTOOL),y)
NXFLATLDSCRIPT=${cygpath -w $(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld}
else
NXFLATLDSCRIPT=$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld
arch/arm/src/Makefile
+2 -2
View File
@@ -64,7 +64,7 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
CFLAGS += -I$(TOPDIR)\sched
else
ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
NUTTX = "${shell cygpath -w $(TOPDIR)/nuttx$(EXEEXT)}"
CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}"
CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/common}"
@@ -130,7 +130,7 @@ endif
else
BOARDMAKE = $(if $(wildcard ./board/Makefile),y,)
ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/staging"}"
ifeq ($(BOARDMAKE),y)
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"}"
arch/arm/src/arm/Kconfig
+1
View File
@@ -23,6 +23,7 @@ config ARM_TOOLCHAIN_GNU_EABIL
config ARM_TOOLCHAIN_GNU_EABIW
bool "Generic GNU EABI toolchain under Windows"
depends on TOOLCHAIN_WINDOWS
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
---help---
This option should work for any modern GNU toolchain (GCC 4.5 or newer)
configured for arm-none-eabi-.
arch/arm/src/arm/Toolchain.defs
+4 -15
View File
@@ -36,13 +36,13 @@ endif
ifeq ($(filter y, \
$(CONFIG_ARM_TOOLCHAIN_GNU_EABIL) \
),y)
CONFIG_ARM_TOOLCHAIN ?= GNU_EABIL
CONFIG_ARM_TOOLCHAIN ?= GNU_EABI
endif
ifeq ($(filter y, \
$(CONFIG_ARM_TOOLCHAIN_GNU_EABIW) \
),y)
CONFIG_ARM_TOOLCHAIN ?= GNU_EABIW
CONFIG_ARM_TOOLCHAIN ?= GNU_EABI
endif
#
@@ -80,21 +80,10 @@ endif
MAXOPTIMIZATION ?= -Os
endif
# Generic GNU EABI toolchain on macOS, Linux or any typical Posix system
# Generic GNU EABI toolchain
ifeq ($(CONFIG_ARM_TOOLCHAIN),GNU_EABIL)
ifeq ($(CONFIG_ARM_TOOLCHAIN),GNU_EABI)
CROSSDEV ?= arm-none-eabi-
ARCROSSDEV ?= arm-none-eabi-
MAXOPTIMIZATION ?= -Os
endif
# Generic GNU EABI toolchain under Windows
ifeq ($(CONFIG_ARM_TOOLCHAIN),GNU_EABIW)
CROSSDEV ?= arm-none-eabi-
ARCROSSDEV ?= arm-none-eabi-
MAXOPTIMIZATION ?= -Os
ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
WINTOOL = y
endif
endif
arch/arm/src/armv6-m/Kconfig
+1 -1
View File
@@ -25,7 +25,7 @@ config ARMV6M_TOOLCHAIN_GNU_EABIL
config ARMV6M_TOOLCHAIN_GNU_EABIW
bool "Generic GNU EABI toolchain under Windows"
depends on TOOLCHAIN_WINDOWS
select ARCH_TOOLCHAIN_GNU
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
---help---
This option should work for any modern GNU toolchain (GCC 4.5 or newer)
configured for arm-none-eabi.
arch/arm/src/armv6-m/Toolchain.defs
+4 -13
View File
@@ -32,11 +32,11 @@ ifeq ($(filter y, $(CONFIG_ARMV6M_TOOLCHAIN_BUILDROOT)),y)
endif
ifeq ($(filter y, $(CONFIG_ARMV6M_TOOLCHAIN_GNU_EABIL)),y)
CONFIG_ARMV6M_TOOLCHAIN ?= GNU_EABIL
CONFIG_ARMV6M_TOOLCHAIN ?= GNU_EABI
endif
ifeq ($(filter y, $(CONFIG_ARMV6M_TOOLCHAIN_GNU_EABIW)),y)
CONFIG_ARMV6M_TOOLCHAIN ?= GNU_EABIW
CONFIG_ARMV6M_TOOLCHAIN ?= GNU_EABI
endif
#
@@ -69,23 +69,14 @@ ifeq ($(CONFIG_ARMV6M_TOOLCHAIN),BUILDROOT)
ARCHCPUFLAGS = -mcpu=cortex-m0 -mthumb -mfloat-abi=soft
endif
# Generic GNU EABI toolchain on macOS, Linux or any typical Posix system
# Generic GNU EABI toolchain
ifeq ($(CONFIG_ARMV6M_TOOLCHAIN),GNU_EABIL)
ifeq ($(CONFIG_ARMV6M_TOOLCHAIN),GNU_EABI)
CROSSDEV ?= arm-none-eabi-
ARCROSSDEV ?= arm-none-eabi-
ARCHCPUFLAGS = -mcpu=cortex-m0 -mthumb -mfloat-abi=soft
endif
ifeq ($(CONFIG_ARMV6M_TOOLCHAIN),GNU_EABIW)
CROSSDEV ?= arm-none-eabi-
ARCROSSDEV ?= arm-none-eabi-
ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
WINTOOL = y
endif
ARCHCPUFLAGS = -mcpu=cortex-m0 -mthumb -mfloat-abi=soft
endif
# Individual tools may limit the optimizatin level but, by default, the
# optimization level will be set to -Os
arch/arm/src/armv7-a/Kconfig
+2 -1
View File
@@ -145,8 +145,9 @@ config ARMV7A_TOOLCHAIN_GNU_EABIL
config ARMV7A_TOOLCHAIN_GNU_EABIW
bool "Generic GNU EABI toolchain under Windows"
select ARCH_TOOLCHAIN_GNU
depends on TOOLCHAIN_WINDOWS
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
select ARCH_TOOLCHAIN_GNU
---help---
This option should work for any modern GNU toolchain (GCC 4.5 or newer)
configured for arm-none-eabi-.
arch/arm/src/armv7-a/Toolchain.defs
+4 -15
View File
@@ -34,13 +34,13 @@ endif
ifeq ($(filter y, \
$(CONFIG_ARMV7A_TOOLCHAIN_GNU_EABIL) \
),y)
CONFIG_ARMV7A_TOOLCHAIN ?= GNU_EABIL
CONFIG_ARMV7A_TOOLCHAIN ?= GNU_EABI
endif
ifeq ($(filter y, \
$(CONFIG_ARMV7A_TOOLCHAIN_GNU_EABIW) \
),y)
CONFIG_ARMV7A_TOOLCHAIN ?= GNU_EABIW
CONFIG_ARMV7A_TOOLCHAIN ?= GNU_EABI
endif
#
@@ -98,21 +98,10 @@ endif
MAXOPTIMIZATION ?= -Os
endif
# Generic GNU EABI toolchain on macOS, Linux or any typical Posix system
# Generic GNU EABI toolchain
ifeq ($(CONFIG_ARMV7A_TOOLCHAIN),GNU_EABIL)
ifeq ($(CONFIG_ARMV7A_TOOLCHAIN),GNU_EABI)
CROSSDEV ?= $(TARGET_ARCH)-none-eabi-
ARCROSSDEV ?= $(TARGET_ARCH)-none-eabi-
MAXOPTIMIZATION ?= -Os
endif
# Generic GNU EABI toolchain under Windows
ifeq ($(CONFIG_ARMV7A_TOOLCHAIN),GNU_EABIW)
CROSSDEV ?= $(TARGET_ARCH)-none-eabi-
ARCROSSDEV ?= $(TARGET_ARCH)-none-eabi-
MAXOPTIMIZATION ?= -Os
ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
WINTOOL = y
endif
endif
arch/arm/src/armv7-m/Kconfig
+3
View File
@@ -128,6 +128,7 @@ choice
config ARMV7M_TOOLCHAIN_IARW
bool "IAR for Windows"
depends on TOOLCHAIN_WINDOWS
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
select ARCH_TOOLCHAIN_IAR
config ARMV7M_TOOLCHAIN_IARL
@@ -151,6 +152,7 @@ config ARMV7M_TOOLCHAIN_GNU_EABIL
config ARMV7M_TOOLCHAIN_GNU_EABIW
bool "Generic GNU EABI toolchain under Windows"
depends on TOOLCHAIN_WINDOWS
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
select ARCH_TOOLCHAIN_GNU
config ARMV7M_TOOLCHAIN_CLANGL
@@ -161,6 +163,7 @@ config ARMV7M_TOOLCHAIN_CLANGL
config ARMV7M_TOOLCHAIN_CLANGW
bool "Generic Clang toolchain under Windows"
depends on TOOLCHAIN_WINDOWS
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
select ARCH_TOOLCHAIN_GNU
---help---
This option should work for any modern GNU toolchain (GCC 4.5 or newer)
arch/arm/src/armv7-m/Toolchain.defs
+8 -33
View File
@@ -36,25 +36,25 @@ endif
ifeq ($(filter y, \
$(CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL) \
),y)
CONFIG_ARMV7M_TOOLCHAIN ?= GNU_EABIL
CONFIG_ARMV7M_TOOLCHAIN ?= GNU_EABI
endif
ifeq ($(filter y, \
$(CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW) \
),y)
CONFIG_ARMV7M_TOOLCHAIN ?= GNU_EABIW
CONFIG_ARMV7M_TOOLCHAIN ?= GNU_EABI
endif
ifeq ($(filter y, \
$(CONFIG_ARMV7M_TOOLCHAIN_CLANGL) \
),y)
CONFIG_ARMV7M_TOOLCHAIN ?= CLANGL
CONFIG_ARMV7M_TOOLCHAIN ?= CLANG
endif
ifeq ($(filter y, \
$(CONFIG_ARMV7M_TOOLCHAIN_CLANGW) \
),y)
CONFIG_ARMV7M_TOOLCHAIN ?= CLANGW
CONFIG_ARMV7M_TOOLCHAIN ?= CLANG
endif
#
@@ -124,45 +124,20 @@ endif
MAXOPTIMIZATION ?= -Os
endif
# Generic GNU EABI toolchain on macOS, Linux or any typical Posix system
# Generic GNU EABI toolchain
ifeq ($(CONFIG_ARMV7M_TOOLCHAIN),GNU_EABIL)
ifeq ($(CONFIG_ARMV7M_TOOLCHAIN),GNU_EABI)
CROSSDEV ?= arm-none-eabi-
ARCROSSDEV ?= arm-none-eabi-
MAXOPTIMIZATION ?= -Os
ARCHCPUFLAGS = $(TOOLCHAIN_MCPU) -mthumb $(TOOLCHAIN_MFLOAT)
endif
# Generic GNU EABI toolchain under Windows
# Clang toolchain
ifeq ($(CONFIG_ARMV7M_TOOLCHAIN),GNU_EABIW)
CROSSDEV ?= arm-none-eabi-
ARCROSSDEV ?= arm-none-eabi-
MAXOPTIMIZATION ?= -Os
ARCHCPUFLAGS = $(TOOLCHAIN_MCPU) -mthumb $(TOOLCHAIN_MFLOAT)
ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
WINTOOL = y
endif
endif
# Clang toolchain on macOS, Linux or any typical Posix system
ifeq ($(CONFIG_ARMV7M_TOOLCHAIN),CLANGL)
ifeq ($(CONFIG_ARMV7M_TOOLCHAIN),CLANG)
CROSSDEV ?= arm-none-eabi-
ARCROSSDEV ?= arm-none-eabi-
MAXOPTIMIZATION ?= -Os
ARCHCPUFLAGS = $(TOOLCHAIN_MCPU) -mthumb $(TOOLCHAIN_MFLOAT)
endif
# Clang toolchain under Windows
ifeq ($(CONFIG_ARMV7M_TOOLCHAIN),CLANGW)
CROSSDEV ?= arm-none-eabi-
ARCROSSDEV ?= arm-none-eabi-
MAXOPTIMIZATION ?= -Os
ARCHCPUFLAGS = $(TOOLCHAIN_MCPU) -mthumb $(TOOLCHAIN_MFLOAT)
ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
WINTOOL = y
endif
endif
arch/arm/src/armv7-r/Kconfig
+2 -1
View File
@@ -145,8 +145,9 @@ config ARMV7R_TOOLCHAIN_GNU_EABIL
config ARMV7R_TOOLCHAIN_GNU_EABIW
bool "Generic GNU EABI toolchain under Windows"
select ARCH_TOOLCHAIN_GNU
depends on TOOLCHAIN_WINDOWS
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
select ARCH_TOOLCHAIN_GNU
---help---
This option should work for any modern GNU toolchain (GCC 4.5 or newer)
configured for arm-none-eabi-.
arch/arm/src/armv7-r/Toolchain.defs
+4 -15
View File
@@ -34,13 +34,13 @@ endif
ifeq ($(filter y, \
$(CONFIG_ARMV7R_TOOLCHAIN_GNU_EABIL) \
),y)
CONFIG_ARMV7R_TOOLCHAIN ?= GNU_EABIL
CONFIG_ARMV7R_TOOLCHAIN ?= GNU_EABI
endif
ifeq ($(filter y, \
$(CONFIG_ARMV7R_TOOLCHAIN_GNU_EABIW) \
),y)
CONFIG_ARMV7R_TOOLCHAIN ?= GNU_EABIW
CONFIG_ARMV7R_TOOLCHAIN ?= GNU_EABI
endif
#
@@ -80,21 +80,10 @@ endif
MAXOPTIMIZATION ?= -Os
endif
# Generic GNU EABI toolchain on macOS, Linux or any typical Posix system
# Generic GNU EABI toolchain
ifeq ($(CONFIG_ARMV7R_TOOLCHAIN),GNU_EABIL)
ifeq ($(CONFIG_ARMV7R_TOOLCHAIN),GNU_EABI)
CROSSDEV ?= $(TARGET_ARCH)-none-eabi-
ARCROSSDEV ?= $(TARGET_ARCH)-none-eabi-
MAXOPTIMIZATION ?= -Os
endif
# Generic GNU EABI toolchain under Windows
ifeq ($(CONFIG_ARMV7R_TOOLCHAIN),GNU_EABIW)
CROSSDEV ?= $(TARGET_ARCH)-none-eabi-
ARCROSSDEV ?= $(TARGET_ARCH)-none-eabi-
MAXOPTIMIZATION ?= -Os
ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
WINTOOL = y
endif
endif
arch/arm/src/armv8-m/Kconfig
+2
View File
@@ -122,6 +122,7 @@ config ARMV8M_TOOLCHAIN_GNU_EABIL
config ARMV8M_TOOLCHAIN_GNU_EABIW
bool "Generic GNU EABI toolchain under Windows"
depends on TOOLCHAIN_WINDOWS
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
select ARCH_TOOLCHAIN_GNU
config ARMV8M_TOOLCHAIN_CLANGL
@@ -132,6 +133,7 @@ config ARMV8M_TOOLCHAIN_CLANGL
config ARMV8M_TOOLCHAIN_CLANGW
bool "Generic Clang toolchain under Windows"
depends on TOOLCHAIN_WINDOWS
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
select ARCH_TOOLCHAIN_GNU
---help---
This option should work for any modern GNU toolchain (GCC 4.5 or newer)
arch/arm/src/armv8-m/Toolchain.defs
+8 -33
View File
@@ -36,25 +36,25 @@ endif
ifeq ($(filter y, \
$(CONFIG_ARMV8M_TOOLCHAIN_GNU_EABIL) \
),y)
CONFIG_ARMV8M_TOOLCHAIN ?= GNU_EABIL
CONFIG_ARMV8M_TOOLCHAIN ?= GNU_EABI
endif
ifeq ($(filter y, \
$(CONFIG_ARMV8M_TOOLCHAIN_GNU_EABIW) \
),y)
CONFIG_ARMV8M_TOOLCHAIN ?= GNU_EABIW
CONFIG_ARMV8M_TOOLCHAIN ?= GNU_EABI
endif
ifeq ($(filter y, \
$(CONFIG_ARMV8M_TOOLCHAIN_CLANGL) \
),y)
CONFIG_ARMV8M_TOOLCHAIN ?= CLANGL
CONFIG_ARMV8M_TOOLCHAIN ?= CLANG
endif
ifeq ($(filter y, \
$(CONFIG_ARMV8M_TOOLCHAIN_CLANGW) \
),y)
CONFIG_ARMV8M_TOOLCHAIN ?= CLANGW
CONFIG_ARMV8M_TOOLCHAIN ?= CLANG
endif
#
@@ -114,45 +114,20 @@ endif
MAXOPTIMIZATION ?= -Os
endif
# Generic GNU EABI toolchain on OS X, Linux or any typical Posix system
# Generic GNU EABI toolchain
ifeq ($(CONFIG_ARMV8M_TOOLCHAIN),GNU_EABIL)
ifeq ($(CONFIG_ARMV8M_TOOLCHAIN),GNU_EABI)
CROSSDEV ?= arm-none-eabi-
ARCROSSDEV ?= arm-none-eabi-
MAXOPTIMIZATION ?= -Os
ARCHCPUFLAGS = $(TOOLCHAIN_MCPU) -mthumb $(TOOLCHAIN_MFLOAT)
endif
# Generic GNU EABI toolchain under Windows
# Clang toolchain
ifeq ($(CONFIG_ARMV8M_TOOLCHAIN),GNU_EABIW)
CROSSDEV ?= arm-none-eabi-
ARCROSSDEV ?= arm-none-eabi-
MAXOPTIMIZATION ?= -Os
ARCHCPUFLAGS = $(TOOLCHAIN_MCPU) -mthumb $(TOOLCHAIN_MFLOAT)
ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
WINTOOL = y
endif
endif
# Clang toolchain on OS X, Linux or any typical Posix system
ifeq ($(CONFIG_ARMV8M_TOOLCHAIN),CLANGL)
ifeq ($(CONFIG_ARMV8M_TOOLCHAIN),CLANG)
CROSSDEV ?= arm-none-eabi-
ARCROSSDEV ?= arm-none-eabi-
MAXOPTIMIZATION ?= -Os
ARCHCPUFLAGS = $(TOOLCHAIN_MCPU) -mthumb $(TOOLCHAIN_MFLOAT)
endif
# Clang toolchain under Windows
ifeq ($(CONFIG_ARMV8M_TOOLCHAIN),CLANGW)
CROSSDEV ?= arm-none-eabi-
ARCROSSDEV ?= arm-none-eabi-
MAXOPTIMIZATION ?= -Os
ARCHCPUFLAGS = $(TOOLCHAIN_MCPU) -mthumb $(TOOLCHAIN_MFLOAT)
ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
WINTOOL = y
endif
endif
arch/avr/src/Makefile
+2 -2
View File
@@ -51,7 +51,7 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
INCLUDES += -I "$(TOPDIR)\sched"
else
ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
NUTTX = "${shell cygpath -w $(TOPDIR)/nuttx$(EXEEXT)}"
INCLUDES += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}"
INCLUDES += -I "${shell cygpath -w $(ARCH_SRCDIR)/common}"
@@ -102,7 +102,7 @@ endif
else
BOARDMAKE = $(if $(wildcard ./board/Makefile),y,)
ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/staging"}"
ifeq ($(BOARDMAKE),y)
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"}"
arch/avr/src/avr/Kconfig
+2
View File
@@ -15,6 +15,7 @@ choice
config AVR_WINAVR_TOOLCHAIN
bool "WinAVR"
depends on TOOLCHAIN_WINDOWS
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
---help---
For Cygwin development environment on Windows machines, you
can use WinAVR: http://sourceforge.net/projects/winavr/files/
@@ -27,6 +28,7 @@ config AVR_WINAVR_TOOLCHAIN
config AVR_ATMEL_AVR_TOOLCHAIN
bool "Atmel AVR Toolchain"
depends on TOOLCHAIN_WINDOWS
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
---help---
Atmel provides GNU Toolchain for AVR development. It can
be obtained by installing Atmel Studio 6 and later or
arch/avr/src/avr/Toolchain.defs
+1 -14
View File
@@ -69,7 +69,7 @@ endif
ifeq ($(filter y, \
$(CONFIG_AVR_ATMEL_AVR_TOOLCHAIN) \
),y)
CONFIG_AVR_TOOLCHAIN ?= ATMEL
CONFIG_AVR_TOOLCHAIN ?= WINAVR
endif
# Chip-specific CPU flags
@@ -120,21 +120,8 @@ ifeq ($(CONFIG_AVR_TOOLCHAIN),LINUXGCC)
LDFLAGS += -nostartfiles -nodefaultlibs
endif
# WinAVR or Atmel toolchain under Windows/Cygwin
_WINAVR = 0
ifeq ($(CONFIG_AVR_TOOLCHAIN),WINAVR)
_WINAVR = 1
endif
ifeq ($(CONFIG_AVR_TOOLCHAIN),ATMEL)
_WINAVR = 1
endif
ifeq ($(_WINAVR),1)
CROSSDEV ?= avr-
ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
WINTOOL = y
endif
MAXOPTIMIZATION ?= -O2
LDFLAGS += -nostartfiles -nodefaultlibs
endif
arch/avr/src/avr32/Kconfig
+1
View File
@@ -14,6 +14,7 @@ choice
config AVR32_AVRTOOLSW
bool "AVR tools for Windows"
depends on TOOLCHAIN_WINDOWS
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
config AVR32_AVRTOOLSL
bool "AVR tools for Linux"
arch/avr/src/avr32/Toolchain.defs
+1 -17
View File
@@ -49,20 +49,4 @@
CROSSDEV = avr32-
ARCHCPUFLAGS = -mpart=uc3b0256
ifeq ($(filter y, \
$(CONFIG_AVR32_AVRTOOLSW) \
$(CONFIG_HOST_WINDOWS) \
),y)
# AVR Tools under Windows
CONFIG_AVR32_TOOLCHAIN ?= AVRTOOLSW
else
CONFIG_AVR32_TOOLCHAIN ?= GNU
endif
ifeq ($(CONFIG_AVR32_TOOLCHAIN),AVRTOOLSW)
ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
WINTOOL = y
endif
else
# AVR Tools or avr32-toolchain from https://github.com/jsnyder/avr32-toolchain
endif
# AVR Tools or avr32-toolchain from https://github.com/jsnyder/avr32-toolchain
arch/hc/src/Makefile
+2 -2
View File
@@ -56,7 +56,7 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
CFLAGS += -I$(TOPDIR)\sched
else
ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
NUTTX = "${shell cygpath -w $(TOPDIR)/nuttx$(EXEEXT)}"
CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}"
CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/common}"
@@ -102,7 +102,7 @@ endif
else
BOARDMAKE = $(if $(wildcard ./board/Makefile),y,)
ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/staging"}"
ifeq ($(BOARDMAKE),y)
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"}"
arch/mips/src/Makefile
+2 -2
View File
@@ -53,7 +53,7 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
CFLAGS += -I$(TOPDIR)\sched
else
ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
NUTTX = "${shell cygpath -w $(TOPDIR)/nuttx$(EXEEXT)}"
CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}"
CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/common}"
@@ -99,7 +99,7 @@ endif
else
BOARDMAKE = $(if $(wildcard ./board/Makefile),y,)
ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/staging"}"
ifeq ($(BOARDMAKE),y)
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"}"
arch/mips/src/mips32/Kconfig
+4
View File
@@ -36,16 +36,19 @@ config MIPS32_TOOLCHAIN_MICROCHIPL_LITE
config MIPS32_TOOLCHAIN_MICROCHIPW_XC32
bool "Microchip XC32 toolchain under Windows"
depends on TOOLCHAIN_WINDOWS
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
select ARCH_TOOLCHAIN_GNU
config MIPS32_TOOLCHAIN_MICROCHIPW
bool "Microchip C32 toolchain under Windows"
depends on TOOLCHAIN_WINDOWS
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
select ARCH_TOOLCHAIN_GNU
config MIPS32_TOOLCHAIN_MICROCHIPW_LITE
bool "Microchip C32 toolchain under Windows (Lite edition)"
depends on TOOLCHAIN_WINDOWS
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
select ARCH_TOOLCHAIN_GNU
config MIPS32_TOOLCHAIN_MICROCHIPOPENL
@@ -56,6 +59,7 @@ config MIPS32_TOOLCHAIN_MICROCHIPOPENL
config MIPS32_TOOLCHAIN_PINGUINOW
bool "Pinguino mips-elf toolchain under Windows"
depends on TOOLCHAIN_WINDOWS || WINDOWS_UBUNTU
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
select ARCH_TOOLCHAIN_GNU
config MIPS32_TOOLCHAIN_PINGUINOL
arch/mips/src/mips32/Toolchain.defs
-12
View File
@@ -194,9 +194,6 @@ endif
ifeq ($(CONFIG_MIPS32_TOOLCHAIN),MICROCHIPW_XC32)
CROSSDEV ?= xc32-
ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
WINTOOL = y
endif
ifeq ($(CONFIG_MIPS32_TOOLCHAIN_MICROCHIP_XC32_LICENSED),y)
MAXOPTIMIZATION ?= -O2
endif
@@ -209,9 +206,6 @@ endif
ifeq ($(CONFIG_MIPS32_TOOLCHAIN),MICROCHIPW)
CROSSDEV ?= pic32-
ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
WINTOOL = y
endif
MAXOPTIMIZATION ?= -O2
ARCHCPUFLAGS = -mprocessor=$(MIPS_MPROCESSOR) $(MIPS_MICROMIPS) -mno-float -mlong32 -membedded-data
ARCHPICFLAGS = -fpic -membedded-pic
@@ -235,9 +229,6 @@ endif
ifeq ($(CONFIG_MIPS32_TOOLCHAIN),MICROCHIPW_LITE)
CROSSDEV ?= pic32-
# CROSSDEV ?= xc32-
ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
WINTOOL = y
endif
# MAXOPTIMIZATION ?= -O2
ARCHCPUFLAGS = -mprocessor=$(MIPS_MPROCESSOR) $(MIPS_MICROMIPS) -mno-float -mlong32 -membedded-data
ARCHPICFLAGS = -fpic -membedded-pic
@@ -261,9 +252,6 @@ endif
ifeq ($(CONFIG_MIPS32_TOOLCHAIN),PINGUINOW)
#CROSSDEV ?= mips-
CROSSDEV ?= p32-
ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
WINTOOL = y
endif
MAXOPTIMIZATION ?= -O2
ARCHCPUFLAGS = -mlong32 -membedded-data -msoft-float -march=$(MIPS_MARCH) $(MIPS_MICROMIPS) -EL
ARCHPICFLAGS = -fpic -membedded-pic
arch/misoc/src/Makefile
+2 -2
View File
@@ -53,7 +53,7 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
INCLUDES += -I "$(TOPDIR)\sched"
else
ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
NUTTX = "${shell cygpath -w $(TOPDIR)/nuttx$(EXEEXT)}"
INCLUDES += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}"
INCLUDES += -I "${shell cygpath -w $(ARCH_SRCDIR)/common}"
@@ -104,7 +104,7 @@ endif
else
BOARDMAKE = $(if $(wildcard ./board/Makefile),y,)
ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/staging"}"
ifeq ($(BOARDMAKE),y)
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"}"
arch/misoc/src/lm32/Kconfig
+1
View File
@@ -25,6 +25,7 @@ config LM32_TOOLCHAIN_GNUL
config LM32_TOOLCHAIN_GNUW
bool "Generic GNU toolchain under Windows"
depends on TOOLCHAIN_WINDOWS
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
select ARCH_TOOLCHAIN_GNU
---help---
This option should work for any modern GNU toolchain (GCC 4.5 or newer)
arch/misoc/src/lm32/Toolchain.defs
+3 -14
View File
@@ -49,13 +49,13 @@ endif
ifeq ($(filter y, \
$(CONFIG_LM32_TOOLCHAIN_GNUL) \
),y)
CONFIG_LM32_TOOLCHAIN ?= GNUL
CONFIG_LM32_TOOLCHAIN ?= GNU
endif
ifeq ($(filter y, \
$(CONFIG_LM32_TOOLCHAIN_GNUW) \
),y)
CONFIG_LM32_TOOLCHAIN ?= GNUW
CONFIG_LM32_TOOLCHAIN ?= GNU
endif
#
@@ -84,21 +84,10 @@ ifeq ($(CONFIG_LM32_TOOLCHAIN),BUILDROOT)
MAXOPTIMIZATION ?= -Os
endif
# Generic GNU toolchain on macOS, Linux or any typical Posix system
# Generic GNU toolchain
ifeq ($(CONFIG_LM32_TOOLCHAIN),GNUL)
CROSSDEV ?= lm32-elf-
ARCROSSDEV ?= lm32-elf-
MAXOPTIMIZATION ?= -Os
endif
# Generic GNU toolchain under Windows (native)
ifeq ($(CONFIG_LM32_TOOLCHAIN),GNUW)
CROSSDEV ?= lm32-elf--
ARCROSSDEV ?= lm32-elf--
MAXOPTIMIZATION ?= -Os
ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
WINTOOL = y
endif
endif
arch/misoc/src/minerva/Kconfig
+1
View File
@@ -25,6 +25,7 @@ config MINERVA_TOOLCHAIN_GNUL
config MINERVA_TOOLCHAIN_GNUW
bool "Generic GNU toolchain under Windows"
depends on TOOLCHAIN_WINDOWS
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
select ARCH_TOOLCHAIN_GNU
---help---
This option should work for any modern GNU toolchain (GCC 4.5 or newer)
arch/or1k/src/Makefile
+2 -2
View File
@@ -55,7 +55,7 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
CFLAGS += -I$(TOPDIR)\sched
else
ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
NUTTX = "${shell cygpath -w $(TOPDIR)/nuttx$(EXEEXT)}"
CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}"
CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/common}"
@@ -121,7 +121,7 @@ endif
else
BOARDMAKE = $(if $(wildcard ./board/Makefile),y,)
ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/staging"}"
ifeq ($(BOARDMAKE),y)
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"}"
arch/renesas/Kconfig
+4
View File
@@ -50,18 +50,22 @@ config ARCH_SH1
config ARCH_RX65N
bool
default n
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
config ARCH_RX65N_RSK1MB
bool
default n
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
config ARCH_RX65N_RSK2MB
bool
default n
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
config ARCH_RX65N_GRROSE
bool
default n
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
config ARCH_M16C
bool
arch/renesas/src/Makefile
+3 -3
View File
@@ -49,7 +49,7 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
CFLAGS += -I=$(TOPDIR)\sched
else
ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
NUTTX = ${shell cygpath -w $(TOPDIR)/nuttx$(EXEEXT)}
CFLAGS += -I ${shell cygpath -w $(ARCH_SRCDIR)/chip}
CFLAGS += -I ${shell cygpath -w $(ARCH_SRCDIR)/common}
@@ -97,7 +97,7 @@ endif
else
BOARDMAKE = $(if $(wildcard ./board/Makefile),y,)
ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/staging"}"
ifeq ($(BOARDMAKE),y)
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"}"
@@ -138,7 +138,7 @@ board/libboard$(LIBEXT):
nuttx$(EXEEXT): $(HEAD_OBJ) board/libboard$(LIBEXT)
@echo "LD: nuttx"
ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
$(Q) $(LD) --entry=__start $(LDFLAGS) $(LIBPATHS) -o ${shell cygpath -m "$(TOPDIR)"}/$@ $(HEAD_OBJ) \
$(LDSTARTGROUP) $(LDLIBS) $(EXTRA_LIBS) "$(LIBGCC)" $(LDENDGROUP)
@echo "LD: nuttx"
arch/risc-v/src/Makefile
+2 -2
View File
@@ -61,7 +61,7 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
CFLAGS += -I$(TOPDIR)\sched
else
ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
NUTTX = "${shell cygpath -w $(TOPDIR)/nuttx$(EXEEXT)}"
CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}"
CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/common}"
@@ -127,7 +127,7 @@ endif
else
BOARDMAKE = $(if $(wildcard ./board/Makefile),y,)
ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/staging"}"
ifeq ($(BOARDMAKE),y)
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"}"
arch/risc-v/src/rv32im/Kconfig
+2 -1
View File
@@ -19,8 +19,9 @@ config RV32IM_TOOLCHAIN_GNU_RVGL
config RV32IM_TOOLCHAIN_GNU_RVGW
bool "Generic GNU RVG toolchain under Windows"
select ARCH_TOOLCHAIN_GNU
depends on TOOLCHAIN_WINDOWS
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
select ARCH_TOOLCHAIN_GNU
---help---
This option should work for any modern GNU toolchain (GCC 5.2 or newer)
configured for riscv32-unknown-elf.
arch/risc-v/src/rv32im/Toolchain.defs
+4 -22
View File
@@ -45,11 +45,11 @@
#
ifeq ($(filter y, $(CONFIG_RV32IM_TOOLCHAIN_GNU_RVGL)),y)
CONFIG_RISCV_TOOLCHAIN ?= GNU_RVGL
CONFIG_RISCV_TOOLCHAIN ?= GNU_RVG
endif
ifeq ($(filter y, $(CONFIG_RV32IM_TOOLCHAIN_GNU_RVGW)),y)
CONFIG_RISCV_TOOLCHAIN ?= GNU_RVGW
CONFIG_RISCV_TOOLCHAIN ?= GNU_RVG
endif
ifeq ($(filter y, $(CONFIG_RI5CY_GAP8_TOOLCHAIN)),y)
@@ -74,9 +74,9 @@ ifeq ($(CONFIG_DEBUG_CUSTOMOPT),y)
MAXOPTIMIZATION := $(CONFIG_DEBUG_OPTLEVEL)
endif
# Generic GNU RVG toolchain on macOS, Linux or any typical Posix system
# Generic GNU RVG toolchain
ifeq ($(CONFIG_RISCV_TOOLCHAIN),GNU_RVGL)
ifeq ($(CONFIG_RISCV_TOOLCHAIN),GNU_RVG)
CROSSDEV ?= riscv64-unknown-elf-
ARCROSSDEV ?= riscv64-unknown-elf-
ifeq ($(CONFIG_ARCH_FPU),y)
@@ -91,24 +91,6 @@ ifeq ($(CONFIG_RISCV_TOOLCHAIN),GNU_RVGL)
endif
endif
ifeq ($(CONFIG_RISCV_TOOLCHAIN),GNU_RVGW)
CROSSDEV ?= riscv32-unknown-elf-
ARCROSSDEV ?= riscv32-unknown-elf-
ifneq ($(CONFIG_WINDOWS_NATIVE),y)
WINTOOL = y
endif
ifeq ($(CONFIG_ARCH_FPU),y)
ARCHCPUFLAGS = -march=rv32imf -mabi=ilp32f
else
ARCHCPUFLAGS = -march=rv32im -mabi=ilp32
endif
ifeq ($(CONFIG_RV32IM_HW_MULDIV),y)
ARCHCPUFLAGS += -mdiv
else
ARCHCPUFLAGS += -mno-div
endif
endif
ifeq ($(CONFIG_RISCV_TOOLCHAIN),GNU_RISCY)
CROSSDEV ?= riscv32-unknown-elf-
ARCROSSDEV ?= riscv32-unknown-elf-
arch/risc-v/src/rv64gc/Kconfig
+2 -1
View File
@@ -19,8 +19,9 @@ config RV64GC_TOOLCHAIN_GNU_RVGL
config RV64GC_TOOLCHAIN_GNU_RVGW
bool "Generic GNU RVG toolchain under Windows"
select ARCH_TOOLCHAIN_GNU
depends on TOOLCHAIN_WINDOWS
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
select ARCH_TOOLCHAIN_GNU
---help---
This option should work for any modern GNU toolchain (GCC 5.2 or newer)
configured for riscv64-unknown-elf.
arch/risc-v/src/rv64gc/Toolchain.defs
+4 -12
View File
@@ -45,11 +45,11 @@
#
ifeq ($(filter y, $(CONFIG_RV64GC_TOOLCHAIN_GNU_RVGL)),y)
CONFIG_RISCV_TOOLCHAIN ?= GNU_RVGL
CONFIG_RISCV_TOOLCHAIN ?= GNU_RVG
endif
ifeq ($(filter y, $(CONFIG_RV64GC_TOOLCHAIN_GNU_RVGW)),y)
CONFIG_RISCV_TOOLCHAIN ?= GNU_RVGW
CONFIG_RISCV_TOOLCHAIN ?= GNU_RVG
endif
#
@@ -70,21 +70,13 @@ ifeq ($(CONFIG_DEBUG_CUSTOMOPT),y)
MAXOPTIMIZATION := $(CONFIG_DEBUG_OPTLEVEL)
endif
# Generic GNU RVG toolchain on macOS, Linux or any typical Posix system
# Generic GNU RVG toolchain
ifeq ($(CONFIG_RISCV_TOOLCHAIN),GNU_RVGL)
ifeq ($(CONFIG_RISCV_TOOLCHAIN),GNU_RVG)
CROSSDEV ?= riscv64-unknown-elf-
ARCROSSDEV ?= riscv64-unknown-elf-
endif
ifeq ($(CONFIG_RISCV_TOOLCHAIN),GNU_RVGW)
CROSSDEV ?= riscv32-unknown-elf-
ARCROSSDEV ?= riscv32-unknown-elf-
ifneq ($(CONFIG_WINDOWS_NATIVE),y)
WINTOOL = y
endif
endif
# Individual tools may limit the optimization level but, by default, the
# optimization level will be set to -Os
arch/x86/src/Makefile
+2 -2
View File
@@ -53,7 +53,7 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
CFLAGS += -I$(TOPDIR)\sched
else
ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
NUTTX = "${shell cygpath -w $(TOPDIR)/nuttx$(EXEEXT)}"
CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}"
CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/common}"
@@ -99,7 +99,7 @@ endif
else
BOARDMAKE = $(if $(wildcard ./board/Makefile),y,)
ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/staging"}"
ifeq ($(BOARDMAKE),y)
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"}"
arch/x86_64/src/Makefile
+2 -2
View File
@@ -38,7 +38,7 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
CFLAGS += -I$(TOPDIR)\sched
else
ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
NUTTX = "${shell cygpath -w $(TOPDIR)/nuttx$(EXEEXT)}"
CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}"
CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/common}"
@@ -88,7 +88,7 @@ endif
else
BOARDMAKE = $(if $(wildcard ./board/Makefile),y,)
ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/staging"}"
ifeq ($(BOARDMAKE),y)
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"}"
arch/xtensa/src/Makefile
+2 -2
View File
@@ -53,7 +53,7 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
CFLAGS += -I$(TOPDIR)\sched
else
ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
NUTTX = "${shell cygpath -w $(TOPDIR)/nuttx$(EXEEXT)}"
CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}"
CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/common}"
@@ -100,7 +100,7 @@ endif
else
BOARDMAKE = $(if $(wildcard ./board/Makefile),y,)
ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/staging"}"
ifeq ($(BOARDMAKE),y)
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"}"
arch/z16/Kconfig
+1
View File
@@ -42,6 +42,7 @@ endchoice
config ARCH_CHIP_Z16F
bool
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
config ARCH_CHIP
string
arch/z16/src/z16f/Toolchain.defs
-14
View File
@@ -18,19 +18,6 @@
#
############################################################################
# Setup for the selected toolchain
#
# The ZiLOG ZDS-II Windows toolchain is the only toolchain available for
# the ez80.
#
CONFIG_Z16F_TOOLCHAIN ?= ZDSII
ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
WINTOOL = y
endif
# These are the default directories where the ZDS-II toolchain is installed.
# NOTE that short 8.3 path names are used in order to avoid spaces. On my
# machine I have:
@@ -63,7 +50,6 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
ZDSSTDLIBDIR = $(INSTALLDIR)\lib\std
ZDSZILOGLIBDIR = $(INSTALLDIR)\lib\zilog
else
WINTOOL = y
ZDSINSTALLDIR = $(INSTALLROOT)/ZDSII_ZNEO_$(ZDSVERSION)
INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"}
ZDSBINDIR = $(INSTALLDIR)/bin
arch/z80/Kconfig
+2
View File
@@ -26,6 +26,7 @@ config ARCH_CHIP_Z180
config ARCH_CHIP_EZ80
bool "eZ80 Family (ez80 Acclaim)"
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
select MM_SMALL if EZ80_Z80MODE
select ARCH_HAVE_PHY
---help---
@@ -33,6 +34,7 @@ config ARCH_CHIP_EZ80
config ARCH_CHIP_Z8
bool "z8 Family"
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
select MM_SMALL
select ENDIAN_BIG
---help---
arch/z80/src/ez80/Toolchain.defs
-13
View File
@@ -18,19 +18,6 @@
#
############################################################################
# Setup for the selected toolchain
#
# The ZiLOG ZDS-II Windows toolchain is the only toolchain available for
# the ez80.
#
CONFIG_EZ80_TOOLCHAIN ?= ZDSII
ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
WINTOOL = y
endif
# These are the default directories where the ZDS-II toolchain is installed.
# NOTE that short 8.3 path names are used in order to avoid spaces. On my
# machine I have:
arch/z80/src/z180/Kconfig
+1
View File
@@ -314,6 +314,7 @@ config Z180_TOOLCHAIN_SDCCL
config Z180_TOOLCHAIN_SDCCW
bool "SDCC for Windows"
depends on TOOLCHAIN_WINDOWS
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
endchoice
arch/z80/src/z180/Toolchain.defs
-24
View File
@@ -47,27 +47,3 @@
# CONFIG_Z180_TOOLCHAIN_SDCCL=y : SDCC for Linux, macOS or Cygwin
# CONFIG_Z180_TOOLCHAIN_SDCCW=y : SDCC for Win32
#
ifeq ($(filter y, \
$(CONFIG_Z180_TOOLCHAIN_SDCCL) \
),y)
CONFIG_Z180_TOOLCHAIN ?= SDCCPOSIX
endif
ifeq ($(filter y, \
$(CONFIG_Z180_TOOLCHAIN_SDCCW) \
),y)
CONFIG_Z180_TOOLCHAIN ?= SDCCWIN32
endif
# SDCC toolchain under Linux, macOS or Cygwin
ifeq ($(CONFIG_Z180_TOOLCHAIN),POSIX)
endif
# SDCC toolchain under Windows/Cygwin
ifeq ($(CONFIG_AVR_TOOLCHAIN),SDCCWIN32)
ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
WINTOOL = y
endif
endif
arch/z80/src/z8/Toolchain.defs
-14
View File
@@ -33,19 +33,6 @@
#
############################################################################
# Setup for the selected toolchain
#
# The ZiLOG ZDS-II Windows toolchain is the only toolchain available for
# the z8.
#
CONFIG_Z8_TOOLCHAIN ?= ZDSII
ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
WINTOOL = y
endif
# These are the directories where the ZDS-II toolchain is installed. NOTE
# that short 8.3 path names are used in order to avoid spaces. On my machine
# I have:
@@ -76,7 +63,6 @@ endif
ZDSSTDLIBDIR = $(INSTALLDIR)\lib\std
ZDSZILOGLIBDIR = $(INSTALLDIR)\lib\zilog
else
WINTOOL = y
ZDSINSTALLDIR = C:/PROGRA~2/ZiLOG/ZDSII_Z8Encore!_$(ZDSVERSION)
INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"}
ZDSBINDIR = $(INSTALLDIR)/bin
arch/z80/src/z80/Kconfig
+1
View File
@@ -17,6 +17,7 @@ config Z80_TOOLCHAIN_SDCCL
config Z80_TOOLCHAIN_SDCCW
bool "SDCC for Windows"
depends on TOOLCHAIN_WINDOWS
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
endchoice
arch/z80/src/z80/Toolchain.defs
-24
View File
@@ -47,27 +47,3 @@
# CONFIG_Z80_TOOLCHAIN_SDCCL=y : SDCC for Linux, macOS or Cygwin
# CONFIG_Z80_TOOLCHAIN_SDCCW=y : SDCC for Win32
#
ifeq ($(filter y, \
$(CONFIG_Z80_TOOLCHAIN_SDCCL) \
),y)
CONFIG_Z80_TOOLCHAIN ?= SDCCPOSIX
endif
ifeq ($(filter y, \
$(CONFIG_Z80_TOOLCHAIN_SDCCW) \
),y)
CONFIG_Z80_TOOLCHAIN ?= SDCCWIN32
endif
# SDCC toolchain under Linux, macOS or Cygwin
ifeq ($(CONFIG_Z80_TOOLCHAIN),POSIX)
endif
# SDCC toolchain under Windows/Cygwin
ifeq ($(CONFIG_AVR_TOOLCHAIN),SDCCWIN32)
ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
WINTOOL = y
endif
endif
audio/Makefile
+1 -1
View File
@@ -36,7 +36,7 @@
-include $(TOPDIR)/Make.defs
DELIM ?= $(strip /)
ifeq ($(WINTOOL),y)
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
INCDIROPT = -w
endif
binfmt/Makefile
+1 -1
View File
@@ -37,7 +37,7 @@
-include $(TOPDIR)/Make.defs
DELIM ?= $(strip /)
ifeq ($(WINTOOL),y)
ifeq ($(WINTCONFIG_CYGWIN_WINTOOLOOL),y)
INCDIROPT = -w
endif

Some files were not shown because too many files have changed in this diff Show More