You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gn...@apache.org on 2020/05/18 21:03:04 UTC
[incubator-nuttx] branch master updated (05ebb39 -> 5eae325)
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from 05ebb39 arch: complete logic in create/use stack to support stack coloration.
new bd65688 build: Replace WINTOOL with CYGWIN_WINTOOL Kconfig
new 5eae325 build: Move INCDIROPT to common place
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Kconfig | 8 +++++
TODO | 2 +-
arch/arm/src/Makefile | 4 +--
arch/arm/src/arm/Kconfig | 1 +
arch/arm/src/arm/Toolchain.defs | 19 +++-------
arch/arm/src/armv6-m/Kconfig | 2 +-
arch/arm/src/armv6-m/Toolchain.defs | 17 +++------
arch/arm/src/armv7-a/Kconfig | 3 +-
arch/arm/src/armv7-a/Toolchain.defs | 19 +++-------
arch/arm/src/armv7-m/Kconfig | 3 ++
arch/arm/src/armv7-m/Toolchain.defs | 41 +++++-----------------
arch/arm/src/armv7-r/Kconfig | 3 +-
arch/arm/src/armv7-r/Toolchain.defs | 19 +++-------
arch/arm/src/armv8-m/Kconfig | 2 ++
arch/arm/src/armv8-m/Toolchain.defs | 41 +++++-----------------
arch/avr/src/Makefile | 4 +--
arch/avr/src/avr/Kconfig | 2 ++
arch/avr/src/avr/Toolchain.defs | 15 +-------
arch/avr/src/avr32/Kconfig | 1 +
arch/avr/src/avr32/Toolchain.defs | 18 +---------
arch/hc/src/Makefile | 4 +--
arch/mips/src/Makefile | 4 +--
arch/mips/src/mips32/Kconfig | 4 +++
arch/mips/src/mips32/Toolchain.defs | 12 -------
arch/misoc/src/Makefile | 4 +--
arch/misoc/src/lm32/Kconfig | 1 +
arch/misoc/src/lm32/Toolchain.defs | 17 ++-------
arch/misoc/src/minerva/Kconfig | 1 +
arch/or1k/src/Makefile | 4 +--
arch/renesas/Kconfig | 4 +++
arch/renesas/src/Makefile | 6 ++--
arch/risc-v/src/Makefile | 4 +--
arch/risc-v/src/rv32im/Kconfig | 3 +-
arch/risc-v/src/rv32im/Toolchain.defs | 26 +++-----------
arch/risc-v/src/rv64gc/Kconfig | 3 +-
arch/risc-v/src/rv64gc/Toolchain.defs | 16 +++------
arch/x86/src/Makefile | 4 +--
arch/x86_64/src/Makefile | 4 +--
arch/xtensa/src/Makefile | 4 +--
arch/z16/Kconfig | 1 +
arch/z16/src/z16f/Toolchain.defs | 14 --------
arch/z80/Kconfig | 2 ++
arch/z80/src/ez80/Toolchain.defs | 13 -------
arch/z80/src/z180/Kconfig | 1 +
arch/z80/src/z180/Toolchain.defs | 24 -------------
arch/z80/src/z8/Toolchain.defs | 14 --------
arch/z80/src/z80/Kconfig | 1 +
arch/z80/src/z80/Toolchain.defs | 24 -------------
audio/Makefile | 4 ---
binfmt/Makefile | 4 ---
boards/Board.mk | 28 ++++-----------
boards/arm/a1x/pcduino-a10/scripts/Make.defs | 4 +--
.../arm/am335x/beaglebone-black/scripts/Make.defs | 2 +-
boards/arm/c5471/c5471evm/scripts/Make.defs | 2 +-
boards/arm/cxd56xx/common/src/Make.defs | 2 +-
boards/arm/cxd56xx/drivers/audio/Make.defs | 2 +-
boards/arm/cxd56xx/drivers/camera/Make.defs | 2 +-
boards/arm/cxd56xx/drivers/sensors/Make.defs | 2 +-
boards/arm/cxd56xx/spresense/scripts/Make.defs | 8 ++---
boards/arm/cxd56xx/spresense/src/Make.defs | 2 +-
boards/arm/dm320/ntosd-dm320/scripts/Make.defs | 2 +-
boards/arm/efm32/efm32-g8xx-stk/scripts/Make.defs | 2 +-
boards/arm/efm32/efm32gg-stk3700/scripts/Make.defs | 2 +-
.../olimex-efm32g880f128-stk/scripts/Make.defs | 2 +-
boards/arm/imx6/sabre-6quad/scripts/Make.defs | 6 ++--
boards/arm/imxrt/imxrt1020-evk/scripts/Make.defs | 4 +--
.../arm/imxrt/imxrt1050-evk/configs/knsh/Make.defs | 4 +--
.../imxrt1050-evk/configs/libcxxtest/Make.defs | 4 +--
boards/arm/imxrt/imxrt1050-evk/kernel/Makefile | 2 +-
boards/arm/imxrt/imxrt1050-evk/scripts/Make.defs | 4 +--
.../arm/imxrt/imxrt1060-evk/configs/knsh/Make.defs | 4 +--
.../imxrt1060-evk/configs/libcxxtest/Make.defs | 4 +--
boards/arm/imxrt/imxrt1060-evk/kernel/Makefile | 2 +-
boards/arm/imxrt/imxrt1060-evk/scripts/Make.defs | 6 ++--
boards/arm/kinetis/freedom-k28f/scripts/Make.defs | 2 +-
boards/arm/kinetis/freedom-k64f/scripts/Make.defs | 2 +-
boards/arm/kinetis/freedom-k66f/scripts/Make.defs | 2 +-
boards/arm/kinetis/kwikstik-k40/scripts/Make.defs | 2 +-
boards/arm/kinetis/teensy-3.x/scripts/Make.defs | 2 +-
boards/arm/kinetis/twr-k60n512/scripts/Make.defs | 2 +-
boards/arm/kinetis/twr-k64f120m/scripts/Make.defs | 2 +-
boards/arm/kl/freedom-kl25z/scripts/Make.defs | 4 +--
boards/arm/kl/freedom-kl26z/scripts/Make.defs | 4 +--
boards/arm/kl/teensy-lc/scripts/Make.defs | 4 +--
boards/arm/lc823450/lc823450-xgevk/kernel/Makefile | 2 +-
.../arm/lc823450/lc823450-xgevk/scripts/Make.defs | 6 ++--
.../arm/lpc17xx_40xx/lincoln60/scripts/Make.defs | 2 +-
.../lpc4088-devkit/configs/knsh/Make.defs | 2 +-
.../lpc17xx_40xx/lpc4088-devkit/kernel/Makefile | 2 +-
.../lpc17xx_40xx/lpc4088-devkit/scripts/Make.defs | 2 +-
.../lpc4088-quickstart/configs/knsh/Make.defs | 2 +-
.../lpc4088-quickstart/kernel/Makefile | 2 +-
.../lpc4088-quickstart/scripts/Make.defs | 2 +-
.../lpcxpresso-lpc1768/configs/thttpd/Make.defs | 2 +-
.../lpcxpresso-lpc1768/scripts/Make.defs | 2 +-
boards/arm/lpc17xx_40xx/lx_cpu/scripts/Make.defs | 6 ++--
boards/arm/lpc17xx_40xx/mbed/scripts/Make.defs | 2 +-
boards/arm/lpc17xx_40xx/mcb1700/scripts/Make.defs | 2 +-
.../configs/thttpd-binfs/Make.defs | 2 +-
.../configs/thttpd-nxflat/Make.defs | 2 +-
.../olimex-lpc1766stk/scripts/Make.defs | 2 +-
.../lpc17xx_40xx/open1788/configs/knsh/Make.defs | 2 +-
.../open1788/configs/knxterm/Make.defs | 2 +-
boards/arm/lpc17xx_40xx/open1788/kernel/Makefile | 2 +-
boards/arm/lpc17xx_40xx/open1788/scripts/Make.defs | 2 +-
.../lpc17xx_40xx/pnev5180b/configs/knsh/Make.defs | 2 +-
boards/arm/lpc17xx_40xx/pnev5180b/kernel/Makefile | 2 +-
.../arm/lpc17xx_40xx/pnev5180b/scripts/Make.defs | 2 +-
.../arm/lpc17xx_40xx/u-blox-c027/scripts/Make.defs | 2 +-
.../lpc17xx_40xx/zkit-arm-1769/scripts/Make.defs | 2 +-
.../arm/lpc214x/mcu123-lpc214x/scripts/Make.defs | 2 +-
boards/arm/lpc214x/zp214xpa/scripts/Make.defs | 2 +-
.../arm/lpc2378/olimex-lpc2378/scripts/Make.defs | 2 +-
boards/arm/lpc31xx/ea3131/configs/pgnsh/Make.defs | 2 +-
boards/arm/lpc31xx/ea3131/locked/Makefile | 2 +-
boards/arm/lpc31xx/ea3131/scripts/Make.defs | 2 +-
boards/arm/lpc31xx/ea3152/scripts/Make.defs | 2 +-
.../arm/lpc31xx/olimex-lpc-h3131/scripts/Make.defs | 2 +-
.../lpc43xx/bambino-200e/configs/netnsh/Make.defs | 2 +-
boards/arm/lpc43xx/bambino-200e/kernel/Makefile | 2 +-
boards/arm/lpc43xx/bambino-200e/scripts/Make.defs | 2 +-
.../arm/lpc43xx/lpc4330-xplorer/scripts/Make.defs | 2 +-
boards/arm/lpc43xx/lpc4337-ws/scripts/Make.defs | 2 +-
boards/arm/lpc43xx/lpc4357-evb/scripts/Make.defs | 2 +-
boards/arm/lpc43xx/lpc4370-link2/scripts/Make.defs | 2 +-
.../lpc54xx/lpcxpresso-lpc54628/scripts/Make.defs | 2 +-
.../arm/max326xx/max32660-evsys/scripts/Make.defs | 4 +--
boards/arm/moxart/moxa/scripts/Make.defs | 2 +-
boards/arm/nrf52/nrf52-feather/scripts/Make.defs | 2 +-
boards/arm/nrf52/nrf52832-dk/scripts/Make.defs | 2 +-
boards/arm/nrf52/nrf52840-dk/scripts/Make.defs | 2 +-
boards/arm/nrf52/nrf52840-dongle/scripts/Make.defs | 2 +-
boards/arm/nuc1xx/nutiny-nuc120/scripts/Make.defs | 4 +--
.../s32k1xx/rddrone-uavcan144/scripts/Make.defs | 4 +--
.../s32k1xx/rddrone-uavcan146/scripts/Make.defs | 4 +--
boards/arm/s32k1xx/s32k118evb/scripts/Make.defs | 4 +--
boards/arm/s32k1xx/s32k144evb/scripts/Make.defs | 4 +--
boards/arm/s32k1xx/s32k146evb/scripts/Make.defs | 4 +--
boards/arm/s32k1xx/s32k148evb/scripts/Make.defs | 4 +--
boards/arm/sam34/arduino-due/scripts/Make.defs | 2 +-
.../arm/sam34/flipnclick-sam3x/scripts/Make.defs | 2 +-
boards/arm/sam34/sam3u-ek/configs/knsh/Make.defs | 2 +-
boards/arm/sam34/sam3u-ek/kernel/Makefile | 2 +-
boards/arm/sam34/sam3u-ek/scripts/Make.defs | 2 +-
boards/arm/sam34/sam4cmp-db/scripts/Make.defs | 2 +-
boards/arm/sam34/sam4e-ek/scripts/Make.defs | 2 +-
boards/arm/sam34/sam4l-xplained/scripts/Make.defs | 2 +-
.../arm/sam34/sam4s-xplained-pro/scripts/Make.defs | 2 +-
boards/arm/sam34/sam4s-xplained/scripts/Make.defs | 2 +-
boards/arm/sama5/sama5d2-xult/scripts/Make.defs | 6 ++--
.../arm/sama5/sama5d3-xplained/scripts/Make.defs | 6 ++--
boards/arm/sama5/sama5d3x-ek/scripts/Make.defs | 6 ++--
boards/arm/sama5/sama5d4-ek/configs/knsh/Make.defs | 6 ++--
boards/arm/sama5/sama5d4-ek/scripts/Make.defs | 6 ++--
boards/arm/samd2l2/arduino-m0/scripts/Make.defs | 4 +--
.../arm/samd2l2/samd20-xplained/scripts/Make.defs | 4 +--
.../arm/samd2l2/samd21-xplained/scripts/Make.defs | 4 +--
.../arm/samd2l2/saml21-xplained/scripts/Make.defs | 4 +--
boards/arm/samd5e5/metro-m4/scripts/Make.defs | 4 +--
.../samd5e5/same54-xplained-pro/scripts/Make.defs | 4 +--
boards/arm/samv7/same70-xplained/kernel/Makefile | 2 +-
boards/arm/samv7/same70-xplained/scripts/Make.defs | 4 +--
.../arm/samv7/samv71-xult/configs/knsh/Make.defs | 4 +--
boards/arm/samv7/samv71-xult/kernel/Makefile | 2 +-
boards/arm/samv7/samv71-xult/scripts/Make.defs | 4 +--
boards/arm/stm32/axoloti/scripts/Make.defs | 6 ++--
boards/arm/stm32/axoloti/src/Make.defs | 2 +-
boards/arm/stm32/clicker2-stm32/kernel/Makefile | 2 +-
boards/arm/stm32/clicker2-stm32/scripts/Make.defs | 4 +--
boards/arm/stm32/clicker2-stm32/src/Make.defs | 2 +-
boards/arm/stm32/cloudctrl/scripts/Make.defs | 2 +-
boards/arm/stm32/cloudctrl/src/Make.defs | 2 +-
boards/arm/stm32/common/Makefile | 2 +-
boards/arm/stm32/common/src/Make.defs | 2 +-
boards/arm/stm32/fire-stm32v2/scripts/Make.defs | 2 +-
boards/arm/stm32/fire-stm32v2/src/Make.defs | 2 +-
boards/arm/stm32/hymini-stm32v/scripts/Make.defs | 2 +-
boards/arm/stm32/hymini-stm32v/src/Make.defs | 2 +-
boards/arm/stm32/maple/scripts/Make.defs | 2 +-
boards/arm/stm32/maple/src/Make.defs | 2 +-
boards/arm/stm32/mikroe-stm32f4/kernel/Makefile | 2 +-
boards/arm/stm32/mikroe-stm32f4/scripts/Make.defs | 2 +-
boards/arm/stm32/mikroe-stm32f4/src/Make.defs | 2 +-
boards/arm/stm32/nucleo-f103rb/scripts/Make.defs | 2 +-
boards/arm/stm32/nucleo-f103rb/src/Make.defs | 2 +-
boards/arm/stm32/nucleo-f207zg/scripts/Make.defs | 2 +-
boards/arm/stm32/nucleo-f207zg/src/Make.defs | 2 +-
boards/arm/stm32/nucleo-f302r8/scripts/Make.defs | 2 +-
boards/arm/stm32/nucleo-f302r8/src/Make.defs | 2 +-
boards/arm/stm32/nucleo-f303re/scripts/Make.defs | 2 +-
boards/arm/stm32/nucleo-f303re/src/Make.defs | 2 +-
boards/arm/stm32/nucleo-f303ze/scripts/Make.defs | 2 +-
boards/arm/stm32/nucleo-f303ze/src/Make.defs | 2 +-
boards/arm/stm32/nucleo-f334r8/scripts/Make.defs | 2 +-
boards/arm/stm32/nucleo-f334r8/src/Make.defs | 2 +-
boards/arm/stm32/nucleo-f410rb/scripts/Make.defs | 2 +-
boards/arm/stm32/nucleo-f410rb/src/Make.defs | 2 +-
boards/arm/stm32/nucleo-f429zi/scripts/Make.defs | 2 +-
boards/arm/stm32/nucleo-f429zi/src/Make.defs | 2 +-
boards/arm/stm32/nucleo-f446re/scripts/Make.defs | 2 +-
boards/arm/stm32/nucleo-f446re/src/Make.defs | 2 +-
boards/arm/stm32/nucleo-f4x1re/scripts/Make.defs | 2 +-
boards/arm/stm32/nucleo-f4x1re/src/Make.defs | 2 +-
boards/arm/stm32/nucleo-l152re/scripts/Make.defs | 2 +-
boards/arm/stm32/nucleo-l152re/src/Make.defs | 2 +-
.../arm/stm32/olimex-stm32-e407/scripts/Make.defs | 2 +-
boards/arm/stm32/olimex-stm32-e407/src/Make.defs | 2 +-
.../arm/stm32/olimex-stm32-h405/scripts/Make.defs | 2 +-
boards/arm/stm32/olimex-stm32-h405/src/Make.defs | 2 +-
.../arm/stm32/olimex-stm32-h407/scripts/Make.defs | 2 +-
boards/arm/stm32/olimex-stm32-h407/src/Make.defs | 2 +-
.../arm/stm32/olimex-stm32-p107/scripts/Make.defs | 2 +-
boards/arm/stm32/olimex-stm32-p107/src/Make.defs | 2 +-
.../arm/stm32/olimex-stm32-p207/scripts/Make.defs | 2 +-
boards/arm/stm32/olimex-stm32-p207/src/Make.defs | 2 +-
.../stm32/olimex-stm32-p407/configs/kelf/Make.defs | 6 ++--
.../olimex-stm32-p407/configs/kmodule/Make.defs | 6 ++--
.../stm32/olimex-stm32-p407/configs/knsh/Make.defs | 4 +--
boards/arm/stm32/olimex-stm32-p407/kernel/Makefile | 2 +-
.../arm/stm32/olimex-stm32-p407/scripts/Make.defs | 4 +--
boards/arm/stm32/olimex-stm32-p407/src/Make.defs | 2 +-
boards/arm/stm32/olimexino-stm32/scripts/Make.defs | 2 +-
boards/arm/stm32/olimexino-stm32/src/Make.defs | 2 +-
boards/arm/stm32/omnibusf4/kernel/Makefile | 2 +-
boards/arm/stm32/omnibusf4/scripts/Make.defs | 6 ++--
boards/arm/stm32/omnibusf4/src/Make.defs | 2 +-
boards/arm/stm32/photon/scripts/Make.defs | 2 +-
boards/arm/stm32/photon/src/Make.defs | 2 +-
boards/arm/stm32/shenzhou/scripts/Make.defs | 2 +-
boards/arm/stm32/shenzhou/src/Make.defs | 2 +-
boards/arm/stm32/stm3210e-eval/scripts/Make.defs | 2 +-
boards/arm/stm32/stm3210e-eval/src/Make.defs | 2 +-
boards/arm/stm32/stm3220g-eval/scripts/Make.defs | 2 +-
boards/arm/stm32/stm3220g-eval/src/Make.defs | 2 +-
.../stm32/stm3240g-eval/configs/knxwm/Make.defs | 2 +-
boards/arm/stm32/stm3240g-eval/kernel/Makefile | 2 +-
boards/arm/stm32/stm3240g-eval/scripts/Make.defs | 2 +-
boards/arm/stm32/stm3240g-eval/src/Make.defs | 2 +-
boards/arm/stm32/stm32_tiny/scripts/Make.defs | 2 +-
boards/arm/stm32/stm32_tiny/src/Make.defs | 2 +-
boards/arm/stm32/stm32butterfly2/scripts/Make.defs | 2 +-
boards/arm/stm32/stm32butterfly2/src/Make.defs | 2 +-
.../arm/stm32/stm32f103-minimum/scripts/Make.defs | 2 +-
boards/arm/stm32/stm32f103-minimum/src/Make.defs | 2 +-
boards/arm/stm32/stm32f334-disco/scripts/Make.defs | 2 +-
boards/arm/stm32/stm32f334-disco/src/Make.defs | 2 +-
.../arm/stm32/stm32f3discovery/scripts/Make.defs | 2 +-
boards/arm/stm32/stm32f3discovery/src/Make.defs | 2 +-
.../arm/stm32/stm32f411e-disco/scripts/Make.defs | 2 +-
boards/arm/stm32/stm32f411e-disco/src/Make.defs | 2 +-
.../arm/stm32/stm32f429i-disco/scripts/Make.defs | 2 +-
boards/arm/stm32/stm32f429i-disco/src/Make.defs | 2 +-
.../stm32f4discovery/configs/cxxtest/Make.defs | 2 +-
.../stm32/stm32f4discovery/configs/elf/Make.defs | 4 +--
.../stm32f4discovery/configs/posix_spawn/Make.defs | 4 +--
.../stm32f4discovery/configs/testlibcxx/Make.defs | 2 +-
boards/arm/stm32/stm32f4discovery/kernel/Makefile | 2 +-
.../arm/stm32/stm32f4discovery/scripts/Make.defs | 6 ++--
boards/arm/stm32/stm32f4discovery/src/Make.defs | 2 +-
boards/arm/stm32/stm32ldiscovery/scripts/Make.defs | 2 +-
boards/arm/stm32/stm32ldiscovery/src/Make.defs | 2 +-
.../arm/stm32/stm32vldiscovery/scripts/Make.defs | 2 +-
boards/arm/stm32/stm32vldiscovery/src/Make.defs | 2 +-
.../arm/stm32/viewtool-stm32f107/scripts/Make.defs | 2 +-
boards/arm/stm32/viewtool-stm32f107/src/Make.defs | 2 +-
.../stm32f0l0g0/b-l072z-lrwan1/scripts/Make.defs | 2 +-
.../stm32f0l0g0/nucleo-f072rb/scripts/Make.defs | 2 +-
.../stm32f0l0g0/nucleo-f091rc/scripts/Make.defs | 2 +-
.../stm32f0l0g0/nucleo-g070rb/scripts/Make.defs | 2 +-
.../stm32f0l0g0/nucleo-g071rb/scripts/Make.defs | 2 +-
.../stm32f0l0g0/nucleo-l073rz/scripts/Make.defs | 2 +-
.../stm32f051-discovery/scripts/Make.defs | 2 +-
.../stm32f072-discovery/scripts/Make.defs | 2 +-
.../stm32f7/nucleo-144/configs/f722-nsh/Make.defs | 2 +-
.../nucleo-144/configs/f746-evalos/Make.defs | 2 +-
.../stm32f7/nucleo-144/configs/f746-nsh/Make.defs | 2 +-
.../nucleo-144/configs/f767-evalos/Make.defs | 2 +-
.../nucleo-144/configs/f767-netnsh/Make.defs | 2 +-
.../stm32f7/nucleo-144/configs/f767-nsh/Make.defs | 2 +-
boards/arm/stm32f7/stm32f746-ws/scripts/Make.defs | 2 +-
.../arm/stm32f7/stm32f746g-disco/kernel/Makefile | 2 +-
.../arm/stm32f7/stm32f746g-disco/scripts/Make.defs | 4 +--
.../arm/stm32f7/stm32f769i-disco/kernel/Makefile | 2 +-
.../arm/stm32f7/stm32f769i-disco/scripts/Make.defs | 2 +-
boards/arm/stm32h7/nucleo-h743zi/kernel/Makefile | 2 +-
boards/arm/stm32h7/nucleo-h743zi/scripts/Make.defs | 2 +-
.../arm/stm32h7/stm32h747i-disco/kernel/Makefile | 2 +-
.../arm/stm32h7/stm32h747i-disco/scripts/Make.defs | 2 +-
.../arm/stm32l4/b-l475e-iot01a/scripts/Make.defs | 2 +-
boards/arm/stm32l4/nucleo-l432kc/scripts/Make.defs | 2 +-
boards/arm/stm32l4/nucleo-l452re/scripts/Make.defs | 2 +-
boards/arm/stm32l4/nucleo-l476rg/scripts/Make.defs | 2 +-
boards/arm/stm32l4/nucleo-l496zg/scripts/Make.defs | 2 +-
boards/arm/stm32l4/stm32l476-mdk/scripts/Make.defs | 2 +-
.../stm32l476vg-disco/configs/knsh/Make.defs | 2 +-
.../arm/stm32l4/stm32l476vg-disco/kernel/Makefile | 2 +-
.../stm32l4/stm32l476vg-disco/scripts/Make.defs | 2 +-
.../stm32l4r9ai-disco/configs/knsh/Make.defs | 2 +-
.../arm/stm32l4/stm32l4r9ai-disco/kernel/Makefile | 2 +-
.../stm32l4/stm32l4r9ai-disco/scripts/Make.defs | 2 +-
boards/arm/str71x/olimex-strp711/scripts/Make.defs | 2 +-
boards/arm/tiva/dk-tm4c129x/scripts/Make.defs | 2 +-
boards/arm/tiva/eagle100/scripts/Make.defs | 2 +-
boards/arm/tiva/ekk-lm3s9b96/scripts/Make.defs | 2 +-
boards/arm/tiva/launchxl-cc1310/scripts/Make.defs | 4 +--
.../arm/tiva/launchxl-cc1312r1/scripts/Make.defs | 4 +--
boards/arm/tiva/lm3s6432-s2e/scripts/Make.defs | 2 +-
boards/arm/tiva/lm3s6965-ek/kernel/Makefile | 2 +-
boards/arm/tiva/lm3s6965-ek/scripts/Make.defs | 6 ++--
boards/arm/tiva/lm3s8962-ek/scripts/Make.defs | 2 +-
.../arm/tiva/lm4f120-launchpad/scripts/Make.defs | 2 +-
.../arm/tiva/tm4c123g-launchpad/scripts/Make.defs | 2 +-
.../arm/tiva/tm4c1294-launchpad/scripts/Make.defs | 2 +-
.../arm/tms570/launchxl-tms57004/scripts/Make.defs | 6 ++--
.../tms570/tms570ls31x-usb-kit/scripts/Make.defs | 6 ++--
boards/arm/xmc4/xmc4500-relax/scripts/Make.defs | 4 +--
boards/arm/xmc4/xmc4700-relax/scripts/Make.defs | 4 +--
boards/avr/at32uc3/avr32dev1/scripts/Make.defs | 2 +-
boards/avr/at90usb/micropendous3/scripts/Make.defs | 2 +-
boards/avr/at90usb/teensy-2.0/scripts/Make.defs | 2 +-
boards/avr/atmega/amber/scripts/Make.defs | 2 +-
.../avr/atmega/arduino-mega2560/scripts/Make.defs | 2 +-
boards/avr/atmega/arduino-mega2560/src/Makefile | 2 +-
boards/avr/atmega/moteino-mega/scripts/Make.defs | 2 +-
boards/hc/m9s12/demo9s12ne64/scripts/Make.defs | 3 +-
boards/hc/m9s12/ne64badge/scripts/Make.defs | 3 +-
boards/mips/pic32mx/mirtoo/scripts/Make.defs | 2 +-
.../pic32mx/pic32mx-starterkit/scripts/Make.defs | 2 +-
boards/mips/pic32mx/pic32mx7mmb/scripts/Make.defs | 2 +-
boards/mips/pic32mx/sure-pic32mx/scripts/Make.defs | 2 +-
boards/mips/pic32mx/ubw32/scripts/Make.defs | 2 +-
.../pic32mz/flipnclick-pic32mz/scripts/Make.defs | 2 +-
.../pic32mz/pic32mz-starterkit/scripts/Make.defs | 2 +-
boards/misoc/lm32/misoc/scripts/Make.defs | 2 +-
boards/or1k/mor1kx/or1k/scripts/Make.defs | 4 +--
.../renesas/rx65n/rx65n-grrose/scripts/Make.defs | 5 ++-
.../renesas/rx65n/rx65n-rsk1mb/scripts/Make.defs | 5 ++-
.../renesas/rx65n/rx65n-rsk2mb/scripts/Make.defs | 5 ++-
boards/renesas/rx65n/rx65n/scripts/Make.defs | 5 ++-
boards/risc-v/fe310/hifive1-revb/scripts/Make.defs | 2 +-
boards/risc-v/gap8/gapuino/scripts/Make.defs | 2 +-
boards/risc-v/k210/maix-bit/kernel/Makefile | 2 +-
boards/risc-v/k210/maix-bit/scripts/Make.defs | 6 ++--
boards/risc-v/litex/arty_a7/scripts/Make.defs | 2 +-
.../nr5m100/nr5m100-nexys4/scripts/Make.defs | 2 +-
boards/sim/sim/sim/configs/cxxtest/Make.defs | 4 +--
boards/sim/sim/sim/scripts/Make.defs | 4 +--
boards/x86/qemu/qemu-i486/scripts/Make.defs | 2 +-
.../x86_64/intel64/qemu-intel64/scripts/Make.defs | 2 +-
boards/xtensa/esp32/esp32-core/scripts/Make.defs | 6 ++--
boards/z80/z180/p112/scripts/Make.defs | 2 +-
boards/z80/z80/z80sim/scripts/Make.defs | 4 +--
drivers/1wire/Make.defs | 2 +-
drivers/Makefile | 4 ---
drivers/analog/Make.defs | 8 ++---
drivers/bch/Make.defs | 2 +-
drivers/can/Make.defs | 2 +-
drivers/contactless/Make.defs | 2 +-
drivers/crypto/Make.defs | 2 +-
drivers/i2c/Make.defs | 2 +-
drivers/input/Make.defs | 2 +-
drivers/ioexpander/Make.defs | 4 +--
drivers/lcd/Make.defs | 6 ++--
drivers/loop/Make.defs | 2 +-
drivers/mmcsd/Make.defs | 2 +-
drivers/modem/Make.defs | 2 +-
drivers/modem/altair/Make.defs | 2 +-
drivers/power/Make.defs | 14 ++++----
drivers/rptun/Make.defs | 2 +-
drivers/sensors/Make.defs | 2 +-
drivers/spi/Make.defs | 2 +-
drivers/usbdev/Make.defs | 2 +-
drivers/usbhost/Make.defs | 2 +-
drivers/usbmisc/Make.defs | 2 +-
drivers/usbmonitor/Make.defs | 2 +-
drivers/video/Make.defs | 2 +-
drivers/wireless/Make.defs | 2 +-
drivers/wireless/bluetooth/Make.defs | 2 +-
drivers/wireless/ieee80211/bcm43xxx/Make.defs | 2 +-
drivers/wireless/ieee802154/Make.defs | 2 +-
drivers/wireless/ieee802154/at86rf23x/Make.defs | 2 +-
drivers/wireless/ieee802154/mrf24j40/Make.defs | 2 +-
drivers/wireless/ieee802154/xbee/Make.defs | 2 +-
drivers/wireless/lpwan/sx127x/Make.defs | 2 +-
drivers/wireless/spirit/drivers/Make.defs | 2 +-
drivers/wireless/spirit/include/Make.defs | 2 +-
fs/spiffs/Make.defs | 2 +-
graphics/Makefile | 4 ---
graphics/nxbe/Make.defs | 2 +-
graphics/nxglib/Make.defs | 3 +-
graphics/nxmu/Make.defs | 2 +-
graphics/nxterm/Make.defs | 2 +-
graphics/vnc/client/Make.defs | 2 +-
graphics/vnc/server/Make.defs | 2 +-
libs/libc/zoneinfo/Makefile | 4 ---
mm/iob/Make.defs | 2 +-
pass1/Makefile | 4 ---
tools/Config.mk | 3 ++
tools/Makefile.export | 3 +-
tools/Makefile.unix | 2 +-
tools/Makefile.win | 4 +--
tools/mkexport.sh | 6 ++--
wireless/Makefile | 4 ---
wireless/bluetooth/Make.defs | 2 +-
wireless/ieee802154/Make.defs | 2 +-
wireless/pktradio/Make.defs | 2 +-
406 files changed, 571 insertions(+), 839 deletions(-)
[incubator-nuttx] 02/02: build: Move INCDIROPT to common place
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 5eae32577e5d5226e5d3027c169eeb369f83f77d
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Thu Mar 26 11:51:22 2020 +0800
build: Move INCDIROPT to common place
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
audio/Makefile | 4 ----
binfmt/Makefile | 4 ----
boards/Board.mk | 8 ++++----
boards/arm/cxd56xx/common/src/Make.defs | 2 +-
boards/arm/cxd56xx/drivers/audio/Make.defs | 2 +-
boards/arm/cxd56xx/drivers/camera/Make.defs | 2 +-
boards/arm/cxd56xx/drivers/sensors/Make.defs | 2 +-
boards/arm/cxd56xx/spresense/src/Make.defs | 2 +-
boards/arm/stm32/axoloti/src/Make.defs | 2 +-
boards/arm/stm32/clicker2-stm32/src/Make.defs | 2 +-
boards/arm/stm32/cloudctrl/src/Make.defs | 2 +-
boards/arm/stm32/common/Makefile | 2 +-
boards/arm/stm32/common/src/Make.defs | 2 +-
boards/arm/stm32/fire-stm32v2/src/Make.defs | 2 +-
boards/arm/stm32/hymini-stm32v/src/Make.defs | 2 +-
boards/arm/stm32/maple/src/Make.defs | 2 +-
boards/arm/stm32/mikroe-stm32f4/src/Make.defs | 2 +-
boards/arm/stm32/nucleo-f103rb/src/Make.defs | 2 +-
boards/arm/stm32/nucleo-f207zg/src/Make.defs | 2 +-
boards/arm/stm32/nucleo-f302r8/src/Make.defs | 2 +-
boards/arm/stm32/nucleo-f303re/src/Make.defs | 2 +-
boards/arm/stm32/nucleo-f303ze/src/Make.defs | 2 +-
boards/arm/stm32/nucleo-f334r8/src/Make.defs | 2 +-
boards/arm/stm32/nucleo-f410rb/src/Make.defs | 2 +-
boards/arm/stm32/nucleo-f429zi/src/Make.defs | 2 +-
boards/arm/stm32/nucleo-f446re/src/Make.defs | 2 +-
boards/arm/stm32/nucleo-f4x1re/src/Make.defs | 2 +-
boards/arm/stm32/nucleo-l152re/src/Make.defs | 2 +-
boards/arm/stm32/olimex-stm32-e407/src/Make.defs | 2 +-
boards/arm/stm32/olimex-stm32-h405/src/Make.defs | 2 +-
boards/arm/stm32/olimex-stm32-h407/src/Make.defs | 2 +-
boards/arm/stm32/olimex-stm32-p107/src/Make.defs | 2 +-
boards/arm/stm32/olimex-stm32-p207/src/Make.defs | 2 +-
boards/arm/stm32/olimex-stm32-p407/src/Make.defs | 2 +-
boards/arm/stm32/olimexino-stm32/src/Make.defs | 2 +-
boards/arm/stm32/omnibusf4/src/Make.defs | 2 +-
boards/arm/stm32/photon/src/Make.defs | 2 +-
boards/arm/stm32/shenzhou/src/Make.defs | 2 +-
boards/arm/stm32/stm3210e-eval/src/Make.defs | 2 +-
boards/arm/stm32/stm3220g-eval/src/Make.defs | 2 +-
boards/arm/stm32/stm3240g-eval/src/Make.defs | 2 +-
boards/arm/stm32/stm32_tiny/src/Make.defs | 2 +-
boards/arm/stm32/stm32butterfly2/src/Make.defs | 2 +-
boards/arm/stm32/stm32f103-minimum/src/Make.defs | 2 +-
boards/arm/stm32/stm32f334-disco/src/Make.defs | 2 +-
boards/arm/stm32/stm32f3discovery/src/Make.defs | 2 +-
boards/arm/stm32/stm32f411e-disco/src/Make.defs | 2 +-
boards/arm/stm32/stm32f429i-disco/src/Make.defs | 2 +-
boards/arm/stm32/stm32f4discovery/src/Make.defs | 2 +-
boards/arm/stm32/stm32ldiscovery/src/Make.defs | 2 +-
boards/arm/stm32/stm32vldiscovery/src/Make.defs | 2 +-
boards/arm/stm32/viewtool-stm32f107/src/Make.defs | 2 +-
drivers/1wire/Make.defs | 2 +-
drivers/Makefile | 4 ----
drivers/analog/Make.defs | 8 ++++----
drivers/bch/Make.defs | 2 +-
drivers/can/Make.defs | 2 +-
drivers/contactless/Make.defs | 2 +-
drivers/crypto/Make.defs | 2 +-
drivers/i2c/Make.defs | 2 +-
drivers/input/Make.defs | 2 +-
drivers/ioexpander/Make.defs | 4 ++--
drivers/lcd/Make.defs | 6 +++---
drivers/loop/Make.defs | 2 +-
drivers/mmcsd/Make.defs | 2 +-
drivers/modem/Make.defs | 2 +-
drivers/modem/altair/Make.defs | 2 +-
drivers/power/Make.defs | 14 +++++++-------
drivers/rptun/Make.defs | 2 +-
drivers/sensors/Make.defs | 2 +-
drivers/spi/Make.defs | 2 +-
drivers/usbdev/Make.defs | 2 +-
drivers/usbhost/Make.defs | 2 +-
drivers/usbmisc/Make.defs | 2 +-
drivers/usbmonitor/Make.defs | 2 +-
drivers/video/Make.defs | 2 +-
drivers/wireless/Make.defs | 2 +-
drivers/wireless/bluetooth/Make.defs | 2 +-
drivers/wireless/ieee80211/bcm43xxx/Make.defs | 2 +-
drivers/wireless/ieee802154/Make.defs | 2 +-
drivers/wireless/ieee802154/at86rf23x/Make.defs | 2 +-
drivers/wireless/ieee802154/mrf24j40/Make.defs | 2 +-
drivers/wireless/ieee802154/xbee/Make.defs | 2 +-
drivers/wireless/lpwan/sx127x/Make.defs | 2 +-
drivers/wireless/spirit/drivers/Make.defs | 2 +-
drivers/wireless/spirit/include/Make.defs | 2 +-
fs/spiffs/Make.defs | 2 +-
graphics/Makefile | 4 ----
graphics/nxbe/Make.defs | 2 +-
graphics/nxglib/Make.defs | 3 ++-
graphics/nxmu/Make.defs | 2 +-
graphics/nxterm/Make.defs | 2 +-
graphics/vnc/client/Make.defs | 2 +-
graphics/vnc/server/Make.defs | 2 +-
libs/libc/zoneinfo/Makefile | 4 ----
mm/iob/Make.defs | 2 +-
pass1/Makefile | 4 ----
tools/Config.mk | 3 +++
wireless/Makefile | 4 ----
wireless/bluetooth/Make.defs | 2 +-
wireless/ieee802154/Make.defs | 2 +-
wireless/pktradio/Make.defs | 2 +-
102 files changed, 113 insertions(+), 137 deletions(-)
diff --git a/audio/Makefile b/audio/Makefile
index 6814e15..426caae 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -36,10 +36,6 @@
-include $(TOPDIR)/Make.defs
DELIM ?= $(strip /)
-ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
-INCDIROPT = -w
-endif
-
DEPPATH = --dep-path .
ASRCS =
CSRCS = audio.c
diff --git a/binfmt/Makefile b/binfmt/Makefile
index 2769465..19b98cf 100644
--- a/binfmt/Makefile
+++ b/binfmt/Makefile
@@ -37,10 +37,6 @@
-include $(TOPDIR)/Make.defs
DELIM ?= $(strip /)
-ifeq ($(WINTCONFIG_CYGWIN_WINTOOLOOL),y)
-INCDIROPT = -w
-endif
-
# Basic BINFMT source files
BINFMT_ASRCS =
diff --git a/boards/Board.mk b/boards/Board.mk
index 9ca2274..2edabad 100644
--- a/boards/Board.mk
+++ b/boards/Board.mk
@@ -86,12 +86,12 @@ endif
INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES)
CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
else
- CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(SCHEDSRCDIR)"}
- CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(ARCHSRCDIR)$(DELIM)chip"}
+ CFLAGS += ${shell $(INCDIR) "$(CC)" "$(SCHEDSRCDIR)"}
+ CFLAGS += ${shell $(INCDIR) "$(CC)" "$(ARCHSRCDIR)$(DELIM)chip"}
ifneq ($(CONFIG_ARCH_SIM),y)
- CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(ARCHSRCDIR)$(DELIM)common"}
+ CFLAGS += ${shell $(INCDIR) "$(CC)" "$(ARCHSRCDIR)$(DELIM)common"}
ifneq ($(ARCH_FAMILY),)
- CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(ARCHSRCDIR)$(DELIM)$(ARCH_FAMILY)"}
+ CFLAGS += ${shell $(INCDIR) "$(CC)" "$(ARCHSRCDIR)$(DELIM)$(ARCH_FAMILY)"}
endif
endif
endif
diff --git a/boards/arm/cxd56xx/common/src/Make.defs b/boards/arm/cxd56xx/common/src/Make.defs
index 5b427b1..4e11b75 100644
--- a/boards/arm/cxd56xx/common/src/Make.defs
+++ b/boards/arm/cxd56xx/common/src/Make.defs
@@ -161,4 +161,4 @@ endif
DEPPATH += --dep-path src
VPATH += :src
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)src)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)src)
diff --git a/boards/arm/cxd56xx/drivers/audio/Make.defs b/boards/arm/cxd56xx/drivers/audio/Make.defs
index 49be780..39f15d2 100644
--- a/boards/arm/cxd56xx/drivers/audio/Make.defs
+++ b/boards/arm/cxd56xx/drivers/audio/Make.defs
@@ -53,4 +53,4 @@ endif
DEPPATH += --dep-path platform$(DELIM)audio
VPATH += :platform$(DELIM)audio
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)platform$(DELIM)audio)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)platform$(DELIM)audio)
diff --git a/boards/arm/cxd56xx/drivers/camera/Make.defs b/boards/arm/cxd56xx/drivers/camera/Make.defs
index dffad76..ff47c27 100644
--- a/boards/arm/cxd56xx/drivers/camera/Make.defs
+++ b/boards/arm/cxd56xx/drivers/camera/Make.defs
@@ -24,4 +24,4 @@ endif
DEPPATH += --dep-path platform$(DELIM)camera
VPATH += :platform$(DELIM)camera
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)platform$(DELIM)camera)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)platform$(DELIM)camera)
diff --git a/boards/arm/cxd56xx/drivers/sensors/Make.defs b/boards/arm/cxd56xx/drivers/sensors/Make.defs
index 7f6706d..afd77ce 100644
--- a/boards/arm/cxd56xx/drivers/sensors/Make.defs
+++ b/boards/arm/cxd56xx/drivers/sensors/Make.defs
@@ -79,4 +79,4 @@ endif
DEPPATH += --dep-path platform$(DELIM)sensors
VPATH += :platform$(DELIM)sensors
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)platform$(DELIM)sensors)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)platform$(DELIM)sensors)
diff --git a/boards/arm/cxd56xx/spresense/src/Make.defs b/boards/arm/cxd56xx/spresense/src/Make.defs
index 598deed..be47e8d 100644
--- a/boards/arm/cxd56xx/spresense/src/Make.defs
+++ b/boards/arm/cxd56xx/spresense/src/Make.defs
@@ -91,4 +91,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/axoloti/src/Make.defs b/boards/arm/stm32/axoloti/src/Make.defs
index 4145f00..fe77f5f 100644
--- a/boards/arm/stm32/axoloti/src/Make.defs
+++ b/boards/arm/stm32/axoloti/src/Make.defs
@@ -70,4 +70,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/clicker2-stm32/src/Make.defs b/boards/arm/stm32/clicker2-stm32/src/Make.defs
index 547f463..898af31 100644
--- a/boards/arm/stm32/clicker2-stm32/src/Make.defs
+++ b/boards/arm/stm32/clicker2-stm32/src/Make.defs
@@ -82,4 +82,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/cloudctrl/src/Make.defs b/boards/arm/stm32/cloudctrl/src/Make.defs
index 7bcb538..77c72b4 100644
--- a/boards/arm/stm32/cloudctrl/src/Make.defs
+++ b/boards/arm/stm32/cloudctrl/src/Make.defs
@@ -79,4 +79,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/common/Makefile b/boards/arm/stm32/common/Makefile
index c2531d0..19a8801 100644
--- a/boards/arm/stm32/common/Makefile
+++ b/boards/arm/stm32/common/Makefile
@@ -30,5 +30,5 @@ include $(TOPDIR)/boards/Board.mk
ARCHSRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
BOARDDIR = $(ARCHSRCDIR)$(DELIM)board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(BOARDDIR)$(DELIM)include)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(BOARDDIR)$(DELIM)include)
diff --git a/boards/arm/stm32/common/src/Make.defs b/boards/arm/stm32/common/src/Make.defs
index a309b06..4ff9bb9 100644
--- a/boards/arm/stm32/common/src/Make.defs
+++ b/boards/arm/stm32/common/src/Make.defs
@@ -108,4 +108,4 @@ endif
DEPPATH += --dep-path src
VPATH += :src
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)src)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)src)
diff --git a/boards/arm/stm32/fire-stm32v2/src/Make.defs b/boards/arm/stm32/fire-stm32v2/src/Make.defs
index 5c1893b..a7a5e99 100644
--- a/boards/arm/stm32/fire-stm32v2/src/Make.defs
+++ b/boards/arm/stm32/fire-stm32v2/src/Make.defs
@@ -70,4 +70,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/hymini-stm32v/src/Make.defs b/boards/arm/stm32/hymini-stm32v/src/Make.defs
index 4fa3add..5995bf4 100644
--- a/boards/arm/stm32/hymini-stm32v/src/Make.defs
+++ b/boards/arm/stm32/hymini-stm32v/src/Make.defs
@@ -61,4 +61,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/maple/src/Make.defs b/boards/arm/stm32/maple/src/Make.defs
index fe5d47d..109b67e 100644
--- a/boards/arm/stm32/maple/src/Make.defs
+++ b/boards/arm/stm32/maple/src/Make.defs
@@ -58,4 +58,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/mikroe-stm32f4/src/Make.defs b/boards/arm/stm32/mikroe-stm32f4/src/Make.defs
index 4312038..66cb935 100644
--- a/boards/arm/stm32/mikroe-stm32f4/src/Make.defs
+++ b/boards/arm/stm32/mikroe-stm32f4/src/Make.defs
@@ -88,4 +88,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/nucleo-f103rb/src/Make.defs b/boards/arm/stm32/nucleo-f103rb/src/Make.defs
index 1435901..6a9332d 100644
--- a/boards/arm/stm32/nucleo-f103rb/src/Make.defs
+++ b/boards/arm/stm32/nucleo-f103rb/src/Make.defs
@@ -62,4 +62,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/nucleo-f207zg/src/Make.defs b/boards/arm/stm32/nucleo-f207zg/src/Make.defs
index 31610e2..e90a50a 100644
--- a/boards/arm/stm32/nucleo-f207zg/src/Make.defs
+++ b/boards/arm/stm32/nucleo-f207zg/src/Make.defs
@@ -66,4 +66,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/nucleo-f302r8/src/Make.defs b/boards/arm/stm32/nucleo-f302r8/src/Make.defs
index 25496cf..d2368d9 100644
--- a/boards/arm/stm32/nucleo-f302r8/src/Make.defs
+++ b/boards/arm/stm32/nucleo-f302r8/src/Make.defs
@@ -62,4 +62,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/nucleo-f303re/src/Make.defs b/boards/arm/stm32/nucleo-f303re/src/Make.defs
index 4d23e1a..390faf1 100644
--- a/boards/arm/stm32/nucleo-f303re/src/Make.defs
+++ b/boards/arm/stm32/nucleo-f303re/src/Make.defs
@@ -88,4 +88,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/nucleo-f303ze/src/Make.defs b/boards/arm/stm32/nucleo-f303ze/src/Make.defs
index 53fcd29..5289529 100644
--- a/boards/arm/stm32/nucleo-f303ze/src/Make.defs
+++ b/boards/arm/stm32/nucleo-f303ze/src/Make.defs
@@ -62,4 +62,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/nucleo-f334r8/src/Make.defs b/boards/arm/stm32/nucleo-f334r8/src/Make.defs
index b05ca7c..1dde5ff 100644
--- a/boards/arm/stm32/nucleo-f334r8/src/Make.defs
+++ b/boards/arm/stm32/nucleo-f334r8/src/Make.defs
@@ -98,4 +98,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/nucleo-f410rb/src/Make.defs b/boards/arm/stm32/nucleo-f410rb/src/Make.defs
index d8dda5e..834c7ec 100644
--- a/boards/arm/stm32/nucleo-f410rb/src/Make.defs
+++ b/boards/arm/stm32/nucleo-f410rb/src/Make.defs
@@ -58,4 +58,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/nucleo-f429zi/src/Make.defs b/boards/arm/stm32/nucleo-f429zi/src/Make.defs
index 5301501..a1fc8d3 100644
--- a/boards/arm/stm32/nucleo-f429zi/src/Make.defs
+++ b/boards/arm/stm32/nucleo-f429zi/src/Make.defs
@@ -75,4 +75,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/nucleo-f446re/src/Make.defs b/boards/arm/stm32/nucleo-f446re/src/Make.defs
index 395328c..a33237c 100644
--- a/boards/arm/stm32/nucleo-f446re/src/Make.defs
+++ b/boards/arm/stm32/nucleo-f446re/src/Make.defs
@@ -61,4 +61,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/nucleo-f4x1re/src/Make.defs b/boards/arm/stm32/nucleo-f4x1re/src/Make.defs
index d38cb8b..527bd15 100644
--- a/boards/arm/stm32/nucleo-f4x1re/src/Make.defs
+++ b/boards/arm/stm32/nucleo-f4x1re/src/Make.defs
@@ -65,4 +65,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/nucleo-l152re/src/Make.defs b/boards/arm/stm32/nucleo-l152re/src/Make.defs
index 379177c..2fd5ddd 100644
--- a/boards/arm/stm32/nucleo-l152re/src/Make.defs
+++ b/boards/arm/stm32/nucleo-l152re/src/Make.defs
@@ -54,4 +54,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/olimex-stm32-e407/src/Make.defs b/boards/arm/stm32/olimex-stm32-e407/src/Make.defs
index e50f4e8..e8bf359 100644
--- a/boards/arm/stm32/olimex-stm32-e407/src/Make.defs
+++ b/boards/arm/stm32/olimex-stm32-e407/src/Make.defs
@@ -94,4 +94,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/olimex-stm32-h405/src/Make.defs b/boards/arm/stm32/olimex-stm32-h405/src/Make.defs
index 8ea8b0e..443b35f 100644
--- a/boards/arm/stm32/olimex-stm32-h405/src/Make.defs
+++ b/boards/arm/stm32/olimex-stm32-h405/src/Make.defs
@@ -66,4 +66,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/olimex-stm32-h407/src/Make.defs b/boards/arm/stm32/olimex-stm32-h407/src/Make.defs
index ee3f2aa..bb05ea5 100644
--- a/boards/arm/stm32/olimex-stm32-h407/src/Make.defs
+++ b/boards/arm/stm32/olimex-stm32-h407/src/Make.defs
@@ -86,4 +86,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/olimex-stm32-p107/src/Make.defs b/boards/arm/stm32/olimex-stm32-p107/src/Make.defs
index 8e5eb66..4d45466 100644
--- a/boards/arm/stm32/olimex-stm32-p107/src/Make.defs
+++ b/boards/arm/stm32/olimex-stm32-p107/src/Make.defs
@@ -52,4 +52,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/olimex-stm32-p207/src/Make.defs b/boards/arm/stm32/olimex-stm32-p207/src/Make.defs
index 82a328d..d385543 100644
--- a/boards/arm/stm32/olimex-stm32-p207/src/Make.defs
+++ b/boards/arm/stm32/olimex-stm32-p207/src/Make.defs
@@ -66,4 +66,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/olimex-stm32-p407/src/Make.defs b/boards/arm/stm32/olimex-stm32-p407/src/Make.defs
index 53d9795..39edf02 100644
--- a/boards/arm/stm32/olimex-stm32-p407/src/Make.defs
+++ b/boards/arm/stm32/olimex-stm32-p407/src/Make.defs
@@ -70,4 +70,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/olimexino-stm32/src/Make.defs b/boards/arm/stm32/olimexino-stm32/src/Make.defs
index db7e407..394be3a 100644
--- a/boards/arm/stm32/olimexino-stm32/src/Make.defs
+++ b/boards/arm/stm32/olimexino-stm32/src/Make.defs
@@ -64,4 +64,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/omnibusf4/src/Make.defs b/boards/arm/stm32/omnibusf4/src/Make.defs
index f3b4145..0a54325 100644
--- a/boards/arm/stm32/omnibusf4/src/Make.defs
+++ b/boards/arm/stm32/omnibusf4/src/Make.defs
@@ -109,4 +109,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/photon/src/Make.defs b/boards/arm/stm32/photon/src/Make.defs
index 90305c0..8021426 100644
--- a/boards/arm/stm32/photon/src/Make.defs
+++ b/boards/arm/stm32/photon/src/Make.defs
@@ -74,4 +74,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/shenzhou/src/Make.defs b/boards/arm/stm32/shenzhou/src/Make.defs
index eaa0212..5ca9c97 100644
--- a/boards/arm/stm32/shenzhou/src/Make.defs
+++ b/boards/arm/stm32/shenzhou/src/Make.defs
@@ -90,4 +90,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/stm3210e-eval/src/Make.defs b/boards/arm/stm32/stm3210e-eval/src/Make.defs
index 4f7186f..bb5cd82 100644
--- a/boards/arm/stm32/stm3210e-eval/src/Make.defs
+++ b/boards/arm/stm32/stm3210e-eval/src/Make.defs
@@ -86,4 +86,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/stm3220g-eval/src/Make.defs b/boards/arm/stm32/stm3220g-eval/src/Make.defs
index 655c419..f906ec4 100644
--- a/boards/arm/stm32/stm3220g-eval/src/Make.defs
+++ b/boards/arm/stm32/stm3220g-eval/src/Make.defs
@@ -78,4 +78,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/stm3240g-eval/src/Make.defs b/boards/arm/stm32/stm3240g-eval/src/Make.defs
index c56e111..5948fac 100644
--- a/boards/arm/stm32/stm3240g-eval/src/Make.defs
+++ b/boards/arm/stm32/stm3240g-eval/src/Make.defs
@@ -83,4 +83,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/stm32_tiny/src/Make.defs b/boards/arm/stm32/stm32_tiny/src/Make.defs
index 0ec9bfd..8da5bf9 100644
--- a/boards/arm/stm32/stm32_tiny/src/Make.defs
+++ b/boards/arm/stm32/stm32_tiny/src/Make.defs
@@ -49,5 +49,5 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/stm32butterfly2/src/Make.defs b/boards/arm/stm32/stm32butterfly2/src/Make.defs
index 753d19a..15f4cc0 100644
--- a/boards/arm/stm32/stm32butterfly2/src/Make.defs
+++ b/boards/arm/stm32/stm32butterfly2/src/Make.defs
@@ -67,4 +67,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/stm32f103-minimum/src/Make.defs b/boards/arm/stm32/stm32f103-minimum/src/Make.defs
index b8d3c26..eebdb81 100644
--- a/boards/arm/stm32/stm32f103-minimum/src/Make.defs
+++ b/boards/arm/stm32/stm32f103-minimum/src/Make.defs
@@ -125,4 +125,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/stm32f334-disco/src/Make.defs b/boards/arm/stm32/stm32f334-disco/src/Make.defs
index 3248c5a..805f1d6 100644
--- a/boards/arm/stm32/stm32f334-disco/src/Make.defs
+++ b/boards/arm/stm32/stm32f334-disco/src/Make.defs
@@ -78,4 +78,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/stm32f3discovery/src/Make.defs b/boards/arm/stm32/stm32f3discovery/src/Make.defs
index 66b8eea..50ca6f0 100644
--- a/boards/arm/stm32/stm32f3discovery/src/Make.defs
+++ b/boards/arm/stm32/stm32f3discovery/src/Make.defs
@@ -62,4 +62,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/stm32f411e-disco/src/Make.defs b/boards/arm/stm32/stm32f411e-disco/src/Make.defs
index 81289b3..7d9c0d5 100644
--- a/boards/arm/stm32/stm32f411e-disco/src/Make.defs
+++ b/boards/arm/stm32/stm32f411e-disco/src/Make.defs
@@ -48,4 +48,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/stm32f429i-disco/src/Make.defs b/boards/arm/stm32/stm32f429i-disco/src/Make.defs
index bc7ec06..13ec5d8 100644
--- a/boards/arm/stm32/stm32f429i-disco/src/Make.defs
+++ b/boards/arm/stm32/stm32f429i-disco/src/Make.defs
@@ -97,4 +97,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/stm32f4discovery/src/Make.defs b/boards/arm/stm32/stm32f4discovery/src/Make.defs
index 82f7217..1b1807d 100644
--- a/boards/arm/stm32/stm32f4discovery/src/Make.defs
+++ b/boards/arm/stm32/stm32f4discovery/src/Make.defs
@@ -194,4 +194,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/stm32ldiscovery/src/Make.defs b/boards/arm/stm32/stm32ldiscovery/src/Make.defs
index ae3dfef..49eef25 100644
--- a/boards/arm/stm32/stm32ldiscovery/src/Make.defs
+++ b/boards/arm/stm32/stm32ldiscovery/src/Make.defs
@@ -62,4 +62,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/stm32vldiscovery/src/Make.defs b/boards/arm/stm32/stm32vldiscovery/src/Make.defs
index 24da6c8..f29afec 100644
--- a/boards/arm/stm32/stm32vldiscovery/src/Make.defs
+++ b/boards/arm/stm32/stm32vldiscovery/src/Make.defs
@@ -45,4 +45,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32/viewtool-stm32f107/src/Make.defs b/boards/arm/stm32/viewtool-stm32f107/src/Make.defs
index 1900662..9a46540 100644
--- a/boards/arm/stm32/viewtool-stm32f107/src/Make.defs
+++ b/boards/arm/stm32/viewtool-stm32f107/src/Make.defs
@@ -92,4 +92,4 @@ endif
DEPPATH += --dep-path board
VPATH += :board
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/drivers/1wire/Make.defs b/drivers/1wire/Make.defs
index a730cba..3734314 100644
--- a/drivers/1wire/Make.defs
+++ b/drivers/1wire/Make.defs
@@ -45,5 +45,5 @@ endif
DEPPATH += --dep-path 1wire
VPATH += :1wire
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)1wire}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)1wire}
endif
diff --git a/drivers/Makefile b/drivers/Makefile
index c1fe761..0ea2988 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -36,10 +36,6 @@
-include $(TOPDIR)/Make.defs
DELIM ?= $(strip /)
-ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
-INCDIROPT = -w
-endif
-
DEPPATH = --dep-path .
ASRCS =
CSRCS =
diff --git a/drivers/analog/Make.defs b/drivers/analog/Make.defs
index c2494df..a47f1c4 100644
--- a/drivers/analog/Make.defs
+++ b/drivers/analog/Make.defs
@@ -121,22 +121,22 @@ endif
ifeq ($(CONFIG_DAC),y)
DEPPATH += --dep-path analog
VPATH += :analog
- CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)analog}
+ CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)analog}
else
ifeq ($(CONFIG_ADC),y)
DEPPATH += --dep-path analog
VPATH += :analog
- CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)analog}
+ CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)analog}
else
ifeq ($(CONFIG_COMP),y)
DEPPATH += --dep-path analog
VPATH += :analog
- CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)analog}
+ CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)analog}
else
ifeq ($(CONFIG_OPAMP),y)
DEPPATH += --dep-path analog
VPATH += :analog
- CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)analog}
+ CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)analog}
endif
endif
endif
diff --git a/drivers/bch/Make.defs b/drivers/bch/Make.defs
index e10e41e..72a52de 100644
--- a/drivers/bch/Make.defs
+++ b/drivers/bch/Make.defs
@@ -45,6 +45,6 @@ CSRCS += bchdev_driver.c
DEPPATH += --dep-path bch
VPATH += :bch
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)bch}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)bch}
endif
diff --git a/drivers/can/Make.defs b/drivers/can/Make.defs
index 158fba8..b341bf2 100644
--- a/drivers/can/Make.defs
+++ b/drivers/can/Make.defs
@@ -47,5 +47,5 @@ endif
DEPPATH += --dep-path can
VPATH += :can
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)can}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)can}
endif
diff --git a/drivers/contactless/Make.defs b/drivers/contactless/Make.defs
index 0df7134..d918b15 100644
--- a/drivers/contactless/Make.defs
+++ b/drivers/contactless/Make.defs
@@ -49,5 +49,5 @@ endif
DEPPATH += --dep-path contactless
VPATH += :contactless
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)contactless}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)contactless}
endif
diff --git a/drivers/crypto/Make.defs b/drivers/crypto/Make.defs
index 135f271..89862c8 100644
--- a/drivers/crypto/Make.defs
+++ b/drivers/crypto/Make.defs
@@ -43,4 +43,4 @@ endif
DEPPATH += --dep-path crypto
VPATH += :crypto
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)crypto}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)crypto}
diff --git a/drivers/i2c/Make.defs b/drivers/i2c/Make.defs
index 5bdf115..5aeefc8 100644
--- a/drivers/i2c/Make.defs
+++ b/drivers/i2c/Make.defs
@@ -54,6 +54,6 @@ endif
DEPPATH += --dep-path i2c
VPATH += :i2c
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)i2c}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)i2c}
endif # CONFIG_I2C
diff --git a/drivers/input/Make.defs b/drivers/input/Make.defs
index 1f92089..f35830f 100644
--- a/drivers/input/Make.defs
+++ b/drivers/input/Make.defs
@@ -103,5 +103,5 @@ endif
DEPPATH += --dep-path input
VPATH += :input
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)input}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)input}
endif
diff --git a/drivers/ioexpander/Make.defs b/drivers/ioexpander/Make.defs
index 3d2b1f0..080fea7 100644
--- a/drivers/ioexpander/Make.defs
+++ b/drivers/ioexpander/Make.defs
@@ -75,7 +75,7 @@ ifeq ($(CONFIG_IOEXPANDER),y)
DEPPATH += --dep-path ioexpander
VPATH += :ioexpander
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)ioexpander}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)ioexpander}
else ifeq ($(CONFIG_DEV_GPIO),y)
@@ -83,6 +83,6 @@ else ifeq ($(CONFIG_DEV_GPIO),y)
DEPPATH += --dep-path ioexpander
VPATH += :ioexpander
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)ioexpander}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)ioexpander}
endif
diff --git a/drivers/lcd/Make.defs b/drivers/lcd/Make.defs
index f5a4c16..ae4e59d 100644
--- a/drivers/lcd/Make.defs
+++ b/drivers/lcd/Make.defs
@@ -157,13 +157,13 @@ endif
ifeq ($(CONFIG_LCD),y)
DEPPATH += --dep-path lcd
VPATH += :lcd
- CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)lcd}
+ CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)lcd}
else ifeq ($(CONFIG_SLCD),y)
DEPPATH += --dep-path lcd
VPATH += :lcd
- CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)lcd}
+ CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)lcd}
else ifeq ($(CONFIG_LCD_OTHER),y)
DEPPATH += --dep-path lcd
VPATH += :lcd
- CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)lcd}
+ CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)lcd}
endif
diff --git a/drivers/loop/Make.defs b/drivers/loop/Make.defs
index a7c9336..d4725cf 100644
--- a/drivers/loop/Make.defs
+++ b/drivers/loop/Make.defs
@@ -49,6 +49,6 @@ CSRCS += losetup.c
DEPPATH += --dep-path loop
VPATH += :loop
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)loop}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)loop}
endif
diff --git a/drivers/mmcsd/Make.defs b/drivers/mmcsd/Make.defs
index c5a67b1..67b5f58 100644
--- a/drivers/mmcsd/Make.defs
+++ b/drivers/mmcsd/Make.defs
@@ -49,6 +49,6 @@ endif
DEPPATH += --dep-path mmcsd
VPATH += :mmcsd
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)mmcsd}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)mmcsd}
endif
diff --git a/drivers/modem/Make.defs b/drivers/modem/Make.defs
index 3b406f6..ad2215e 100644
--- a/drivers/modem/Make.defs
+++ b/drivers/modem/Make.defs
@@ -45,6 +45,6 @@ include modem$(DELIM)altair$(DELIM)Make.defs
DEPPATH += --dep-path modem
VPATH += :modem
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)modem}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)modem}
endif
diff --git a/drivers/modem/altair/Make.defs b/drivers/modem/altair/Make.defs
index d24feb6..a6cdbde 100644
--- a/drivers/modem/altair/Make.defs
+++ b/drivers/modem/altair/Make.defs
@@ -45,6 +45,6 @@ endif
DEPPATH += --dep-path modem$(DELIM)altair
VPATH += :modem$(DELIM)altair
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)modem}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)modem}
endif
diff --git a/drivers/power/Make.defs b/drivers/power/Make.defs
index 9280884..74ebe5d 100644
--- a/drivers/power/Make.defs
+++ b/drivers/power/Make.defs
@@ -62,7 +62,7 @@ endif
POWER_DEPPATH := --dep-path power
POWER_VPATH := :power
-POWER_CFLAGS := ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power}
+POWER_CFLAGS := ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power}
endif
@@ -74,7 +74,7 @@ CSRCS += smps.c
POWER_DEPPATH := --dep-path power
POWER_VPATH := :power
-POWER_CFLAGS := ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power}
+POWER_CFLAGS := ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power}
endif
@@ -86,7 +86,7 @@ CSRCS += powerled.c
POWER_DEPPATH := --dep-path power
POWER_VPATH := :power
-POWER_CFLAGS := ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power}
+POWER_CFLAGS := ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power}
endif
@@ -98,7 +98,7 @@ CSRCS += motor.c
POWER_DEPPATH := --dep-path power
POWER_VPATH := :power
-POWER_CFLAGS := ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power}
+POWER_CFLAGS := ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power}
endif
@@ -136,7 +136,7 @@ endif
POWER_DEPPATH := --dep-path power
POWER_VPATH := :power
-POWER_CFLAGS := ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power}
+POWER_CFLAGS := ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power}
endif
@@ -162,7 +162,7 @@ endif
POWER_DEPPATH := --dep-path power
POWER_VPATH := :power
-POWER_CFLAGS := ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power}
+POWER_CFLAGS := ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power}
endif
@@ -188,7 +188,7 @@ endif
POWER_DEPPATH := --dep-path power
POWER_VPATH := :power
-POWER_CFLAGS := ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power}
+POWER_CFLAGS := ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power}
endif
diff --git a/drivers/rptun/Make.defs b/drivers/rptun/Make.defs
index 17c4953..5a00c48 100644
--- a/drivers/rptun/Make.defs
+++ b/drivers/rptun/Make.defs
@@ -41,5 +41,5 @@ CSRCS += rptun.c
DEPPATH += --dep-path rptun
VPATH += :rptun
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)rptun}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)rptun}
endif
diff --git a/drivers/sensors/Make.defs b/drivers/sensors/Make.defs
index bf730ef..a92d9f9 100644
--- a/drivers/sensors/Make.defs
+++ b/drivers/sensors/Make.defs
@@ -301,6 +301,6 @@ endif
DEPPATH += --dep-path sensors
VPATH += :sensors
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)sensors}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)sensors}
endif # CONFIG_SENSORS
diff --git a/drivers/spi/Make.defs b/drivers/spi/Make.defs
index e489bd6..5ea290d 100644
--- a/drivers/spi/Make.defs
+++ b/drivers/spi/Make.defs
@@ -54,5 +54,5 @@ endif
DEPPATH += --dep-path spi
VPATH += :spi
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)spi}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)spi}
endif
diff --git a/drivers/usbdev/Make.defs b/drivers/usbdev/Make.defs
index c38de6a..dd2fb5a 100644
--- a/drivers/usbdev/Make.defs
+++ b/drivers/usbdev/Make.defs
@@ -75,5 +75,5 @@ CSRCS += usbdev_trace.c usbdev_trprintf.c
DEPPATH += --dep-path usbdev
VPATH += :usbdev
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)usbdev}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)usbdev}
endif
diff --git a/drivers/usbhost/Make.defs b/drivers/usbhost/Make.defs
index cfad073..cf058a1 100644
--- a/drivers/usbhost/Make.defs
+++ b/drivers/usbhost/Make.defs
@@ -89,4 +89,4 @@ endif
DEPPATH += --dep-path usbhost
VPATH += :usbhost
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)usbhost}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)usbhost}
diff --git a/drivers/usbmisc/Make.defs b/drivers/usbmisc/Make.defs
index a3d6a57..9ac7506 100644
--- a/drivers/usbmisc/Make.defs
+++ b/drivers/usbmisc/Make.defs
@@ -49,5 +49,5 @@ endif
DEPPATH += --dep-path usbmisc
VPATH += :usbmisc
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)usbmisc}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)usbmisc}
endif
diff --git a/drivers/usbmonitor/Make.defs b/drivers/usbmonitor/Make.defs
index c6664b0..811db06 100644
--- a/drivers/usbmonitor/Make.defs
+++ b/drivers/usbmonitor/Make.defs
@@ -45,6 +45,6 @@ CSRCS += usbmonitor.c
DEPPATH += --dep-path usbmonitor
VPATH += :usbmonitor
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)usbmonitor}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)usbmonitor}
endif
diff --git a/drivers/video/Make.defs b/drivers/video/Make.defs
index 82ac7ee..91203f2 100644
--- a/drivers/video/Make.defs
+++ b/drivers/video/Make.defs
@@ -69,6 +69,6 @@ endif
DEPPATH += --dep-path video
VPATH += :video
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)video}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)video}
endif
diff --git a/drivers/wireless/Make.defs b/drivers/wireless/Make.defs
index ecb1971..7b30e60 100644
--- a/drivers/wireless/Make.defs
+++ b/drivers/wireless/Make.defs
@@ -82,5 +82,5 @@ endif
DEPPATH += --dep-path wireless
VPATH += :wireless
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless}
endif
diff --git a/drivers/wireless/bluetooth/Make.defs b/drivers/wireless/bluetooth/Make.defs
index 728eaae..4eb538e 100644
--- a/drivers/wireless/bluetooth/Make.defs
+++ b/drivers/wireless/bluetooth/Make.defs
@@ -63,6 +63,6 @@ endif
DEPPATH += --dep-path wireless$(DELIM)bluetooth
VPATH += :wireless$(DELIM)bluetooth
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)bluetooth}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)bluetooth}
endif # CONFIG_DRIVERS_BLUETOOTH
diff --git a/drivers/wireless/ieee80211/bcm43xxx/Make.defs b/drivers/wireless/ieee80211/bcm43xxx/Make.defs
index ef2a757..28a9996 100644
--- a/drivers/wireless/ieee80211/bcm43xxx/Make.defs
+++ b/drivers/wireless/ieee80211/bcm43xxx/Make.defs
@@ -60,6 +60,6 @@ endif
DEPPATH += --dep-path wireless$(DELIM)ieee80211$(DELIM)bcm43xxx
VPATH += :wireless$(DELIM)ieee80211$(DELIM)bcm43xxx
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)ieee80211$(DELIM)bcm43xxx}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)ieee80211$(DELIM)bcm43xxx}
endif # CONFIG_IEEE80211_BROADCOM_FULLMAC
diff --git a/drivers/wireless/ieee802154/Make.defs b/drivers/wireless/ieee802154/Make.defs
index cd898cd..3eaa91c 100644
--- a/drivers/wireless/ieee802154/Make.defs
+++ b/drivers/wireless/ieee802154/Make.defs
@@ -49,6 +49,6 @@ include wireless$(DELIM)ieee802154$(DELIM)xbee$(DELIM)Make.defs
DEPPATH += --dep-path wireless$(DELIM)ieee802154
VPATH += :wireless$(DELIM)ieee802154
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)ieee802154}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)ieee802154}
endif # CONFIG_DRIVERS_IEEE802154
diff --git a/drivers/wireless/ieee802154/at86rf23x/Make.defs b/drivers/wireless/ieee802154/at86rf23x/Make.defs
index d52943e..aeecf1b 100644
--- a/drivers/wireless/ieee802154/at86rf23x/Make.defs
+++ b/drivers/wireless/ieee802154/at86rf23x/Make.defs
@@ -43,6 +43,6 @@ CSRCS += at86rf23x.c
DEPPATH += --dep-path wireless$(DELIM)ieee802154$(DELIM)at86rf23x
VPATH += :wireless$(DELIM)ieee802154$(DELIM)at86rf23x
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)ieee802154$(DELIM)at86rf23x}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)ieee802154$(DELIM)at86rf23x}
endif # CONFIG_IEEE802154_AT86RF233
diff --git a/drivers/wireless/ieee802154/mrf24j40/Make.defs b/drivers/wireless/ieee802154/mrf24j40/Make.defs
index 1040d42..04c06ec 100644
--- a/drivers/wireless/ieee802154/mrf24j40/Make.defs
+++ b/drivers/wireless/ieee802154/mrf24j40/Make.defs
@@ -44,6 +44,6 @@ CSRCS += mrf24j40_regops.c mrf24j40.c
DEPPATH += --dep-path wireless$(DELIM)ieee802154$(DELIM)mrf24j40
VPATH += :wireless$(DELIM)ieee802154$(DELIM)mrf24j40
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)ieee802154$(DELIM)mrf24j40}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)ieee802154$(DELIM)mrf24j40}
endif # CONFIG_IEEE802154_MRF24J40
diff --git a/drivers/wireless/ieee802154/xbee/Make.defs b/drivers/wireless/ieee802154/xbee/Make.defs
index d4e7371..ca4a68c 100644
--- a/drivers/wireless/ieee802154/xbee/Make.defs
+++ b/drivers/wireless/ieee802154/xbee/Make.defs
@@ -43,6 +43,6 @@ CSRCS += xbee_ioctl.c xbee_mac.c xbee_netdev.c xbee.c
DEPPATH += --dep-path wireless$(DELIM)ieee802154$(DELIM)xbee
VPATH += :wireless$(DELIM)ieee802154$(DELIM)xbee
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)ieee802154$(DELIM)xbee}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)ieee802154$(DELIM)xbee}
endif # CONFIG_IEEE802154_XBEE
diff --git a/drivers/wireless/lpwan/sx127x/Make.defs b/drivers/wireless/lpwan/sx127x/Make.defs
index 90c24cb..a52dd2d 100644
--- a/drivers/wireless/lpwan/sx127x/Make.defs
+++ b/drivers/wireless/lpwan/sx127x/Make.defs
@@ -43,6 +43,6 @@ CSRCS += sx127x.c
DEPPATH += --dep-path wireless$(DELIM)lpwan$(DELIM)sx127x
VPATH += :wireless$(DELIM)lpwan$(DELIM)sx127x
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)lpwan$(DELIM)sx127x}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)lpwan$(DELIM)sx127x}
endif # CONFIG_LPWAN_SX127X
diff --git a/drivers/wireless/spirit/drivers/Make.defs b/drivers/wireless/spirit/drivers/Make.defs
index 723309e..70ded12 100644
--- a/drivers/wireless/spirit/drivers/Make.defs
+++ b/drivers/wireless/spirit/drivers/Make.defs
@@ -43,7 +43,7 @@ CSRCS += spirit_netdev.c
DEPPATH += --dep-path wireless$(DELIM)spirit$(DELIM)drivers
VPATH += :wireless$(DELIM)spirit$(DELIM)drivers
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" \
+CFLAGS += ${shell $(INCDIR) "$(CC)" \
$(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)spirit$(DELIM)drivers}
endif # CONFIG_SPIRIT_NETDEV
diff --git a/drivers/wireless/spirit/include/Make.defs b/drivers/wireless/spirit/include/Make.defs
index b4091f8..ed36427 100644
--- a/drivers/wireless/spirit/include/Make.defs
+++ b/drivers/wireless/spirit/include/Make.defs
@@ -35,5 +35,5 @@
# Add path to include Spirit header files in CFLAGS
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" \
+CFLAGS += ${shell $(INCDIR) "$(CC)" \
$(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)spirit$(DELIM)include}
diff --git a/fs/spiffs/Make.defs b/fs/spiffs/Make.defs
index b02efb4..f376968 100644
--- a/fs/spiffs/Make.defs
+++ b/fs/spiffs/Make.defs
@@ -44,6 +44,6 @@ CSRCS += spiffs_cache.c spiffs_check.c spiffs_mtd.c
DEPPATH += --dep-path spiffs/src
VPATH += :spiffs/src
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)fs$(DELIM)spiffs$(DELIM)src}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)fs$(DELIM)spiffs$(DELIM)src}
endif
diff --git a/graphics/Makefile b/graphics/Makefile
index 0602964..2a66e68 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -38,10 +38,6 @@
DEPPATH = --dep-path .
-ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
-INCDIROPT = -w
-endif
-
ASRCS =
CSRCS =
VPATH =
diff --git a/graphics/nxbe/Make.defs b/graphics/nxbe/Make.defs
index fb3efd4..e6f9ff7 100644
--- a/graphics/nxbe/Make.defs
+++ b/graphics/nxbe/Make.defs
@@ -51,5 +51,5 @@ CSRCS += nxbe_cursor.c
endif
DEPPATH += --dep-path nxbe
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/nxbe}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)/graphics/nxbe}
VPATH += :nxbe
diff --git a/graphics/nxglib/Make.defs b/graphics/nxglib/Make.defs
index ff9132d..2750214 100644
--- a/graphics/nxglib/Make.defs
+++ b/graphics/nxglib/Make.defs
@@ -111,5 +111,6 @@ CSRCS += nxglib_cursor_backup_24bpp.c nxglib_cursor_backup_32bpp.c
endif
DEPPATH += --dep-path nxglib
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/nxglib}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)/graphics/nxglib}
+#VPATH += :nxglib
VPATH = nxglib
diff --git a/graphics/nxmu/Make.defs b/graphics/nxmu/Make.defs
index c47aede..f53107f 100644
--- a/graphics/nxmu/Make.defs
+++ b/graphics/nxmu/Make.defs
@@ -39,5 +39,5 @@ CSRCS += nxmu_sendclient.c nxmu_sendclientwindow.c nxmu_server.c
CSRCS += nxmu_start.c
DEPPATH += --dep-path nxmu
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/nxmu}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)/graphics/nxmu}
VPATH += :nxmu
diff --git a/graphics/nxterm/Make.defs b/graphics/nxterm/Make.defs
index 58d78ed..a05f0ad 100644
--- a/graphics/nxterm/Make.defs
+++ b/graphics/nxterm/Make.defs
@@ -52,7 +52,7 @@ CSRCS += nxterm_sem.c
endif
DEPPATH += --dep-path nxterm
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/nxterm}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)/graphics/nxterm}
VPATH += :nxterm
endif
diff --git a/graphics/vnc/client/Make.defs b/graphics/vnc/client/Make.defs
index 03d6f5b..ef0c098 100644
--- a/graphics/vnc/client/Make.defs
+++ b/graphics/vnc/client/Make.defs
@@ -36,7 +36,7 @@
ifeq ($(CONFIG_VNCCLIENT),y)
DEPPATH += --dep-path vnc/client
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/vnc/client}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)/graphics/vnc/client}
VPATH += :vnc/client
endif
diff --git a/graphics/vnc/server/Make.defs b/graphics/vnc/server/Make.defs
index a0ebad9..a472b18 100644
--- a/graphics/vnc/server/Make.defs
+++ b/graphics/vnc/server/Make.defs
@@ -43,7 +43,7 @@ CSRCS += vnc_keymap.c
endif
DEPPATH += --dep-path vnc/server
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/vnc/server}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)/graphics/vnc/server}
VPATH += :vnc/server
endif
diff --git a/libs/libc/zoneinfo/Makefile b/libs/libc/zoneinfo/Makefile
index bd0f6bd..81c760c 100644
--- a/libs/libc/zoneinfo/Makefile
+++ b/libs/libc/zoneinfo/Makefile
@@ -36,10 +36,6 @@
-include $(TOPDIR)/.config
-include $(TOPDIR)/Make.defs
-ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
-INCDIROPT = -w
-endif
-
# Zoneinfo database
ASRCS =
diff --git a/mm/iob/Make.defs b/mm/iob/Make.defs
index a2747ba..384dc63 100644
--- a/mm/iob/Make.defs
+++ b/mm/iob/Make.defs
@@ -56,6 +56,6 @@ endif
DEPPATH += --dep-path iob
VPATH += :iob
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)mm$(DELIM)iob}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)mm$(DELIM)iob}
endif # CONFIG_MM_IOB
diff --git a/pass1/Makefile b/pass1/Makefile
index 49e0456..530b244 100644
--- a/pass1/Makefile
+++ b/pass1/Makefile
@@ -36,10 +36,6 @@
-include $(TOPDIR)/Make.defs
DELIM ?= $(strip /)
-ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
-INCDIROPT = -w
-endif
-
DEPPATH = --dep-path .
ASRCS = $(wildcard *.S)
diff --git a/tools/Config.mk b/tools/Config.mk
index f96c40e..e9cd6bc 100644
--- a/tools/Config.mk
+++ b/tools/Config.mk
@@ -100,6 +100,9 @@ endif
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
DEFINE = "$(TOPDIR)\tools\define.bat"
INCDIR = "$(TOPDIR)\tools\incdir.bat"
+else ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
+ DEFINE = "$(TOPDIR)/tools/define.sh"
+ INCDIR = "$(TOPDIR)/tools/incdir.sh" -w
else
DEFINE = "$(TOPDIR)/tools/define.sh"
INCDIR = "$(TOPDIR)/tools/incdir.sh"
diff --git a/wireless/Makefile b/wireless/Makefile
index 7dc9bb5..254e449 100644
--- a/wireless/Makefile
+++ b/wireless/Makefile
@@ -36,10 +36,6 @@
-include $(TOPDIR)/Make.defs
DELIM ?= $(strip /)
-ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
-INCDIROPT = -w
-endif
-
# Add files to the build
DEPPATH = --dep-path .
diff --git a/wireless/bluetooth/Make.defs b/wireless/bluetooth/Make.defs
index 3618ecf..8ca7edf 100644
--- a/wireless/bluetooth/Make.defs
+++ b/wireless/bluetooth/Make.defs
@@ -43,6 +43,6 @@ CSRCS += bt_uuid.c
DEPPATH += --dep-path bluetooth
VPATH += :bluetooth
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)wireless$(DELIM)bluetooth}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)wireless$(DELIM)bluetooth}
endif # CONFIG_WIRELESS_BLUETOOTH
diff --git a/wireless/ieee802154/Make.defs b/wireless/ieee802154/Make.defs
index 7de9c47..e63ac1b 100644
--- a/wireless/ieee802154/Make.defs
+++ b/wireless/ieee802154/Make.defs
@@ -66,6 +66,6 @@ endif
DEPPATH += --dep-path ieee802154
VPATH += :ieee802154
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)wireless$(DELIM)ieee802154}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)wireless$(DELIM)ieee802154}
endif # CONFIG_WIRELESS_IEEE802154
diff --git a/wireless/pktradio/Make.defs b/wireless/pktradio/Make.defs
index c73e5f1..7edf8b9 100644
--- a/wireless/pktradio/Make.defs
+++ b/wireless/pktradio/Make.defs
@@ -45,6 +45,6 @@ endif
DEPPATH += --dep-path pktradio
VPATH += :pktradio
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)wireless$(DELIM)pktradio}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)wireless$(DELIM)pktradio}
endif # CONFIG_WIRELESS_PKTRADIO
[incubator-nuttx] 01/02: build: Replace WINTOOL with CYGWIN_WINTOOL
Kconfig
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit bd656888f26c92e8832f0e76b395a5ece7704530
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Mon May 18 22:18:15 2020 +0800
build: Replace WINTOOL with CYGWIN_WINTOOL Kconfig
so the correct value can be determinated by Kconfig system automatically
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
Kconfig | 8 +++++
TODO | 2 +-
arch/arm/src/Makefile | 4 +--
arch/arm/src/arm/Kconfig | 1 +
arch/arm/src/arm/Toolchain.defs | 19 +++-------
arch/arm/src/armv6-m/Kconfig | 2 +-
arch/arm/src/armv6-m/Toolchain.defs | 17 +++------
arch/arm/src/armv7-a/Kconfig | 3 +-
arch/arm/src/armv7-a/Toolchain.defs | 19 +++-------
arch/arm/src/armv7-m/Kconfig | 3 ++
arch/arm/src/armv7-m/Toolchain.defs | 41 +++++-----------------
arch/arm/src/armv7-r/Kconfig | 3 +-
arch/arm/src/armv7-r/Toolchain.defs | 19 +++-------
arch/arm/src/armv8-m/Kconfig | 2 ++
arch/arm/src/armv8-m/Toolchain.defs | 41 +++++-----------------
arch/avr/src/Makefile | 4 +--
arch/avr/src/avr/Kconfig | 2 ++
arch/avr/src/avr/Toolchain.defs | 15 +-------
arch/avr/src/avr32/Kconfig | 1 +
arch/avr/src/avr32/Toolchain.defs | 18 +---------
arch/hc/src/Makefile | 4 +--
arch/mips/src/Makefile | 4 +--
arch/mips/src/mips32/Kconfig | 4 +++
arch/mips/src/mips32/Toolchain.defs | 12 -------
arch/misoc/src/Makefile | 4 +--
arch/misoc/src/lm32/Kconfig | 1 +
arch/misoc/src/lm32/Toolchain.defs | 17 ++-------
arch/misoc/src/minerva/Kconfig | 1 +
arch/or1k/src/Makefile | 4 +--
arch/renesas/Kconfig | 4 +++
arch/renesas/src/Makefile | 6 ++--
arch/risc-v/src/Makefile | 4 +--
arch/risc-v/src/rv32im/Kconfig | 3 +-
arch/risc-v/src/rv32im/Toolchain.defs | 26 +++-----------
arch/risc-v/src/rv64gc/Kconfig | 3 +-
arch/risc-v/src/rv64gc/Toolchain.defs | 16 +++------
arch/x86/src/Makefile | 4 +--
arch/x86_64/src/Makefile | 4 +--
arch/xtensa/src/Makefile | 4 +--
arch/z16/Kconfig | 1 +
arch/z16/src/z16f/Toolchain.defs | 14 --------
arch/z80/Kconfig | 2 ++
arch/z80/src/ez80/Toolchain.defs | 13 -------
arch/z80/src/z180/Kconfig | 1 +
arch/z80/src/z180/Toolchain.defs | 24 -------------
arch/z80/src/z8/Toolchain.defs | 14 --------
arch/z80/src/z80/Kconfig | 1 +
arch/z80/src/z80/Toolchain.defs | 24 -------------
audio/Makefile | 2 +-
binfmt/Makefile | 2 +-
boards/Board.mk | 28 ++++-----------
boards/arm/a1x/pcduino-a10/scripts/Make.defs | 4 +--
.../arm/am335x/beaglebone-black/scripts/Make.defs | 2 +-
boards/arm/c5471/c5471evm/scripts/Make.defs | 2 +-
boards/arm/cxd56xx/spresense/scripts/Make.defs | 8 ++---
boards/arm/dm320/ntosd-dm320/scripts/Make.defs | 2 +-
boards/arm/efm32/efm32-g8xx-stk/scripts/Make.defs | 2 +-
boards/arm/efm32/efm32gg-stk3700/scripts/Make.defs | 2 +-
.../olimex-efm32g880f128-stk/scripts/Make.defs | 2 +-
boards/arm/imx6/sabre-6quad/scripts/Make.defs | 6 ++--
boards/arm/imxrt/imxrt1020-evk/scripts/Make.defs | 4 +--
.../arm/imxrt/imxrt1050-evk/configs/knsh/Make.defs | 4 +--
.../imxrt1050-evk/configs/libcxxtest/Make.defs | 4 +--
boards/arm/imxrt/imxrt1050-evk/kernel/Makefile | 2 +-
boards/arm/imxrt/imxrt1050-evk/scripts/Make.defs | 4 +--
.../arm/imxrt/imxrt1060-evk/configs/knsh/Make.defs | 4 +--
.../imxrt1060-evk/configs/libcxxtest/Make.defs | 4 +--
boards/arm/imxrt/imxrt1060-evk/kernel/Makefile | 2 +-
boards/arm/imxrt/imxrt1060-evk/scripts/Make.defs | 6 ++--
boards/arm/kinetis/freedom-k28f/scripts/Make.defs | 2 +-
boards/arm/kinetis/freedom-k64f/scripts/Make.defs | 2 +-
boards/arm/kinetis/freedom-k66f/scripts/Make.defs | 2 +-
boards/arm/kinetis/kwikstik-k40/scripts/Make.defs | 2 +-
boards/arm/kinetis/teensy-3.x/scripts/Make.defs | 2 +-
boards/arm/kinetis/twr-k60n512/scripts/Make.defs | 2 +-
boards/arm/kinetis/twr-k64f120m/scripts/Make.defs | 2 +-
boards/arm/kl/freedom-kl25z/scripts/Make.defs | 4 +--
boards/arm/kl/freedom-kl26z/scripts/Make.defs | 4 +--
boards/arm/kl/teensy-lc/scripts/Make.defs | 4 +--
boards/arm/lc823450/lc823450-xgevk/kernel/Makefile | 2 +-
.../arm/lc823450/lc823450-xgevk/scripts/Make.defs | 6 ++--
.../arm/lpc17xx_40xx/lincoln60/scripts/Make.defs | 2 +-
.../lpc4088-devkit/configs/knsh/Make.defs | 2 +-
.../lpc17xx_40xx/lpc4088-devkit/kernel/Makefile | 2 +-
.../lpc17xx_40xx/lpc4088-devkit/scripts/Make.defs | 2 +-
.../lpc4088-quickstart/configs/knsh/Make.defs | 2 +-
.../lpc4088-quickstart/kernel/Makefile | 2 +-
.../lpc4088-quickstart/scripts/Make.defs | 2 +-
.../lpcxpresso-lpc1768/configs/thttpd/Make.defs | 2 +-
.../lpcxpresso-lpc1768/scripts/Make.defs | 2 +-
boards/arm/lpc17xx_40xx/lx_cpu/scripts/Make.defs | 6 ++--
boards/arm/lpc17xx_40xx/mbed/scripts/Make.defs | 2 +-
boards/arm/lpc17xx_40xx/mcb1700/scripts/Make.defs | 2 +-
.../configs/thttpd-binfs/Make.defs | 2 +-
.../configs/thttpd-nxflat/Make.defs | 2 +-
.../olimex-lpc1766stk/scripts/Make.defs | 2 +-
.../lpc17xx_40xx/open1788/configs/knsh/Make.defs | 2 +-
.../open1788/configs/knxterm/Make.defs | 2 +-
boards/arm/lpc17xx_40xx/open1788/kernel/Makefile | 2 +-
boards/arm/lpc17xx_40xx/open1788/scripts/Make.defs | 2 +-
.../lpc17xx_40xx/pnev5180b/configs/knsh/Make.defs | 2 +-
boards/arm/lpc17xx_40xx/pnev5180b/kernel/Makefile | 2 +-
.../arm/lpc17xx_40xx/pnev5180b/scripts/Make.defs | 2 +-
.../arm/lpc17xx_40xx/u-blox-c027/scripts/Make.defs | 2 +-
.../lpc17xx_40xx/zkit-arm-1769/scripts/Make.defs | 2 +-
.../arm/lpc214x/mcu123-lpc214x/scripts/Make.defs | 2 +-
boards/arm/lpc214x/zp214xpa/scripts/Make.defs | 2 +-
.../arm/lpc2378/olimex-lpc2378/scripts/Make.defs | 2 +-
boards/arm/lpc31xx/ea3131/configs/pgnsh/Make.defs | 2 +-
boards/arm/lpc31xx/ea3131/locked/Makefile | 2 +-
boards/arm/lpc31xx/ea3131/scripts/Make.defs | 2 +-
boards/arm/lpc31xx/ea3152/scripts/Make.defs | 2 +-
.../arm/lpc31xx/olimex-lpc-h3131/scripts/Make.defs | 2 +-
.../lpc43xx/bambino-200e/configs/netnsh/Make.defs | 2 +-
boards/arm/lpc43xx/bambino-200e/kernel/Makefile | 2 +-
boards/arm/lpc43xx/bambino-200e/scripts/Make.defs | 2 +-
.../arm/lpc43xx/lpc4330-xplorer/scripts/Make.defs | 2 +-
boards/arm/lpc43xx/lpc4337-ws/scripts/Make.defs | 2 +-
boards/arm/lpc43xx/lpc4357-evb/scripts/Make.defs | 2 +-
boards/arm/lpc43xx/lpc4370-link2/scripts/Make.defs | 2 +-
.../lpc54xx/lpcxpresso-lpc54628/scripts/Make.defs | 2 +-
.../arm/max326xx/max32660-evsys/scripts/Make.defs | 4 +--
boards/arm/moxart/moxa/scripts/Make.defs | 2 +-
boards/arm/nrf52/nrf52-feather/scripts/Make.defs | 2 +-
boards/arm/nrf52/nrf52832-dk/scripts/Make.defs | 2 +-
boards/arm/nrf52/nrf52840-dk/scripts/Make.defs | 2 +-
boards/arm/nrf52/nrf52840-dongle/scripts/Make.defs | 2 +-
boards/arm/nuc1xx/nutiny-nuc120/scripts/Make.defs | 4 +--
.../s32k1xx/rddrone-uavcan144/scripts/Make.defs | 4 +--
.../s32k1xx/rddrone-uavcan146/scripts/Make.defs | 4 +--
boards/arm/s32k1xx/s32k118evb/scripts/Make.defs | 4 +--
boards/arm/s32k1xx/s32k144evb/scripts/Make.defs | 4 +--
boards/arm/s32k1xx/s32k146evb/scripts/Make.defs | 4 +--
boards/arm/s32k1xx/s32k148evb/scripts/Make.defs | 4 +--
boards/arm/sam34/arduino-due/scripts/Make.defs | 2 +-
.../arm/sam34/flipnclick-sam3x/scripts/Make.defs | 2 +-
boards/arm/sam34/sam3u-ek/configs/knsh/Make.defs | 2 +-
boards/arm/sam34/sam3u-ek/kernel/Makefile | 2 +-
boards/arm/sam34/sam3u-ek/scripts/Make.defs | 2 +-
boards/arm/sam34/sam4cmp-db/scripts/Make.defs | 2 +-
boards/arm/sam34/sam4e-ek/scripts/Make.defs | 2 +-
boards/arm/sam34/sam4l-xplained/scripts/Make.defs | 2 +-
.../arm/sam34/sam4s-xplained-pro/scripts/Make.defs | 2 +-
boards/arm/sam34/sam4s-xplained/scripts/Make.defs | 2 +-
boards/arm/sama5/sama5d2-xult/scripts/Make.defs | 6 ++--
.../arm/sama5/sama5d3-xplained/scripts/Make.defs | 6 ++--
boards/arm/sama5/sama5d3x-ek/scripts/Make.defs | 6 ++--
boards/arm/sama5/sama5d4-ek/configs/knsh/Make.defs | 6 ++--
boards/arm/sama5/sama5d4-ek/scripts/Make.defs | 6 ++--
boards/arm/samd2l2/arduino-m0/scripts/Make.defs | 4 +--
.../arm/samd2l2/samd20-xplained/scripts/Make.defs | 4 +--
.../arm/samd2l2/samd21-xplained/scripts/Make.defs | 4 +--
.../arm/samd2l2/saml21-xplained/scripts/Make.defs | 4 +--
boards/arm/samd5e5/metro-m4/scripts/Make.defs | 4 +--
.../samd5e5/same54-xplained-pro/scripts/Make.defs | 4 +--
boards/arm/samv7/same70-xplained/kernel/Makefile | 2 +-
boards/arm/samv7/same70-xplained/scripts/Make.defs | 4 +--
.../arm/samv7/samv71-xult/configs/knsh/Make.defs | 4 +--
boards/arm/samv7/samv71-xult/kernel/Makefile | 2 +-
boards/arm/samv7/samv71-xult/scripts/Make.defs | 4 +--
boards/arm/stm32/axoloti/scripts/Make.defs | 6 ++--
boards/arm/stm32/clicker2-stm32/kernel/Makefile | 2 +-
boards/arm/stm32/clicker2-stm32/scripts/Make.defs | 4 +--
boards/arm/stm32/cloudctrl/scripts/Make.defs | 2 +-
boards/arm/stm32/fire-stm32v2/scripts/Make.defs | 2 +-
boards/arm/stm32/hymini-stm32v/scripts/Make.defs | 2 +-
boards/arm/stm32/maple/scripts/Make.defs | 2 +-
boards/arm/stm32/mikroe-stm32f4/kernel/Makefile | 2 +-
boards/arm/stm32/mikroe-stm32f4/scripts/Make.defs | 2 +-
boards/arm/stm32/nucleo-f103rb/scripts/Make.defs | 2 +-
boards/arm/stm32/nucleo-f207zg/scripts/Make.defs | 2 +-
boards/arm/stm32/nucleo-f302r8/scripts/Make.defs | 2 +-
boards/arm/stm32/nucleo-f303re/scripts/Make.defs | 2 +-
boards/arm/stm32/nucleo-f303ze/scripts/Make.defs | 2 +-
boards/arm/stm32/nucleo-f334r8/scripts/Make.defs | 2 +-
boards/arm/stm32/nucleo-f410rb/scripts/Make.defs | 2 +-
boards/arm/stm32/nucleo-f429zi/scripts/Make.defs | 2 +-
boards/arm/stm32/nucleo-f446re/scripts/Make.defs | 2 +-
boards/arm/stm32/nucleo-f4x1re/scripts/Make.defs | 2 +-
boards/arm/stm32/nucleo-l152re/scripts/Make.defs | 2 +-
.../arm/stm32/olimex-stm32-e407/scripts/Make.defs | 2 +-
.../arm/stm32/olimex-stm32-h405/scripts/Make.defs | 2 +-
.../arm/stm32/olimex-stm32-h407/scripts/Make.defs | 2 +-
.../arm/stm32/olimex-stm32-p107/scripts/Make.defs | 2 +-
.../arm/stm32/olimex-stm32-p207/scripts/Make.defs | 2 +-
.../stm32/olimex-stm32-p407/configs/kelf/Make.defs | 6 ++--
.../olimex-stm32-p407/configs/kmodule/Make.defs | 6 ++--
.../stm32/olimex-stm32-p407/configs/knsh/Make.defs | 4 +--
boards/arm/stm32/olimex-stm32-p407/kernel/Makefile | 2 +-
.../arm/stm32/olimex-stm32-p407/scripts/Make.defs | 4 +--
boards/arm/stm32/olimexino-stm32/scripts/Make.defs | 2 +-
boards/arm/stm32/omnibusf4/kernel/Makefile | 2 +-
boards/arm/stm32/omnibusf4/scripts/Make.defs | 6 ++--
boards/arm/stm32/photon/scripts/Make.defs | 2 +-
boards/arm/stm32/shenzhou/scripts/Make.defs | 2 +-
boards/arm/stm32/stm3210e-eval/scripts/Make.defs | 2 +-
boards/arm/stm32/stm3220g-eval/scripts/Make.defs | 2 +-
.../stm32/stm3240g-eval/configs/knxwm/Make.defs | 2 +-
boards/arm/stm32/stm3240g-eval/kernel/Makefile | 2 +-
boards/arm/stm32/stm3240g-eval/scripts/Make.defs | 2 +-
boards/arm/stm32/stm32_tiny/scripts/Make.defs | 2 +-
boards/arm/stm32/stm32butterfly2/scripts/Make.defs | 2 +-
.../arm/stm32/stm32f103-minimum/scripts/Make.defs | 2 +-
boards/arm/stm32/stm32f334-disco/scripts/Make.defs | 2 +-
.../arm/stm32/stm32f3discovery/scripts/Make.defs | 2 +-
.../arm/stm32/stm32f411e-disco/scripts/Make.defs | 2 +-
.../arm/stm32/stm32f429i-disco/scripts/Make.defs | 2 +-
.../stm32f4discovery/configs/cxxtest/Make.defs | 2 +-
.../stm32/stm32f4discovery/configs/elf/Make.defs | 4 +--
.../stm32f4discovery/configs/posix_spawn/Make.defs | 4 +--
.../stm32f4discovery/configs/testlibcxx/Make.defs | 2 +-
boards/arm/stm32/stm32f4discovery/kernel/Makefile | 2 +-
.../arm/stm32/stm32f4discovery/scripts/Make.defs | 6 ++--
boards/arm/stm32/stm32ldiscovery/scripts/Make.defs | 2 +-
.../arm/stm32/stm32vldiscovery/scripts/Make.defs | 2 +-
.../arm/stm32/viewtool-stm32f107/scripts/Make.defs | 2 +-
.../stm32f0l0g0/b-l072z-lrwan1/scripts/Make.defs | 2 +-
.../stm32f0l0g0/nucleo-f072rb/scripts/Make.defs | 2 +-
.../stm32f0l0g0/nucleo-f091rc/scripts/Make.defs | 2 +-
.../stm32f0l0g0/nucleo-g070rb/scripts/Make.defs | 2 +-
.../stm32f0l0g0/nucleo-g071rb/scripts/Make.defs | 2 +-
.../stm32f0l0g0/nucleo-l073rz/scripts/Make.defs | 2 +-
.../stm32f051-discovery/scripts/Make.defs | 2 +-
.../stm32f072-discovery/scripts/Make.defs | 2 +-
.../stm32f7/nucleo-144/configs/f722-nsh/Make.defs | 2 +-
.../nucleo-144/configs/f746-evalos/Make.defs | 2 +-
.../stm32f7/nucleo-144/configs/f746-nsh/Make.defs | 2 +-
.../nucleo-144/configs/f767-evalos/Make.defs | 2 +-
.../nucleo-144/configs/f767-netnsh/Make.defs | 2 +-
.../stm32f7/nucleo-144/configs/f767-nsh/Make.defs | 2 +-
boards/arm/stm32f7/stm32f746-ws/scripts/Make.defs | 2 +-
.../arm/stm32f7/stm32f746g-disco/kernel/Makefile | 2 +-
.../arm/stm32f7/stm32f746g-disco/scripts/Make.defs | 4 +--
.../arm/stm32f7/stm32f769i-disco/kernel/Makefile | 2 +-
.../arm/stm32f7/stm32f769i-disco/scripts/Make.defs | 2 +-
boards/arm/stm32h7/nucleo-h743zi/kernel/Makefile | 2 +-
boards/arm/stm32h7/nucleo-h743zi/scripts/Make.defs | 2 +-
.../arm/stm32h7/stm32h747i-disco/kernel/Makefile | 2 +-
.../arm/stm32h7/stm32h747i-disco/scripts/Make.defs | 2 +-
.../arm/stm32l4/b-l475e-iot01a/scripts/Make.defs | 2 +-
boards/arm/stm32l4/nucleo-l432kc/scripts/Make.defs | 2 +-
boards/arm/stm32l4/nucleo-l452re/scripts/Make.defs | 2 +-
boards/arm/stm32l4/nucleo-l476rg/scripts/Make.defs | 2 +-
boards/arm/stm32l4/nucleo-l496zg/scripts/Make.defs | 2 +-
boards/arm/stm32l4/stm32l476-mdk/scripts/Make.defs | 2 +-
.../stm32l476vg-disco/configs/knsh/Make.defs | 2 +-
.../arm/stm32l4/stm32l476vg-disco/kernel/Makefile | 2 +-
.../stm32l4/stm32l476vg-disco/scripts/Make.defs | 2 +-
.../stm32l4r9ai-disco/configs/knsh/Make.defs | 2 +-
.../arm/stm32l4/stm32l4r9ai-disco/kernel/Makefile | 2 +-
.../stm32l4/stm32l4r9ai-disco/scripts/Make.defs | 2 +-
boards/arm/str71x/olimex-strp711/scripts/Make.defs | 2 +-
boards/arm/tiva/dk-tm4c129x/scripts/Make.defs | 2 +-
boards/arm/tiva/eagle100/scripts/Make.defs | 2 +-
boards/arm/tiva/ekk-lm3s9b96/scripts/Make.defs | 2 +-
boards/arm/tiva/launchxl-cc1310/scripts/Make.defs | 4 +--
.../arm/tiva/launchxl-cc1312r1/scripts/Make.defs | 4 +--
boards/arm/tiva/lm3s6432-s2e/scripts/Make.defs | 2 +-
boards/arm/tiva/lm3s6965-ek/kernel/Makefile | 2 +-
boards/arm/tiva/lm3s6965-ek/scripts/Make.defs | 6 ++--
boards/arm/tiva/lm3s8962-ek/scripts/Make.defs | 2 +-
.../arm/tiva/lm4f120-launchpad/scripts/Make.defs | 2 +-
.../arm/tiva/tm4c123g-launchpad/scripts/Make.defs | 2 +-
.../arm/tiva/tm4c1294-launchpad/scripts/Make.defs | 2 +-
.../arm/tms570/launchxl-tms57004/scripts/Make.defs | 6 ++--
.../tms570/tms570ls31x-usb-kit/scripts/Make.defs | 6 ++--
boards/arm/xmc4/xmc4500-relax/scripts/Make.defs | 4 +--
boards/arm/xmc4/xmc4700-relax/scripts/Make.defs | 4 +--
boards/avr/at32uc3/avr32dev1/scripts/Make.defs | 2 +-
boards/avr/at90usb/micropendous3/scripts/Make.defs | 2 +-
boards/avr/at90usb/teensy-2.0/scripts/Make.defs | 2 +-
boards/avr/atmega/amber/scripts/Make.defs | 2 +-
.../avr/atmega/arduino-mega2560/scripts/Make.defs | 2 +-
boards/avr/atmega/arduino-mega2560/src/Makefile | 2 +-
boards/avr/atmega/moteino-mega/scripts/Make.defs | 2 +-
boards/hc/m9s12/demo9s12ne64/scripts/Make.defs | 3 +-
boards/hc/m9s12/ne64badge/scripts/Make.defs | 3 +-
boards/mips/pic32mx/mirtoo/scripts/Make.defs | 2 +-
.../pic32mx/pic32mx-starterkit/scripts/Make.defs | 2 +-
boards/mips/pic32mx/pic32mx7mmb/scripts/Make.defs | 2 +-
boards/mips/pic32mx/sure-pic32mx/scripts/Make.defs | 2 +-
boards/mips/pic32mx/ubw32/scripts/Make.defs | 2 +-
.../pic32mz/flipnclick-pic32mz/scripts/Make.defs | 2 +-
.../pic32mz/pic32mz-starterkit/scripts/Make.defs | 2 +-
boards/misoc/lm32/misoc/scripts/Make.defs | 2 +-
boards/or1k/mor1kx/or1k/scripts/Make.defs | 4 +--
.../renesas/rx65n/rx65n-grrose/scripts/Make.defs | 5 ++-
.../renesas/rx65n/rx65n-rsk1mb/scripts/Make.defs | 5 ++-
.../renesas/rx65n/rx65n-rsk2mb/scripts/Make.defs | 5 ++-
boards/renesas/rx65n/rx65n/scripts/Make.defs | 5 ++-
boards/risc-v/fe310/hifive1-revb/scripts/Make.defs | 2 +-
boards/risc-v/gap8/gapuino/scripts/Make.defs | 2 +-
boards/risc-v/k210/maix-bit/kernel/Makefile | 2 +-
boards/risc-v/k210/maix-bit/scripts/Make.defs | 6 ++--
boards/risc-v/litex/arty_a7/scripts/Make.defs | 2 +-
.../nr5m100/nr5m100-nexys4/scripts/Make.defs | 2 +-
boards/sim/sim/sim/configs/cxxtest/Make.defs | 4 +--
boards/sim/sim/sim/scripts/Make.defs | 4 +--
boards/x86/qemu/qemu-i486/scripts/Make.defs | 2 +-
.../x86_64/intel64/qemu-intel64/scripts/Make.defs | 2 +-
boards/xtensa/esp32/esp32-core/scripts/Make.defs | 6 ++--
boards/z80/z180/p112/scripts/Make.defs | 2 +-
boards/z80/z80/z80sim/scripts/Make.defs | 4 +--
drivers/Makefile | 2 +-
graphics/Makefile | 2 +-
libs/libc/zoneinfo/Makefile | 2 +-
pass1/Makefile | 2 +-
tools/Makefile.export | 3 +-
tools/Makefile.unix | 2 +-
tools/Makefile.win | 4 +--
tools/mkexport.sh | 6 ++--
wireless/Makefile | 2 +-
312 files changed, 469 insertions(+), 713 deletions(-)
diff --git a/Kconfig b/Kconfig
index a9e4cb0..85ee240 100644
--- a/Kconfig
+++ b/Kconfig
@@ -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
diff --git a/TODO b/TODO
index 2b50886..beef032 100644
--- a/TODO
+++ b/TODO
@@ -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
diff --git a/arch/arm/src/Makefile b/arch/arm/src/Makefile
index ca4b467..b1c497d 100644
--- a/arch/arm/src/Makefile
+++ b/arch/arm/src/Makefile
@@ -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"}"
diff --git a/arch/arm/src/arm/Kconfig b/arch/arm/src/arm/Kconfig
index 62bee95..ee5bcc7 100644
--- a/arch/arm/src/arm/Kconfig
+++ b/arch/arm/src/arm/Kconfig
@@ -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-.
diff --git a/arch/arm/src/arm/Toolchain.defs b/arch/arm/src/arm/Toolchain.defs
index f1f829a..06fbde4 100644
--- a/arch/arm/src/arm/Toolchain.defs
+++ b/arch/arm/src/arm/Toolchain.defs
@@ -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
diff --git a/arch/arm/src/armv6-m/Kconfig b/arch/arm/src/armv6-m/Kconfig
index bd0cc7a..e7dcef9 100644
--- a/arch/arm/src/armv6-m/Kconfig
+++ b/arch/arm/src/armv6-m/Kconfig
@@ -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.
diff --git a/arch/arm/src/armv6-m/Toolchain.defs b/arch/arm/src/armv6-m/Toolchain.defs
index c153fd4..f3e8bf3 100644
--- a/arch/arm/src/armv6-m/Toolchain.defs
+++ b/arch/arm/src/armv6-m/Toolchain.defs
@@ -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
diff --git a/arch/arm/src/armv7-a/Kconfig b/arch/arm/src/armv7-a/Kconfig
index 7fbd2e3..318defd 100644
--- a/arch/arm/src/armv7-a/Kconfig
+++ b/arch/arm/src/armv7-a/Kconfig
@@ -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-.
diff --git a/arch/arm/src/armv7-a/Toolchain.defs b/arch/arm/src/armv7-a/Toolchain.defs
index 77f2910..eecf73d 100644
--- a/arch/arm/src/armv7-a/Toolchain.defs
+++ b/arch/arm/src/armv7-a/Toolchain.defs
@@ -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
diff --git a/arch/arm/src/armv7-m/Kconfig b/arch/arm/src/armv7-m/Kconfig
index 565edc1..fab715a 100644
--- a/arch/arm/src/armv7-m/Kconfig
+++ b/arch/arm/src/armv7-m/Kconfig
@@ -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)
diff --git a/arch/arm/src/armv7-m/Toolchain.defs b/arch/arm/src/armv7-m/Toolchain.defs
index 7255dda..a3cfdaa 100644
--- a/arch/arm/src/armv7-m/Toolchain.defs
+++ b/arch/arm/src/armv7-m/Toolchain.defs
@@ -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)
+ifeq ($(CONFIG_ARMV7M_TOOLCHAIN),CLANG)
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)
- 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
-
diff --git a/arch/arm/src/armv7-r/Kconfig b/arch/arm/src/armv7-r/Kconfig
index 96278c4..ec787e7 100644
--- a/arch/arm/src/armv7-r/Kconfig
+++ b/arch/arm/src/armv7-r/Kconfig
@@ -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-.
diff --git a/arch/arm/src/armv7-r/Toolchain.defs b/arch/arm/src/armv7-r/Toolchain.defs
index aeedf54..3c93ce5 100644
--- a/arch/arm/src/armv7-r/Toolchain.defs
+++ b/arch/arm/src/armv7-r/Toolchain.defs
@@ -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
diff --git a/arch/arm/src/armv8-m/Kconfig b/arch/arm/src/armv8-m/Kconfig
index 016d8d4..5339c75 100644
--- a/arch/arm/src/armv8-m/Kconfig
+++ b/arch/arm/src/armv8-m/Kconfig
@@ -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)
diff --git a/arch/arm/src/armv8-m/Toolchain.defs b/arch/arm/src/armv8-m/Toolchain.defs
index 7a355e1..e8ffcca 100644
--- a/arch/arm/src/armv8-m/Toolchain.defs
+++ b/arch/arm/src/armv8-m/Toolchain.defs
@@ -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)
+ifeq ($(CONFIG_ARMV8M_TOOLCHAIN),CLANG)
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)
- 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
-
diff --git a/arch/avr/src/Makefile b/arch/avr/src/Makefile
index 4f81ea9..cfe7ef1 100644
--- a/arch/avr/src/Makefile
+++ b/arch/avr/src/Makefile
@@ -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"}"
diff --git a/arch/avr/src/avr/Kconfig b/arch/avr/src/avr/Kconfig
index e044b77..fb84ec8 100644
--- a/arch/avr/src/avr/Kconfig
+++ b/arch/avr/src/avr/Kconfig
@@ -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
diff --git a/arch/avr/src/avr/Toolchain.defs b/arch/avr/src/avr/Toolchain.defs
index 65fabd2..07143f9 100644
--- a/arch/avr/src/avr/Toolchain.defs
+++ b/arch/avr/src/avr/Toolchain.defs
@@ -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
diff --git a/arch/avr/src/avr32/Kconfig b/arch/avr/src/avr32/Kconfig
index 05a056b..005f1b8 100644
--- a/arch/avr/src/avr32/Kconfig
+++ b/arch/avr/src/avr32/Kconfig
@@ -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"
diff --git a/arch/avr/src/avr32/Toolchain.defs b/arch/avr/src/avr32/Toolchain.defs
index 6a2b34d..30b6af7 100644
--- a/arch/avr/src/avr32/Toolchain.defs
+++ b/arch/avr/src/avr32/Toolchain.defs
@@ -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
diff --git a/arch/hc/src/Makefile b/arch/hc/src/Makefile
index 5257434..9881eb7 100644
--- a/arch/hc/src/Makefile
+++ b/arch/hc/src/Makefile
@@ -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"}"
diff --git a/arch/mips/src/Makefile b/arch/mips/src/Makefile
index 3725fd8..7b3063d 100644
--- a/arch/mips/src/Makefile
+++ b/arch/mips/src/Makefile
@@ -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"}"
diff --git a/arch/mips/src/mips32/Kconfig b/arch/mips/src/mips32/Kconfig
index f3f1b73..bde51e3 100644
--- a/arch/mips/src/mips32/Kconfig
+++ b/arch/mips/src/mips32/Kconfig
@@ -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
diff --git a/arch/mips/src/mips32/Toolchain.defs b/arch/mips/src/mips32/Toolchain.defs
index c76b0d8..51f682e 100644
--- a/arch/mips/src/mips32/Toolchain.defs
+++ b/arch/mips/src/mips32/Toolchain.defs
@@ -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
diff --git a/arch/misoc/src/Makefile b/arch/misoc/src/Makefile
index c40a007..3327d10 100644
--- a/arch/misoc/src/Makefile
+++ b/arch/misoc/src/Makefile
@@ -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"}"
diff --git a/arch/misoc/src/lm32/Kconfig b/arch/misoc/src/lm32/Kconfig
index fe021ee..83ce834 100644
--- a/arch/misoc/src/lm32/Kconfig
+++ b/arch/misoc/src/lm32/Kconfig
@@ -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)
diff --git a/arch/misoc/src/lm32/Toolchain.defs b/arch/misoc/src/lm32/Toolchain.defs
index 0796cf0..d0cc812 100644
--- a/arch/misoc/src/lm32/Toolchain.defs
+++ b/arch/misoc/src/lm32/Toolchain.defs
@@ -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
diff --git a/arch/misoc/src/minerva/Kconfig b/arch/misoc/src/minerva/Kconfig
index 91a93b5..3be1b36 100644
--- a/arch/misoc/src/minerva/Kconfig
+++ b/arch/misoc/src/minerva/Kconfig
@@ -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)
diff --git a/arch/or1k/src/Makefile b/arch/or1k/src/Makefile
index 808e194..4bf3c28 100644
--- a/arch/or1k/src/Makefile
+++ b/arch/or1k/src/Makefile
@@ -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"}"
diff --git a/arch/renesas/Kconfig b/arch/renesas/Kconfig
index 7b605d3..5c6e467 100644
--- a/arch/renesas/Kconfig
+++ b/arch/renesas/Kconfig
@@ -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
diff --git a/arch/renesas/src/Makefile b/arch/renesas/src/Makefile
index 041d98b..edb3afb 100644
--- a/arch/renesas/src/Makefile
+++ b/arch/renesas/src/Makefile
@@ -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"
diff --git a/arch/risc-v/src/Makefile b/arch/risc-v/src/Makefile
index 9ba5ec8..58c68b3 100644
--- a/arch/risc-v/src/Makefile
+++ b/arch/risc-v/src/Makefile
@@ -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"}"
diff --git a/arch/risc-v/src/rv32im/Kconfig b/arch/risc-v/src/rv32im/Kconfig
index 7d7b96a..fd5939b 100644
--- a/arch/risc-v/src/rv32im/Kconfig
+++ b/arch/risc-v/src/rv32im/Kconfig
@@ -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.
diff --git a/arch/risc-v/src/rv32im/Toolchain.defs b/arch/risc-v/src/rv32im/Toolchain.defs
index 669edb7..b1ba0e2 100644
--- a/arch/risc-v/src/rv32im/Toolchain.defs
+++ b/arch/risc-v/src/rv32im/Toolchain.defs
@@ -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-
diff --git a/arch/risc-v/src/rv64gc/Kconfig b/arch/risc-v/src/rv64gc/Kconfig
index 35dfecb..7781d2f 100644
--- a/arch/risc-v/src/rv64gc/Kconfig
+++ b/arch/risc-v/src/rv64gc/Kconfig
@@ -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.
diff --git a/arch/risc-v/src/rv64gc/Toolchain.defs b/arch/risc-v/src/rv64gc/Toolchain.defs
index 91698dc..ea947c3 100644
--- a/arch/risc-v/src/rv64gc/Toolchain.defs
+++ b/arch/risc-v/src/rv64gc/Toolchain.defs
@@ -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
diff --git a/arch/x86/src/Makefile b/arch/x86/src/Makefile
index 20f6817..d4d4aca 100644
--- a/arch/x86/src/Makefile
+++ b/arch/x86/src/Makefile
@@ -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"}"
diff --git a/arch/x86_64/src/Makefile b/arch/x86_64/src/Makefile
index 702d249..9b42b9e 100644
--- a/arch/x86_64/src/Makefile
+++ b/arch/x86_64/src/Makefile
@@ -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"}"
diff --git a/arch/xtensa/src/Makefile b/arch/xtensa/src/Makefile
index 6658c82..1de88f5 100644
--- a/arch/xtensa/src/Makefile
+++ b/arch/xtensa/src/Makefile
@@ -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"}"
diff --git a/arch/z16/Kconfig b/arch/z16/Kconfig
index 0b45711..28ed7ed 100644
--- a/arch/z16/Kconfig
+++ b/arch/z16/Kconfig
@@ -42,6 +42,7 @@ endchoice
config ARCH_CHIP_Z16F
bool
+ select CYGWIN_WINTOOL if WINDOWS_CYGWIN
config ARCH_CHIP
string
diff --git a/arch/z16/src/z16f/Toolchain.defs b/arch/z16/src/z16f/Toolchain.defs
index 6dedd02..3c8466a 100644
--- a/arch/z16/src/z16f/Toolchain.defs
+++ b/arch/z16/src/z16f/Toolchain.defs
@@ -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
diff --git a/arch/z80/Kconfig b/arch/z80/Kconfig
index 5c808ff..bb38d16 100644
--- a/arch/z80/Kconfig
+++ b/arch/z80/Kconfig
@@ -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---
diff --git a/arch/z80/src/ez80/Toolchain.defs b/arch/z80/src/ez80/Toolchain.defs
index 7687b93..fe2d30b 100644
--- a/arch/z80/src/ez80/Toolchain.defs
+++ b/arch/z80/src/ez80/Toolchain.defs
@@ -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:
diff --git a/arch/z80/src/z180/Kconfig b/arch/z80/src/z180/Kconfig
index eeb8c7f..f622c2e 100644
--- a/arch/z80/src/z180/Kconfig
+++ b/arch/z80/src/z180/Kconfig
@@ -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
diff --git a/arch/z80/src/z180/Toolchain.defs b/arch/z80/src/z180/Toolchain.defs
index ee5a57f..9d0d7b1 100644
--- a/arch/z80/src/z180/Toolchain.defs
+++ b/arch/z80/src/z180/Toolchain.defs
@@ -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
diff --git a/arch/z80/src/z8/Toolchain.defs b/arch/z80/src/z8/Toolchain.defs
index 21acba1..e21664a 100644
--- a/arch/z80/src/z8/Toolchain.defs
+++ b/arch/z80/src/z8/Toolchain.defs
@@ -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
diff --git a/arch/z80/src/z80/Kconfig b/arch/z80/src/z80/Kconfig
index ed609e7..f97656e 100644
--- a/arch/z80/src/z80/Kconfig
+++ b/arch/z80/src/z80/Kconfig
@@ -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
diff --git a/arch/z80/src/z80/Toolchain.defs b/arch/z80/src/z80/Toolchain.defs
index 005fd00..251c463 100644
--- a/arch/z80/src/z80/Toolchain.defs
+++ b/arch/z80/src/z80/Toolchain.defs
@@ -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
diff --git a/audio/Makefile b/audio/Makefile
index fef3f26..6814e15 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -36,7 +36,7 @@
-include $(TOPDIR)/Make.defs
DELIM ?= $(strip /)
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
INCDIROPT = -w
endif
diff --git a/binfmt/Makefile b/binfmt/Makefile
index e1354d8..2769465 100644
--- a/binfmt/Makefile
+++ b/binfmt/Makefile
@@ -37,7 +37,7 @@
-include $(TOPDIR)/Make.defs
DELIM ?= $(strip /)
-ifeq ($(WINTOOL),y)
+ifeq ($(WINTCONFIG_CYGWIN_WINTOOLOOL),y)
INCDIROPT = -w
endif
diff --git a/boards/Board.mk b/boards/Board.mk
index caa9b96..9ca2274 100644
--- a/boards/Board.mk
+++ b/boards/Board.mk
@@ -83,38 +83,24 @@ else
WARCHSRCDIR = ${shell cygpath -w $(ARCHSRCDIR)}
USRINCLUDES = -usrinc:'.;$(WSCHEDSRCDIR);$(WARCHSRCDIR)\chip;$(WARCHSRCDIR)\common'
endif
+ INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES)
+ CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
else
-ifeq ($(WINTOOL),y)
- CFLAGS += -I "${shell cygpath -w $(SCHEDSRCDIR)}"
- CFLAGS += -I "${shell cygpath -w $(ARCHSRCDIR)$(DELIM)chip}"
+ CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(SCHEDSRCDIR)"}
+ CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(ARCHSRCDIR)$(DELIM)chip"}
ifneq ($(CONFIG_ARCH_SIM),y)
- CFLAGS += -I "${shell cygpath -w $(ARCHSRCDIR)$(DELIM)common}"
+ CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(ARCHSRCDIR)$(DELIM)common"}
ifneq ($(ARCH_FAMILY),)
- CFLAGS += -I "${shell cygpath -w $(ARCHSRCDIR)$(DELIM)$(ARCH_FAMILY)}"
+ CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(ARCHSRCDIR)$(DELIM)$(ARCH_FAMILY)"}
endif
endif
-else
- CFLAGS += -I$(SCHEDSRCDIR)
- CFLAGS += -I$(ARCHSRCDIR)$(DELIM)chip
-ifneq ($(CONFIG_ARCH_SIM),y)
- CFLAGS += -I$(ARCHSRCDIR)$(DELIM)common
-ifneq ($(ARCH_FAMILY),)
- CFLAGS += -I$(ARCHSRCDIR)$(DELIM)$(ARCH_FAMILY)
-endif
-endif
-endif
-endif
-
-ifneq ($(ZDSVERSION),)
-INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES)
-CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
endif
all: libboard$(LIBEXT)
ifneq ($(ZDSVERSION),)
$(ASRCS) $(HEAD_ASRC): %$(ASMEXT): %.S
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
$(Q) $(CPP) $(CPPFLAGS) `cygpath -w $<` -o $@.tmp
else
$(Q) $(CPP) $(CPPFLAGS) $< -o $@.tmp
diff --git a/boards/arm/a1x/pcduino-a10/scripts/Make.defs b/boards/arm/a1x/pcduino-a10/scripts/Make.defs
index 618f984..3959836 100644
--- a/boards/arm/a1x/pcduino-a10/scripts/Make.defs
+++ b/boards/arm/a1x/pcduino-a10/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-a$(DELIM)Toolch
LDSCRIPT = sdram.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}"
ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}"
@@ -110,7 +110,7 @@ else
HOSTEXEEXT =
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native host tools
DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)copydir.sh
DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh
diff --git a/boards/arm/am335x/beaglebone-black/scripts/Make.defs b/boards/arm/am335x/beaglebone-black/scripts/Make.defs
index 1d87fe4..0c9a9d9 100644
--- a/boards/arm/am335x/beaglebone-black/scripts/Make.defs
+++ b/boards/arm/am335x/beaglebone-black/scripts/Make.defs
@@ -43,7 +43,7 @@ LDSCRIPT = sdram.ld
# Setup for Windows vs Linux/Cygwin/macOS environments
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/c5471/c5471evm/scripts/Make.defs b/boards/arm/c5471/c5471evm/scripts/Make.defs
index 84bd673..c65c32b 100644
--- a/boards/arm/c5471/c5471evm/scripts/Make.defs
+++ b/boards/arm/c5471/c5471evm/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/arm/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/cxd56xx/spresense/scripts/Make.defs b/boards/arm/cxd56xx/spresense/scripts/Make.defs
index 67b66bf..6bc8743 100644
--- a/boards/arm/cxd56xx/spresense/scripts/Make.defs
+++ b/boards/arm/cxd56xx/spresense/scripts/Make.defs
@@ -42,7 +42,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = ramconfig.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
@@ -105,7 +105,7 @@ LDNXFLATFLAGS = -e main -s 2048
CMODULEFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
LDMODULEFLAGS = -r -e module_initialize
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
else
LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
@@ -117,7 +117,7 @@ CELFFLAGS = $(CFLAGS)
CXXELFFLAGS = $(CXXFLAGS)
LDELFFLAGS = -r -e main
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}"
else
LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld
@@ -141,7 +141,7 @@ endif
# Output map file with cross reference table
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDFLAGS += -Map="${shell cygpath -w $(TOPDIR)/nuttx.map}" --cref
else
LDFLAGS += -Map=$(TOPDIR)/nuttx.map --cref
diff --git a/boards/arm/dm320/ntosd-dm320/scripts/Make.defs b/boards/arm/dm320/ntosd-dm320/scripts/Make.defs
index 2ee1f13..bee2eba 100644
--- a/boards/arm/dm320/ntosd-dm320/scripts/Make.defs
+++ b/boards/arm/dm320/ntosd-dm320/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/arm/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/efm32/efm32-g8xx-stk/scripts/Make.defs b/boards/arm/efm32/efm32-g8xx-stk/scripts/Make.defs
index 3d4e184..375a3c1 100644
--- a/boards/arm/efm32/efm32-g8xx-stk/scripts/Make.defs
+++ b/boards/arm/efm32/efm32-g8xx-stk/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/tools/Config.mk
LDSCRIPT = efm32-g8xx-stk.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/efm32/efm32gg-stk3700/scripts/Make.defs b/boards/arm/efm32/efm32gg-stk3700/scripts/Make.defs
index 6136a68..4b0a3c2 100644
--- a/boards/arm/efm32/efm32gg-stk3700/scripts/Make.defs
+++ b/boards/arm/efm32/efm32gg-stk3700/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/tools/Config.mk
LDSCRIPT = ld.script
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/efm32/olimex-efm32g880f128-stk/scripts/Make.defs b/boards/arm/efm32/olimex-efm32g880f128-stk/scripts/Make.defs
index aba2136..52a8167 100644
--- a/boards/arm/efm32/olimex-efm32g880f128-stk/scripts/Make.defs
+++ b/boards/arm/efm32/olimex-efm32g880f128-stk/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/tools/Config.mk
LDSCRIPT = ld.script
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/imx6/sabre-6quad/scripts/Make.defs b/boards/arm/imx6/sabre-6quad/scripts/Make.defs
index 09a43ab..f8d2236 100644
--- a/boards/arm/imx6/sabre-6quad/scripts/Make.defs
+++ b/boards/arm/imx6/sabre-6quad/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-a$(DELIM)Toolch
LDSCRIPT = dramboot.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}"
ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}"
@@ -97,7 +97,7 @@ CELFFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs
LDELFFLAGS = -r -e main
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}"
else
LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld
@@ -125,7 +125,7 @@ else
HOSTEXEEXT =
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native host tools
DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)copydir.sh
DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh
diff --git a/boards/arm/imxrt/imxrt1020-evk/scripts/Make.defs b/boards/arm/imxrt/imxrt1020-evk/scripts/Make.defs
index 24a1df4..612159e 100644
--- a/boards/arm/imxrt/imxrt1020-evk/scripts/Make.defs
+++ b/boards/arm/imxrt/imxrt1020-evk/scripts/Make.defs
@@ -43,7 +43,7 @@ else
LDSCRIPT = flash-ocram.ld
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
@@ -103,7 +103,7 @@ LDNXFLATFLAGS = -e main -s 2048
CMODULEFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
LDMODULEFLAGS = -r -e module_initialize
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
else
LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
diff --git a/boards/arm/imxrt/imxrt1050-evk/configs/knsh/Make.defs b/boards/arm/imxrt/imxrt1050-evk/configs/knsh/Make.defs
index a7a13ef..f2876ca 100644
--- a/boards/arm/imxrt/imxrt1050-evk/configs/knsh/Make.defs
+++ b/boards/arm/imxrt/imxrt1050-evk/configs/knsh/Make.defs
@@ -40,7 +40,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT1 = memory.ld
LDSCRIPT2 = kernel-space.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
@@ -102,7 +102,7 @@ LDNXFLATFLAGS = -e main -s 2048
CMODULEFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
LDMODULEFLAGS = -r -e module_initialize
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
else
LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
diff --git a/boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/Make.defs b/boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/Make.defs
index 06477cb..dc4516c 100644
--- a/boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/Make.defs
+++ b/boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/Make.defs
@@ -61,7 +61,7 @@ LIBSUPXX = ${shell $(CC) $(CXXFLAGS) --print-file-name=libsupc++.a}
EXTRA_LIBPATHS = -L "${shell dirname "$(LIBSUPXX)"}"
EXTRA_LIBS = -lsupc++
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
@@ -118,7 +118,7 @@ LDNXFLATFLAGS = -e main -s 2048
CMODULEFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
LDMODULEFLAGS = -r -e module_initialize
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
else
LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
diff --git a/boards/arm/imxrt/imxrt1050-evk/kernel/Makefile b/boards/arm/imxrt/imxrt1050-evk/kernel/Makefile
index e989a8e..46f71d8 100644
--- a/boards/arm/imxrt/imxrt1050-evk/kernel/Makefile
+++ b/boards/arm/imxrt/imxrt1050-evk/kernel/Makefile
@@ -47,7 +47,7 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done}
USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}"
diff --git a/boards/arm/imxrt/imxrt1050-evk/scripts/Make.defs b/boards/arm/imxrt/imxrt1050-evk/scripts/Make.defs
index 0999e24..d3b759d 100644
--- a/boards/arm/imxrt/imxrt1050-evk/scripts/Make.defs
+++ b/boards/arm/imxrt/imxrt1050-evk/scripts/Make.defs
@@ -43,7 +43,7 @@ else
LDSCRIPT = flash-ocram.ld
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
@@ -103,7 +103,7 @@ LDNXFLATFLAGS = -e main -s 2048
CMODULEFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
LDMODULEFLAGS = -r -e module_initialize
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
else
LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
diff --git a/boards/arm/imxrt/imxrt1060-evk/configs/knsh/Make.defs b/boards/arm/imxrt/imxrt1060-evk/configs/knsh/Make.defs
index dc96e55..33951b2 100644
--- a/boards/arm/imxrt/imxrt1060-evk/configs/knsh/Make.defs
+++ b/boards/arm/imxrt/imxrt1060-evk/configs/knsh/Make.defs
@@ -40,7 +40,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT1 = memory.ld
LDSCRIPT2 = kernel-space.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
@@ -102,7 +102,7 @@ LDNXFLATFLAGS = -e main -s 2048
CMODULEFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
LDMODULEFLAGS = -r -e module_initialize
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
else
LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
diff --git a/boards/arm/imxrt/imxrt1060-evk/configs/libcxxtest/Make.defs b/boards/arm/imxrt/imxrt1060-evk/configs/libcxxtest/Make.defs
index a74a4b0..1d80083 100644
--- a/boards/arm/imxrt/imxrt1060-evk/configs/libcxxtest/Make.defs
+++ b/boards/arm/imxrt/imxrt1060-evk/configs/libcxxtest/Make.defs
@@ -61,7 +61,7 @@ LIBSUPXX = ${shell $(CC) $(CXXFLAGS) --print-file-name=libsupc++.a}
EXTRA_LIBPATHS = -L "${shell dirname "$(LIBSUPXX)"}"
EXTRA_LIBS = -lsupc++
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
@@ -118,7 +118,7 @@ LDNXFLATFLAGS = -e main -s 2048
CMODULEFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
LDMODULEFLAGS = -r -e module_initialize
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
else
LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
diff --git a/boards/arm/imxrt/imxrt1060-evk/kernel/Makefile b/boards/arm/imxrt/imxrt1060-evk/kernel/Makefile
index 556da06..8efd0c5 100644
--- a/boards/arm/imxrt/imxrt1060-evk/kernel/Makefile
+++ b/boards/arm/imxrt/imxrt1060-evk/kernel/Makefile
@@ -47,7 +47,7 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done}
USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}"
diff --git a/boards/arm/imxrt/imxrt1060-evk/scripts/Make.defs b/boards/arm/imxrt/imxrt1060-evk/scripts/Make.defs
index 450e25e..30659cf 100644
--- a/boards/arm/imxrt/imxrt1060-evk/scripts/Make.defs
+++ b/boards/arm/imxrt/imxrt1060-evk/scripts/Make.defs
@@ -43,7 +43,7 @@ else ifeq ($(CONFIG_BOOT_RUNFROMISRAM),y)
LDSCRIPT = flash-ocram.ld
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
@@ -103,7 +103,7 @@ LDNXFLATFLAGS = -e main -s 2048
CMODULEFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
LDMODULEFLAGS = -r -e module_initialize
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
else
LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
@@ -116,7 +116,7 @@ EXEEXT =
ifneq ($(CROSSDEV),arm-nuttx-elf-)
LDFLAGS += -nostartfiles -nodefaultlibs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDFLAGS += -Map="${shell cygpath -w $(TOPDIR)/nuttx.map}"
else
LDFLAGS += -Map=$(TOPDIR)/nuttx.map
diff --git a/boards/arm/kinetis/freedom-k28f/scripts/Make.defs b/boards/arm/kinetis/freedom-k28f/scripts/Make.defs
index f8c91bd..6ebb5be 100644
--- a/boards/arm/kinetis/freedom-k28f/scripts/Make.defs
+++ b/boards/arm/kinetis/freedom-k28f/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = flash.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/kinetis/freedom-k64f/scripts/Make.defs b/boards/arm/kinetis/freedom-k64f/scripts/Make.defs
index 9674b9b..267f410 100644
--- a/boards/arm/kinetis/freedom-k64f/scripts/Make.defs
+++ b/boards/arm/kinetis/freedom-k64f/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/kinetis/freedom-k66f/scripts/Make.defs b/boards/arm/kinetis/freedom-k66f/scripts/Make.defs
index 3309455..66b7b4a 100644
--- a/boards/arm/kinetis/freedom-k66f/scripts/Make.defs
+++ b/boards/arm/kinetis/freedom-k66f/scripts/Make.defs
@@ -38,7 +38,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/kinetis/kwikstik-k40/scripts/Make.defs b/boards/arm/kinetis/kwikstik-k40/scripts/Make.defs
index f0e93ff..bc5d307 100644
--- a/boards/arm/kinetis/kwikstik-k40/scripts/Make.defs
+++ b/boards/arm/kinetis/kwikstik-k40/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/kinetis/teensy-3.x/scripts/Make.defs b/boards/arm/kinetis/teensy-3.x/scripts/Make.defs
index bf92e32..087b960 100644
--- a/boards/arm/kinetis/teensy-3.x/scripts/Make.defs
+++ b/boards/arm/kinetis/teensy-3.x/scripts/Make.defs
@@ -43,7 +43,7 @@ else ifeq ($(CONFIG_ARCH_CHIP_MK20DX128VLH5),y)
LDSCRIPT = mk20dx128vlh5.ld
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/kinetis/twr-k60n512/scripts/Make.defs b/boards/arm/kinetis/twr-k60n512/scripts/Make.defs
index f7cce84..aed7286 100644
--- a/boards/arm/kinetis/twr-k60n512/scripts/Make.defs
+++ b/boards/arm/kinetis/twr-k60n512/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/kinetis/twr-k64f120m/scripts/Make.defs b/boards/arm/kinetis/twr-k64f120m/scripts/Make.defs
index e07db52..5f99f8e 100644
--- a/boards/arm/kinetis/twr-k64f120m/scripts/Make.defs
+++ b/boards/arm/kinetis/twr-k64f120m/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/kl/freedom-kl25z/scripts/Make.defs b/boards/arm/kl/freedom-kl25z/scripts/Make.defs
index f56075c..b7b7465 100644
--- a/boards/arm/kl/freedom-kl25z/scripts/Make.defs
+++ b/boards/arm/kl/freedom-kl25z/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv6-m/Toolchain.defs
LDSCRIPT = freedom-kl25z.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
@@ -113,7 +113,7 @@ else
HOSTEXEEXT =
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native host tools
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/kl/freedom-kl26z/scripts/Make.defs b/boards/arm/kl/freedom-kl26z/scripts/Make.defs
index b96aed1..3ebdb5b 100644
--- a/boards/arm/kl/freedom-kl26z/scripts/Make.defs
+++ b/boards/arm/kl/freedom-kl26z/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv6-m/Toolchain.defs
LDSCRIPT = freedom-kl26z.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
@@ -113,7 +113,7 @@ else
HOSTEXEEXT =
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native host tools
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/kl/teensy-lc/scripts/Make.defs b/boards/arm/kl/teensy-lc/scripts/Make.defs
index 14d5243..6095104 100644
--- a/boards/arm/kl/teensy-lc/scripts/Make.defs
+++ b/boards/arm/kl/teensy-lc/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv6-m/Toolchain.defs
LDSCRIPT = teensy-lc.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
@@ -113,7 +113,7 @@ else
HOSTEXEEXT =
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native host tools
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/lc823450/lc823450-xgevk/kernel/Makefile b/boards/arm/lc823450/lc823450-xgevk/kernel/Makefile
index be599f1..4313380 100644
--- a/boards/arm/lc823450/lc823450-xgevk/kernel/Makefile
+++ b/boards/arm/lc823450/lc823450-xgevk/kernel/Makefile
@@ -49,7 +49,7 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done}
USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}"
diff --git a/boards/arm/lc823450/lc823450-xgevk/scripts/Make.defs b/boards/arm/lc823450/lc823450-xgevk/scripts/Make.defs
index 9ac1ff5..2b829f2 100644
--- a/boards/arm/lc823450/lc823450-xgevk/scripts/Make.defs
+++ b/boards/arm/lc823450/lc823450-xgevk/scripts/Make.defs
@@ -47,7 +47,7 @@ else
endif
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
@@ -110,7 +110,7 @@ CELFFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs
LDELFFLAGS = -r -e main
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}"
else
LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld
@@ -145,7 +145,7 @@ ARCH_LIBPATHS += -L"$(TOPDIR)/arch/arm/src/lc823450"
endif
ifeq ($(CONFIG_LC823450_SDIF),y)
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
ARCH_SYMBOLS = "${shell cygpath -w $(TOPDIR)/arch/arm/src/lc823450/lc823450_symbols.ld}"
else
ARCH_SYMBOLS = $(TOPDIR)/arch/arm/src/lc823450/lc823450_symbols.ld
diff --git a/boards/arm/lpc17xx_40xx/lincoln60/scripts/Make.defs b/boards/arm/lpc17xx_40xx/lincoln60/scripts/Make.defs
index 45a49ec..c80d218 100644
--- a/boards/arm/lpc17xx_40xx/lincoln60/scripts/Make.defs
+++ b/boards/arm/lpc17xx_40xx/lincoln60/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/knsh/Make.defs b/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/knsh/Make.defs
index d15b10f..8e4c91b 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/knsh/Make.defs
+++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/knsh/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)copydir.sh
DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/Makefile b/boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/Makefile
index 79e02d6..b1aba56 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/Makefile
+++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/Makefile
@@ -47,7 +47,7 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done}
USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}"
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/scripts/Make.defs b/boards/arm/lpc17xx_40xx/lpc4088-devkit/scripts/Make.defs
index 68b0ee2..b4d5fb4 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/scripts/Make.defs
+++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)copydir.sh
DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/knsh/Make.defs b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/knsh/Make.defs
index 6e01e52..13e198f 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/knsh/Make.defs
+++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/knsh/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)copydir.sh
DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/Makefile b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/Makefile
index b7f87f2..84d845c 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/Makefile
+++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/Makefile
@@ -47,7 +47,7 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done}
USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}"
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/scripts/Make.defs b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/scripts/Make.defs
index bec8833..344d3f0 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/scripts/Make.defs
+++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)copydir.sh
DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh
diff --git a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/thttpd/Make.defs b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/thttpd/Make.defs
index 7de1fdd..0984405 100644
--- a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/thttpd/Make.defs
+++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/thttpd/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/scripts/Make.defs b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/scripts/Make.defs
index 4c9d2ef..ad55c1d 100644
--- a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/scripts/Make.defs
+++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/lpc17xx_40xx/lx_cpu/scripts/Make.defs b/boards/arm/lpc17xx_40xx/lx_cpu/scripts/Make.defs
index 68a4af7..68c6b9b 100644
--- a/boards/arm/lpc17xx_40xx/lx_cpu/scripts/Make.defs
+++ b/boards/arm/lpc17xx_40xx/lx_cpu/scripts/Make.defs
@@ -49,7 +49,7 @@ ifeq ($(CONFIG_LX_CPU_BOOT_SDRAM),y)
LDSCRIPT = link-sdram.ld
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)copydir.sh
DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh
@@ -112,7 +112,7 @@ CELFFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs
LDELFFLAGS = -r -e main
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)gnu-elf.ld}"
else
LDELFFLAGS += -T $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)gnu-elf.ld
@@ -123,7 +123,7 @@ endif
CMODULEFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
LDMODULEFLAGS = -r -e module_initialize
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
else
LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
diff --git a/boards/arm/lpc17xx_40xx/mbed/scripts/Make.defs b/boards/arm/lpc17xx_40xx/mbed/scripts/Make.defs
index fd374db..1bf3eb1 100644
--- a/boards/arm/lpc17xx_40xx/mbed/scripts/Make.defs
+++ b/boards/arm/lpc17xx_40xx/mbed/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/lpc17xx_40xx/mcb1700/scripts/Make.defs b/boards/arm/lpc17xx_40xx/mcb1700/scripts/Make.defs
index 57dcb77..67b4ac4 100644
--- a/boards/arm/lpc17xx_40xx/mcb1700/scripts/Make.defs
+++ b/boards/arm/lpc17xx_40xx/mcb1700/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-binfs/Make.defs b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-binfs/Make.defs
index 36aad68..22780cd 100644
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-binfs/Make.defs
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-binfs/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-nxflat/Make.defs b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-nxflat/Make.defs
index 863c691..7f532d6 100644
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-nxflat/Make.defs
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-nxflat/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/scripts/Make.defs b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/scripts/Make.defs
index f3c0504..105a8d2 100644
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/scripts/Make.defs
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/lpc17xx_40xx/open1788/configs/knsh/Make.defs b/boards/arm/lpc17xx_40xx/open1788/configs/knsh/Make.defs
index d26fb2c..5afd468 100644
--- a/boards/arm/lpc17xx_40xx/open1788/configs/knsh/Make.defs
+++ b/boards/arm/lpc17xx_40xx/open1788/configs/knsh/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)copydir.sh
DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh
diff --git a/boards/arm/lpc17xx_40xx/open1788/configs/knxterm/Make.defs b/boards/arm/lpc17xx_40xx/open1788/configs/knxterm/Make.defs
index 27689b2..5614f26 100644
--- a/boards/arm/lpc17xx_40xx/open1788/configs/knxterm/Make.defs
+++ b/boards/arm/lpc17xx_40xx/open1788/configs/knxterm/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)copydir.sh
DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh
diff --git a/boards/arm/lpc17xx_40xx/open1788/kernel/Makefile b/boards/arm/lpc17xx_40xx/open1788/kernel/Makefile
index 85d6a84..1d64dc0 100644
--- a/boards/arm/lpc17xx_40xx/open1788/kernel/Makefile
+++ b/boards/arm/lpc17xx_40xx/open1788/kernel/Makefile
@@ -47,7 +47,7 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done}
USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}"
diff --git a/boards/arm/lpc17xx_40xx/open1788/scripts/Make.defs b/boards/arm/lpc17xx_40xx/open1788/scripts/Make.defs
index b386b52..df0ddab 100644
--- a/boards/arm/lpc17xx_40xx/open1788/scripts/Make.defs
+++ b/boards/arm/lpc17xx_40xx/open1788/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)copydir.sh
DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh
diff --git a/boards/arm/lpc17xx_40xx/pnev5180b/configs/knsh/Make.defs b/boards/arm/lpc17xx_40xx/pnev5180b/configs/knsh/Make.defs
index 8239951..4a5d29f 100644
--- a/boards/arm/lpc17xx_40xx/pnev5180b/configs/knsh/Make.defs
+++ b/boards/arm/lpc17xx_40xx/pnev5180b/configs/knsh/Make.defs
@@ -42,7 +42,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)copydir.sh
DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh
diff --git a/boards/arm/lpc17xx_40xx/pnev5180b/kernel/Makefile b/boards/arm/lpc17xx_40xx/pnev5180b/kernel/Makefile
index bf09529..992ed95 100644
--- a/boards/arm/lpc17xx_40xx/pnev5180b/kernel/Makefile
+++ b/boards/arm/lpc17xx_40xx/pnev5180b/kernel/Makefile
@@ -52,7 +52,7 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done}
USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}"
diff --git a/boards/arm/lpc17xx_40xx/pnev5180b/scripts/Make.defs b/boards/arm/lpc17xx_40xx/pnev5180b/scripts/Make.defs
index a8d9731..6c89fa4 100644
--- a/boards/arm/lpc17xx_40xx/pnev5180b/scripts/Make.defs
+++ b/boards/arm/lpc17xx_40xx/pnev5180b/scripts/Make.defs
@@ -43,7 +43,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)copydir.sh
DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh
diff --git a/boards/arm/lpc17xx_40xx/u-blox-c027/scripts/Make.defs b/boards/arm/lpc17xx_40xx/u-blox-c027/scripts/Make.defs
index ee762c6..4ffeb59 100644
--- a/boards/arm/lpc17xx_40xx/u-blox-c027/scripts/Make.defs
+++ b/boards/arm/lpc17xx_40xx/u-blox-c027/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/lpc17xx_40xx/zkit-arm-1769/scripts/Make.defs b/boards/arm/lpc17xx_40xx/zkit-arm-1769/scripts/Make.defs
index 9f13ab1..04b5db8 100644
--- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/scripts/Make.defs
+++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/scripts/Make.defs
@@ -43,7 +43,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/lpc214x/mcu123-lpc214x/scripts/Make.defs b/boards/arm/lpc214x/mcu123-lpc214x/scripts/Make.defs
index a877512..442c92d 100644
--- a/boards/arm/lpc214x/mcu123-lpc214x/scripts/Make.defs
+++ b/boards/arm/lpc214x/mcu123-lpc214x/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/arm/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/lpc214x/zp214xpa/scripts/Make.defs b/boards/arm/lpc214x/zp214xpa/scripts/Make.defs
index 601502a..5455ac2 100644
--- a/boards/arm/lpc214x/zp214xpa/scripts/Make.defs
+++ b/boards/arm/lpc214x/zp214xpa/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/arm/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/lpc2378/olimex-lpc2378/scripts/Make.defs b/boards/arm/lpc2378/olimex-lpc2378/scripts/Make.defs
index 9058a5a..7ee605e 100644
--- a/boards/arm/lpc2378/olimex-lpc2378/scripts/Make.defs
+++ b/boards/arm/lpc2378/olimex-lpc2378/scripts/Make.defs
@@ -42,7 +42,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/arm/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/lpc31xx/ea3131/configs/pgnsh/Make.defs b/boards/arm/lpc31xx/ea3131/configs/pgnsh/Make.defs
index 113a840..00eb1d5 100644
--- a/boards/arm/lpc31xx/ea3131/configs/pgnsh/Make.defs
+++ b/boards/arm/lpc31xx/ea3131/configs/pgnsh/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/arm/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/lpc31xx/ea3131/locked/Makefile b/boards/arm/lpc31xx/ea3131/locked/Makefile
index 44045a1..3b6b47e 100644
--- a/boards/arm/lpc31xx/ea3131/locked/Makefile
+++ b/boards/arm/lpc31xx/ea3131/locked/Makefile
@@ -50,7 +50,7 @@ PASS1_LINKLIBS += $(PASS1_LIBBOARD)
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
PASS1_LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)$(DELIM)staging"}"
PASS1_LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)$(DELIM)boards$(DELIM)arm$(DELIM)lpc31xx$(DELIM)ea3131$(DELIM)src"}"
diff --git a/boards/arm/lpc31xx/ea3131/scripts/Make.defs b/boards/arm/lpc31xx/ea3131/scripts/Make.defs
index c16bab6..b10b45e 100644
--- a/boards/arm/lpc31xx/ea3131/scripts/Make.defs
+++ b/boards/arm/lpc31xx/ea3131/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/arm/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/lpc31xx/ea3152/scripts/Make.defs b/boards/arm/lpc31xx/ea3152/scripts/Make.defs
index baac89e..09a70b2 100644
--- a/boards/arm/lpc31xx/ea3152/scripts/Make.defs
+++ b/boards/arm/lpc31xx/ea3152/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/arm/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/lpc31xx/olimex-lpc-h3131/scripts/Make.defs b/boards/arm/lpc31xx/olimex-lpc-h3131/scripts/Make.defs
index cc18dbf..5e221e7 100644
--- a/boards/arm/lpc31xx/olimex-lpc-h3131/scripts/Make.defs
+++ b/boards/arm/lpc31xx/olimex-lpc-h3131/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/arm/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/lpc43xx/bambino-200e/configs/netnsh/Make.defs b/boards/arm/lpc43xx/bambino-200e/configs/netnsh/Make.defs
index 41648ba..4d1f21f 100644
--- a/boards/arm/lpc43xx/bambino-200e/configs/netnsh/Make.defs
+++ b/boards/arm/lpc43xx/bambino-200e/configs/netnsh/Make.defs
@@ -59,7 +59,7 @@ endif
# Setup for Windows vs Linux/Cygwin/macOS environments
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/lpc43xx/bambino-200e/kernel/Makefile b/boards/arm/lpc43xx/bambino-200e/kernel/Makefile
index 928f460..56f1b2a 100644
--- a/boards/arm/lpc43xx/bambino-200e/kernel/Makefile
+++ b/boards/arm/lpc43xx/bambino-200e/kernel/Makefile
@@ -47,7 +47,7 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done}
USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}"
diff --git a/boards/arm/lpc43xx/bambino-200e/scripts/Make.defs b/boards/arm/lpc43xx/bambino-200e/scripts/Make.defs
index c926ae2..8cb7bc4 100644
--- a/boards/arm/lpc43xx/bambino-200e/scripts/Make.defs
+++ b/boards/arm/lpc43xx/bambino-200e/scripts/Make.defs
@@ -58,7 +58,7 @@ endif
# Setup for Windows vs Linux/Cygwin/macOS environments
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/lpc43xx/lpc4330-xplorer/scripts/Make.defs b/boards/arm/lpc43xx/lpc4330-xplorer/scripts/Make.defs
index de742f8..f154dcb 100644
--- a/boards/arm/lpc43xx/lpc4330-xplorer/scripts/Make.defs
+++ b/boards/arm/lpc43xx/lpc4330-xplorer/scripts/Make.defs
@@ -57,7 +57,7 @@ endif
# Setup for Windows vs Linux/Cygwin/macOS environments
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/lpc43xx/lpc4337-ws/scripts/Make.defs b/boards/arm/lpc43xx/lpc4337-ws/scripts/Make.defs
index 1fcded4..e743fb6 100644
--- a/boards/arm/lpc43xx/lpc4337-ws/scripts/Make.defs
+++ b/boards/arm/lpc43xx/lpc4337-ws/scripts/Make.defs
@@ -57,7 +57,7 @@ endif
# Setup for Windows vs Linux/Cygwin/macOS environments
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/lpc43xx/lpc4357-evb/scripts/Make.defs b/boards/arm/lpc43xx/lpc4357-evb/scripts/Make.defs
index 38d5bbd..c05f208 100644
--- a/boards/arm/lpc43xx/lpc4357-evb/scripts/Make.defs
+++ b/boards/arm/lpc43xx/lpc4357-evb/scripts/Make.defs
@@ -57,7 +57,7 @@ endif
# Setup for Windows vs Linux/Cygwin/macOS environments
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/lpc43xx/lpc4370-link2/scripts/Make.defs b/boards/arm/lpc43xx/lpc4370-link2/scripts/Make.defs
index a761283..5fe7699 100644
--- a/boards/arm/lpc43xx/lpc4370-link2/scripts/Make.defs
+++ b/boards/arm/lpc43xx/lpc4370-link2/scripts/Make.defs
@@ -57,7 +57,7 @@ endif
# Setup for Windows vs Linux/Cygwin/macOS environments
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/scripts/Make.defs b/boards/arm/lpc54xx/lpcxpresso-lpc54628/scripts/Make.defs
index 470fbe9..9f7b484 100644
--- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/scripts/Make.defs
+++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/scripts/Make.defs
@@ -43,7 +43,7 @@ LDSCRIPT = flash.ld
# Setup for Windows vs Linux/Cygwin/macOS environments
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/max326xx/max32660-evsys/scripts/Make.defs b/boards/arm/max326xx/max32660-evsys/scripts/Make.defs
index a6b60f9..46bdd13 100644
--- a/boards/arm/max326xx/max32660-evsys/scripts/Make.defs
+++ b/boards/arm/max326xx/max32660-evsys/scripts/Make.defs
@@ -43,7 +43,7 @@ else
LDSCRIPT = sram.ld
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
@@ -103,7 +103,7 @@ LDNXFLATFLAGS = -e main -s 2048
CMODULEFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
LDMODULEFLAGS = -r -e module_initialize
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
else
LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
diff --git a/boards/arm/moxart/moxa/scripts/Make.defs b/boards/arm/moxart/moxa/scripts/Make.defs
index 0a3abb3..3c2d510 100644
--- a/boards/arm/moxart/moxa/scripts/Make.defs
+++ b/boards/arm/moxart/moxa/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/nrf52/nrf52-feather/scripts/Make.defs b/boards/arm/nrf52/nrf52-feather/scripts/Make.defs
index dc9f4f7..b3f0a50 100644
--- a/boards/arm/nrf52/nrf52-feather/scripts/Make.defs
+++ b/boards/arm/nrf52/nrf52-feather/scripts/Make.defs
@@ -41,7 +41,7 @@ LDSCRIPT = flash_config.ld
# Setup for Windows vs Linux/Cygwin/macOS environments
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/nrf52/nrf52832-dk/scripts/Make.defs b/boards/arm/nrf52/nrf52832-dk/scripts/Make.defs
index e93e23f..ad882fb 100644
--- a/boards/arm/nrf52/nrf52832-dk/scripts/Make.defs
+++ b/boards/arm/nrf52/nrf52832-dk/scripts/Make.defs
@@ -41,7 +41,7 @@ LDSCRIPT = flash_config.ld
# Setup for Windows vs Linux/Cygwin/macOS environments
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/nrf52/nrf52840-dk/scripts/Make.defs b/boards/arm/nrf52/nrf52840-dk/scripts/Make.defs
index 991a6a1..62b9e51 100644
--- a/boards/arm/nrf52/nrf52840-dk/scripts/Make.defs
+++ b/boards/arm/nrf52/nrf52840-dk/scripts/Make.defs
@@ -41,7 +41,7 @@ LDSCRIPT = flash_config.ld
# Setup for Windows vs Linux/Cygwin/macOS environments
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/nrf52/nrf52840-dongle/scripts/Make.defs b/boards/arm/nrf52/nrf52840-dongle/scripts/Make.defs
index 5a5b1ab..708d475 100644
--- a/boards/arm/nrf52/nrf52840-dongle/scripts/Make.defs
+++ b/boards/arm/nrf52/nrf52840-dongle/scripts/Make.defs
@@ -41,7 +41,7 @@ LDSCRIPT = flash_config.ld
# Setup for Windows vs Linux/Cygwin/macOS environments
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/nuc1xx/nutiny-nuc120/scripts/Make.defs b/boards/arm/nuc1xx/nutiny-nuc120/scripts/Make.defs
index cfd334a..49803b5 100644
--- a/boards/arm/nuc1xx/nutiny-nuc120/scripts/Make.defs
+++ b/boards/arm/nuc1xx/nutiny-nuc120/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv6-m/Toolchain.defs
LDSCRIPT = nutiny-nuc120.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
@@ -113,7 +113,7 @@ else
HOSTEXEEXT =
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native host tools
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/s32k1xx/rddrone-uavcan144/scripts/Make.defs b/boards/arm/s32k1xx/rddrone-uavcan144/scripts/Make.defs
index 45ac9c0..c4f1f85 100644
--- a/boards/arm/s32k1xx/rddrone-uavcan144/scripts/Make.defs
+++ b/boards/arm/s32k1xx/rddrone-uavcan144/scripts/Make.defs
@@ -44,7 +44,7 @@ else ifeq ($(CONFIG_BOOT_RUNFROMISRAM),y)
endif
$(warning, LDSCRIPT is $(LDSCRIPT))
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
@@ -120,7 +120,7 @@ else
HOSTEXEEXT =
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native host tools
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/s32k1xx/rddrone-uavcan146/scripts/Make.defs b/boards/arm/s32k1xx/rddrone-uavcan146/scripts/Make.defs
index b9b2104..844dc49 100644
--- a/boards/arm/s32k1xx/rddrone-uavcan146/scripts/Make.defs
+++ b/boards/arm/s32k1xx/rddrone-uavcan146/scripts/Make.defs
@@ -44,7 +44,7 @@ else ifeq ($(CONFIG_BOOT_RUNFROMISRAM),y)
endif
$(warning, LDSCRIPT is $(LDSCRIPT))
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
@@ -120,7 +120,7 @@ else
HOSTEXEEXT =
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native host tools
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/s32k1xx/s32k118evb/scripts/Make.defs b/boards/arm/s32k1xx/s32k118evb/scripts/Make.defs
index 02af4a6..47a046b 100644
--- a/boards/arm/s32k1xx/s32k118evb/scripts/Make.defs
+++ b/boards/arm/s32k1xx/s32k118evb/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv6-m/Toolchain.defs
LDSCRIPT = flash.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
@@ -113,7 +113,7 @@ else
HOSTEXEEXT =
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native host tools
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/s32k1xx/s32k144evb/scripts/Make.defs b/boards/arm/s32k1xx/s32k144evb/scripts/Make.defs
index b56ce66..80f4ee2 100644
--- a/boards/arm/s32k1xx/s32k144evb/scripts/Make.defs
+++ b/boards/arm/s32k1xx/s32k144evb/scripts/Make.defs
@@ -44,7 +44,7 @@ else ifeq ($(CONFIG_BOOT_RUNFROMISRAM),y)
endif
$(warning, LDSCRIPT is $(LDSCRIPT))
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
@@ -120,7 +120,7 @@ else
HOSTEXEEXT =
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native host tools
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/s32k1xx/s32k146evb/scripts/Make.defs b/boards/arm/s32k1xx/s32k146evb/scripts/Make.defs
index b7d0a5d..811cea4 100644
--- a/boards/arm/s32k1xx/s32k146evb/scripts/Make.defs
+++ b/boards/arm/s32k1xx/s32k146evb/scripts/Make.defs
@@ -44,7 +44,7 @@ else ifeq ($(CONFIG_BOOT_RUNFROMISRAM),y)
endif
$(warning, LDSCRIPT is $(LDSCRIPT))
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
@@ -120,7 +120,7 @@ else
HOSTEXEEXT =
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native host tools
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/s32k1xx/s32k148evb/scripts/Make.defs b/boards/arm/s32k1xx/s32k148evb/scripts/Make.defs
index b2ac122..399d6f0 100644
--- a/boards/arm/s32k1xx/s32k148evb/scripts/Make.defs
+++ b/boards/arm/s32k1xx/s32k148evb/scripts/Make.defs
@@ -44,7 +44,7 @@ else ifeq ($(CONFIG_BOOT_RUNFROMISRAM),y)
endif
$(warning, LDSCRIPT is $(LDSCRIPT))
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
@@ -120,7 +120,7 @@ else
HOSTEXEEXT =
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native host tools
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/sam34/arduino-due/scripts/Make.defs b/boards/arm/sam34/arduino-due/scripts/Make.defs
index 4809141..f358504 100644
--- a/boards/arm/sam34/arduino-due/scripts/Make.defs
+++ b/boards/arm/sam34/arduino-due/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/sam34/flipnclick-sam3x/scripts/Make.defs b/boards/arm/sam34/flipnclick-sam3x/scripts/Make.defs
index a5e92a5..cb77077 100644
--- a/boards/arm/sam34/flipnclick-sam3x/scripts/Make.defs
+++ b/boards/arm/sam34/flipnclick-sam3x/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/sam34/sam3u-ek/configs/knsh/Make.defs b/boards/arm/sam34/sam3u-ek/configs/knsh/Make.defs
index 532fd15..daef1f5 100644
--- a/boards/arm/sam34/sam3u-ek/configs/knsh/Make.defs
+++ b/boards/arm/sam34/sam3u-ek/configs/knsh/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)copydir.sh
DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh
diff --git a/boards/arm/sam34/sam3u-ek/kernel/Makefile b/boards/arm/sam34/sam3u-ek/kernel/Makefile
index d4571cf..a5e0b3d 100644
--- a/boards/arm/sam34/sam3u-ek/kernel/Makefile
+++ b/boards/arm/sam34/sam3u-ek/kernel/Makefile
@@ -47,7 +47,7 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done}
USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}"
diff --git a/boards/arm/sam34/sam3u-ek/scripts/Make.defs b/boards/arm/sam34/sam3u-ek/scripts/Make.defs
index c882727..459e2ff 100644
--- a/boards/arm/sam34/sam3u-ek/scripts/Make.defs
+++ b/boards/arm/sam34/sam3u-ek/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/sam34/sam4cmp-db/scripts/Make.defs b/boards/arm/sam34/sam4cmp-db/scripts/Make.defs
index 31fe03c..357f49f 100644
--- a/boards/arm/sam34/sam4cmp-db/scripts/Make.defs
+++ b/boards/arm/sam34/sam4cmp-db/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/sam34/sam4e-ek/scripts/Make.defs b/boards/arm/sam34/sam4e-ek/scripts/Make.defs
index 0f59f70..49bf308 100644
--- a/boards/arm/sam34/sam4e-ek/scripts/Make.defs
+++ b/boards/arm/sam34/sam4e-ek/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/sam34/sam4l-xplained/scripts/Make.defs b/boards/arm/sam34/sam4l-xplained/scripts/Make.defs
index 7b6d295..baebdbb 100644
--- a/boards/arm/sam34/sam4l-xplained/scripts/Make.defs
+++ b/boards/arm/sam34/sam4l-xplained/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/sam34/sam4s-xplained-pro/scripts/Make.defs b/boards/arm/sam34/sam4s-xplained-pro/scripts/Make.defs
index df65ae8..62e1e87 100644
--- a/boards/arm/sam34/sam4s-xplained-pro/scripts/Make.defs
+++ b/boards/arm/sam34/sam4s-xplained-pro/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/sam34/sam4s-xplained/scripts/Make.defs b/boards/arm/sam34/sam4s-xplained/scripts/Make.defs
index fc2157a..b92fafe 100644
--- a/boards/arm/sam34/sam4s-xplained/scripts/Make.defs
+++ b/boards/arm/sam34/sam4s-xplained/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/sama5/sama5d2-xult/scripts/Make.defs b/boards/arm/sama5/sama5d2-xult/scripts/Make.defs
index c3e55de0..e6ed4b6 100644
--- a/boards/arm/sama5/sama5d2-xult/scripts/Make.defs
+++ b/boards/arm/sama5/sama5d2-xult/scripts/Make.defs
@@ -49,7 +49,7 @@ else
endif
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}"
ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}"
@@ -106,7 +106,7 @@ CELFFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs
LDELFFLAGS = -r -e main
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}"
else
LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld
@@ -134,7 +134,7 @@ else
HOSTEXEEXT =
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native host tools
DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)copydir.sh
DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh
diff --git a/boards/arm/sama5/sama5d3-xplained/scripts/Make.defs b/boards/arm/sama5/sama5d3-xplained/scripts/Make.defs
index a87a436..cd1f47d 100644
--- a/boards/arm/sama5/sama5d3-xplained/scripts/Make.defs
+++ b/boards/arm/sama5/sama5d3-xplained/scripts/Make.defs
@@ -45,7 +45,7 @@ ifeq ($(CONFIG_SAMA5_BOOT_SDRAM),y)
LDSCRIPT = ddram.ld
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}"
ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}"
@@ -102,7 +102,7 @@ CELFFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs
LDELFFLAGS = -r -e main
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}"
else
LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld
@@ -130,7 +130,7 @@ else
HOSTEXEEXT =
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native host tools
DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)copydir.sh
DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh
diff --git a/boards/arm/sama5/sama5d3x-ek/scripts/Make.defs b/boards/arm/sama5/sama5d3x-ek/scripts/Make.defs
index b5a6f8a..d27dbb1 100644
--- a/boards/arm/sama5/sama5d3x-ek/scripts/Make.defs
+++ b/boards/arm/sama5/sama5d3x-ek/scripts/Make.defs
@@ -65,7 +65,7 @@ ifeq ($(CONFIG_SAMA5_BOOT_CS3FLASH),y)
# LDSCRIPT = cs3flash.ld
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}"
ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}"
@@ -122,7 +122,7 @@ CELFFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs
LDELFFLAGS = -r -e main
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}"
else
LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld
@@ -150,7 +150,7 @@ else
HOSTEXEEXT =
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native host tools
DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)copydir.sh
DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh
diff --git a/boards/arm/sama5/sama5d4-ek/configs/knsh/Make.defs b/boards/arm/sama5/sama5d4-ek/configs/knsh/Make.defs
index e7cb484..7721ead 100644
--- a/boards/arm/sama5/sama5d4-ek/configs/knsh/Make.defs
+++ b/boards/arm/sama5/sama5d4-ek/configs/knsh/Make.defs
@@ -49,7 +49,7 @@ else
endif
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}"
ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}"
@@ -109,7 +109,7 @@ CELFFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs
LDELFFLAGS = -r -e main
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}"
else
LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld
@@ -137,7 +137,7 @@ else
HOSTEXEEXT =
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native host tools
DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)copydir.sh
DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh
diff --git a/boards/arm/sama5/sama5d4-ek/scripts/Make.defs b/boards/arm/sama5/sama5d4-ek/scripts/Make.defs
index 79ed42b..7aec9fe 100644
--- a/boards/arm/sama5/sama5d4-ek/scripts/Make.defs
+++ b/boards/arm/sama5/sama5d4-ek/scripts/Make.defs
@@ -49,7 +49,7 @@ else
endif
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}"
ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}"
@@ -106,7 +106,7 @@ CELFFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs
LDELFFLAGS = -r -e main
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}"
else
LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld
@@ -134,7 +134,7 @@ else
HOSTEXEEXT =
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native host tools
DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)copydir.sh
DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh
diff --git a/boards/arm/samd2l2/arduino-m0/scripts/Make.defs b/boards/arm/samd2l2/arduino-m0/scripts/Make.defs
index cd84429..a7b16ab 100644
--- a/boards/arm/samd2l2/arduino-m0/scripts/Make.defs
+++ b/boards/arm/samd2l2/arduino-m0/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv6-m/Toolchain.defs
LDSCRIPT = flash.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
@@ -113,7 +113,7 @@ else
HOSTEXEEXT =
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native host tools
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/samd2l2/samd20-xplained/scripts/Make.defs b/boards/arm/samd2l2/samd20-xplained/scripts/Make.defs
index ae198a7..4d1cfd3 100644
--- a/boards/arm/samd2l2/samd20-xplained/scripts/Make.defs
+++ b/boards/arm/samd2l2/samd20-xplained/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv6-m/Toolchain.defs
LDSCRIPT = flash.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
@@ -113,7 +113,7 @@ else
HOSTEXEEXT =
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native host tools
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/samd2l2/samd21-xplained/scripts/Make.defs b/boards/arm/samd2l2/samd21-xplained/scripts/Make.defs
index af24fb2..af0aaa6 100644
--- a/boards/arm/samd2l2/samd21-xplained/scripts/Make.defs
+++ b/boards/arm/samd2l2/samd21-xplained/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv6-m/Toolchain.defs
LDSCRIPT = flash.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
@@ -113,7 +113,7 @@ else
HOSTEXEEXT =
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native host tools
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/samd2l2/saml21-xplained/scripts/Make.defs b/boards/arm/samd2l2/saml21-xplained/scripts/Make.defs
index b822ebb..9aadf4a 100644
--- a/boards/arm/samd2l2/saml21-xplained/scripts/Make.defs
+++ b/boards/arm/samd2l2/saml21-xplained/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv6-m/Toolchain.defs
LDSCRIPT = flash.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
@@ -113,7 +113,7 @@ else
HOSTEXEEXT =
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native host tools
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/samd5e5/metro-m4/scripts/Make.defs b/boards/arm/samd5e5/metro-m4/scripts/Make.defs
index 4b8c9ad..f2c840c 100644
--- a/boards/arm/samd5e5/metro-m4/scripts/Make.defs
+++ b/boards/arm/samd5e5/metro-m4/scripts/Make.defs
@@ -43,7 +43,7 @@ else ifeq ($(CONFIG_METRO_M4_RUNFROMSRAM),y)
LDSCRIPT = sram.ld
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
@@ -103,7 +103,7 @@ LDNXFLATFLAGS = -e main -s 2048
CMODULEFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
LDMODULEFLAGS = -r -e module_initialize
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
else
LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
diff --git a/boards/arm/samd5e5/same54-xplained-pro/scripts/Make.defs b/boards/arm/samd5e5/same54-xplained-pro/scripts/Make.defs
index c347bc1..ac78201 100644
--- a/boards/arm/samd5e5/same54-xplained-pro/scripts/Make.defs
+++ b/boards/arm/samd5e5/same54-xplained-pro/scripts/Make.defs
@@ -43,7 +43,7 @@ else ifeq ($(CONFIG_SAME54_XPLAINED_PRO_RUNFROMSRAM),y)
LDSCRIPT = sram.ld
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
@@ -103,7 +103,7 @@ LDNXFLATFLAGS = -e main -s 2048
CMODULEFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
LDMODULEFLAGS = -r -e module_initialize
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
else
LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
diff --git a/boards/arm/samv7/same70-xplained/kernel/Makefile b/boards/arm/samv7/same70-xplained/kernel/Makefile
index 46b0fd9..60f38f1 100644
--- a/boards/arm/samv7/same70-xplained/kernel/Makefile
+++ b/boards/arm/samv7/same70-xplained/kernel/Makefile
@@ -47,7 +47,7 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done}
USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}"
diff --git a/boards/arm/samv7/same70-xplained/scripts/Make.defs b/boards/arm/samv7/same70-xplained/scripts/Make.defs
index 31e7fe9..eba8249 100644
--- a/boards/arm/samv7/same70-xplained/scripts/Make.defs
+++ b/boards/arm/samv7/same70-xplained/scripts/Make.defs
@@ -43,7 +43,7 @@ else
LDSCRIPT = flash-sram.ld
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
@@ -103,7 +103,7 @@ LDNXFLATFLAGS = -e main -s 2048
CMODULEFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
LDMODULEFLAGS = -r -e module_initialize
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
else
LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
diff --git a/boards/arm/samv7/samv71-xult/configs/knsh/Make.defs b/boards/arm/samv7/samv71-xult/configs/knsh/Make.defs
index 2c1191d..eaa0ff9 100644
--- a/boards/arm/samv7/samv71-xult/configs/knsh/Make.defs
+++ b/boards/arm/samv7/samv71-xult/configs/knsh/Make.defs
@@ -40,7 +40,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT1 = memory.ld
LDSCRIPT2 = kernel-space.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
@@ -102,7 +102,7 @@ LDNXFLATFLAGS = -e main -s 2048
CMODULEFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
LDMODULEFLAGS = -r -e module_initialize
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
else
LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
diff --git a/boards/arm/samv7/samv71-xult/kernel/Makefile b/boards/arm/samv7/samv71-xult/kernel/Makefile
index 6aa6ba5..2f7f12b 100644
--- a/boards/arm/samv7/samv71-xult/kernel/Makefile
+++ b/boards/arm/samv7/samv71-xult/kernel/Makefile
@@ -47,7 +47,7 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done}
USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}"
diff --git a/boards/arm/samv7/samv71-xult/scripts/Make.defs b/boards/arm/samv7/samv71-xult/scripts/Make.defs
index b696bd2..04d1393 100644
--- a/boards/arm/samv7/samv71-xult/scripts/Make.defs
+++ b/boards/arm/samv7/samv71-xult/scripts/Make.defs
@@ -43,7 +43,7 @@ else
LDSCRIPT = flash-sram.ld
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
@@ -103,7 +103,7 @@ LDNXFLATFLAGS = -e main -s 2048
CMODULEFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
LDMODULEFLAGS = -r -e module_initialize
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
else
LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
diff --git a/boards/arm/stm32/axoloti/scripts/Make.defs b/boards/arm/stm32/axoloti/scripts/Make.defs
index 9904512..513aa40 100644
--- a/boards/arm/stm32/axoloti/scripts/Make.defs
+++ b/boards/arm/stm32/axoloti/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = ld.script
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
@@ -99,7 +99,7 @@ LDNXFLATFLAGS = -e main -s 2048
CMODULEFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
LDMODULEFLAGS = -r -e module_initialize
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
else
LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
@@ -111,7 +111,7 @@ CELFFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs
LDELFFLAGS = -r -e main
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}"
else
LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld
diff --git a/boards/arm/stm32/clicker2-stm32/kernel/Makefile b/boards/arm/stm32/clicker2-stm32/kernel/Makefile
index 5ba14f7..c159527 100644
--- a/boards/arm/stm32/clicker2-stm32/kernel/Makefile
+++ b/boards/arm/stm32/clicker2-stm32/kernel/Makefile
@@ -47,7 +47,7 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done}
USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}"
diff --git a/boards/arm/stm32/clicker2-stm32/scripts/Make.defs b/boards/arm/stm32/clicker2-stm32/scripts/Make.defs
index 7430019..99025ab 100644
--- a/boards/arm/stm32/clicker2-stm32/scripts/Make.defs
+++ b/boards/arm/stm32/clicker2-stm32/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = flash.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
@@ -104,7 +104,7 @@ LDNXFLATFLAGS = -e main -s 2048
CMODULEFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
LDMODULEFLAGS = -r -e module_initialize
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
else
LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
diff --git a/boards/arm/stm32/cloudctrl/scripts/Make.defs b/boards/arm/stm32/cloudctrl/scripts/Make.defs
index 353cb8f..9de8d30 100644
--- a/boards/arm/stm32/cloudctrl/scripts/Make.defs
+++ b/boards/arm/stm32/cloudctrl/scripts/Make.defs
@@ -45,7 +45,7 @@ else
LDSCRIPT = cloudctrl.ld
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32/fire-stm32v2/scripts/Make.defs b/boards/arm/stm32/fire-stm32v2/scripts/Make.defs
index c243b8d..9b18283 100644
--- a/boards/arm/stm32/fire-stm32v2/scripts/Make.defs
+++ b/boards/arm/stm32/fire-stm32v2/scripts/Make.defs
@@ -45,7 +45,7 @@ else
LDSCRIPT = fire-stm32v2.ld
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32/hymini-stm32v/scripts/Make.defs b/boards/arm/stm32/hymini-stm32v/scripts/Make.defs
index 95e5885..becbbe3 100644
--- a/boards/arm/stm32/hymini-stm32v/scripts/Make.defs
+++ b/boards/arm/stm32/hymini-stm32v/scripts/Make.defs
@@ -43,7 +43,7 @@ else
LDSCRIPT = ld.script
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32/maple/scripts/Make.defs b/boards/arm/stm32/maple/scripts/Make.defs
index 90aa9b7..1a7f4c4 100644
--- a/boards/arm/stm32/maple/scripts/Make.defs
+++ b/boards/arm/stm32/maple/scripts/Make.defs
@@ -43,7 +43,7 @@ else
LDSCRIPT = ld.script
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32/mikroe-stm32f4/kernel/Makefile b/boards/arm/stm32/mikroe-stm32f4/kernel/Makefile
index c806ba8..d5d8669 100644
--- a/boards/arm/stm32/mikroe-stm32f4/kernel/Makefile
+++ b/boards/arm/stm32/mikroe-stm32f4/kernel/Makefile
@@ -47,7 +47,7 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done}
USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}"
diff --git a/boards/arm/stm32/mikroe-stm32f4/scripts/Make.defs b/boards/arm/stm32/mikroe-stm32f4/scripts/Make.defs
index 37e8558..96830db 100644
--- a/boards/arm/stm32/mikroe-stm32f4/scripts/Make.defs
+++ b/boards/arm/stm32/mikroe-stm32f4/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = ld.script
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32/nucleo-f103rb/scripts/Make.defs b/boards/arm/stm32/nucleo-f103rb/scripts/Make.defs
index 3d7c700..4fd8226 100644
--- a/boards/arm/stm32/nucleo-f103rb/scripts/Make.defs
+++ b/boards/arm/stm32/nucleo-f103rb/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = ld.script
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32/nucleo-f207zg/scripts/Make.defs b/boards/arm/stm32/nucleo-f207zg/scripts/Make.defs
index 538a75b..dcad42c 100644
--- a/boards/arm/stm32/nucleo-f207zg/scripts/Make.defs
+++ b/boards/arm/stm32/nucleo-f207zg/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = ld.script
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32/nucleo-f302r8/scripts/Make.defs b/boards/arm/stm32/nucleo-f302r8/scripts/Make.defs
index 60e1e3f..7bf2b9f 100644
--- a/boards/arm/stm32/nucleo-f302r8/scripts/Make.defs
+++ b/boards/arm/stm32/nucleo-f302r8/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = ld.script
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32/nucleo-f303re/scripts/Make.defs b/boards/arm/stm32/nucleo-f303re/scripts/Make.defs
index f80baac..e1947de 100644
--- a/boards/arm/stm32/nucleo-f303re/scripts/Make.defs
+++ b/boards/arm/stm32/nucleo-f303re/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = ld.script
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32/nucleo-f303ze/scripts/Make.defs b/boards/arm/stm32/nucleo-f303ze/scripts/Make.defs
index 2c872aa..a16598a 100644
--- a/boards/arm/stm32/nucleo-f303ze/scripts/Make.defs
+++ b/boards/arm/stm32/nucleo-f303ze/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = ld.script
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32/nucleo-f334r8/scripts/Make.defs b/boards/arm/stm32/nucleo-f334r8/scripts/Make.defs
index 0fd8615..0f70f1a 100644
--- a/boards/arm/stm32/nucleo-f334r8/scripts/Make.defs
+++ b/boards/arm/stm32/nucleo-f334r8/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = ld.script
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32/nucleo-f410rb/scripts/Make.defs b/boards/arm/stm32/nucleo-f410rb/scripts/Make.defs
index 9dbeb77..04ae54c 100644
--- a/boards/arm/stm32/nucleo-f410rb/scripts/Make.defs
+++ b/boards/arm/stm32/nucleo-f410rb/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = f410rb.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32/nucleo-f429zi/scripts/Make.defs b/boards/arm/stm32/nucleo-f429zi/scripts/Make.defs
index bc65c93..aa61372 100644
--- a/boards/arm/stm32/nucleo-f429zi/scripts/Make.defs
+++ b/boards/arm/stm32/nucleo-f429zi/scripts/Make.defs
@@ -24,7 +24,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = ld.script
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32/nucleo-f446re/scripts/Make.defs b/boards/arm/stm32/nucleo-f446re/scripts/Make.defs
index b43ba22..4bd9cc2 100644
--- a/boards/arm/stm32/nucleo-f446re/scripts/Make.defs
+++ b/boards/arm/stm32/nucleo-f446re/scripts/Make.defs
@@ -49,7 +49,7 @@ else
BOARD_DIR = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32/nucleo-f4x1re/scripts/Make.defs b/boards/arm/stm32/nucleo-f4x1re/scripts/Make.defs
index 63b0168..8bc8c8e 100644
--- a/boards/arm/stm32/nucleo-f4x1re/scripts/Make.defs
+++ b/boards/arm/stm32/nucleo-f4x1re/scripts/Make.defs
@@ -45,7 +45,7 @@ LDSCRIPT = f411re.ld
endif
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32/nucleo-l152re/scripts/Make.defs b/boards/arm/stm32/nucleo-l152re/scripts/Make.defs
index 46ba83b..a027f33 100644
--- a/boards/arm/stm32/nucleo-l152re/scripts/Make.defs
+++ b/boards/arm/stm32/nucleo-l152re/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = ld.script
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32/olimex-stm32-e407/scripts/Make.defs b/boards/arm/stm32/olimex-stm32-e407/scripts/Make.defs
index f16d9e6..682a761 100644
--- a/boards/arm/stm32/olimex-stm32-e407/scripts/Make.defs
+++ b/boards/arm/stm32/olimex-stm32-e407/scripts/Make.defs
@@ -45,7 +45,7 @@ LDSCRIPT = f407zg.ld
endif
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32/olimex-stm32-h405/scripts/Make.defs b/boards/arm/stm32/olimex-stm32-h405/scripts/Make.defs
index 7714ab6..d0c7b9e 100644
--- a/boards/arm/stm32/olimex-stm32-h405/scripts/Make.defs
+++ b/boards/arm/stm32/olimex-stm32-h405/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = ld.script
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32/olimex-stm32-h407/scripts/Make.defs b/boards/arm/stm32/olimex-stm32-h407/scripts/Make.defs
index 3f52a12..e5ef070 100644
--- a/boards/arm/stm32/olimex-stm32-h407/scripts/Make.defs
+++ b/boards/arm/stm32/olimex-stm32-h407/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = ld.script
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32/olimex-stm32-p107/scripts/Make.defs b/boards/arm/stm32/olimex-stm32-p107/scripts/Make.defs
index 431779b..196e819 100644
--- a/boards/arm/stm32/olimex-stm32-p107/scripts/Make.defs
+++ b/boards/arm/stm32/olimex-stm32-p107/scripts/Make.defs
@@ -52,7 +52,7 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
ARCHXXINCLUDES = -I. -isystem $(TOPDIR)\include -isystem $(TOPDIR)\include\cxx
ARCHSCRIPT = -T$(TOPDIR)\boards\$(CONFIG_ARCH)\$(CONFIG_ARCH_CHIP)\$(CONFIG_ARCH_BOARD)\scripts\$(LDSCRIPT)
else
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32/olimex-stm32-p207/scripts/Make.defs b/boards/arm/stm32/olimex-stm32-p207/scripts/Make.defs
index e884068..e8d1464 100644
--- a/boards/arm/stm32/olimex-stm32-p207/scripts/Make.defs
+++ b/boards/arm/stm32/olimex-stm32-p207/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = ld.script
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/kelf/Make.defs b/boards/arm/stm32/olimex-stm32-p407/configs/kelf/Make.defs
index 181660c..26d03b7 100644
--- a/boards/arm/stm32/olimex-stm32-p407/configs/kelf/Make.defs
+++ b/boards/arm/stm32/olimex-stm32-p407/configs/kelf/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
@@ -101,7 +101,7 @@ LDNXFLATFLAGS = -e main -s 2048
CMODULEFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
LDMODULEFLAGS = -r -e module_initialize
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
else
LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
@@ -113,7 +113,7 @@ CELFFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs
LDELFFLAGS = -r -e main
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)modlib$(DELIM)gnu-elf.ld}"
else
LDELFFLAGS += -T $(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)modlib$(DELIM)gnu-elf.ld
diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/kmodule/Make.defs b/boards/arm/stm32/olimex-stm32-p407/configs/kmodule/Make.defs
index 34092fd..c40170f 100644
--- a/boards/arm/stm32/olimex-stm32-p407/configs/kmodule/Make.defs
+++ b/boards/arm/stm32/olimex-stm32-p407/configs/kmodule/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
@@ -101,7 +101,7 @@ LDNXFLATFLAGS = -e main -s 2048
CMODULEFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
LDMODULEFLAGS = -r -e module_initialize
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
else
LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
@@ -113,7 +113,7 @@ CELFFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs
LDELFFLAGS = -r -e main
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)modlib$(DELIM)gnu-elf.ld}"
else
LDELFFLAGS += -T $(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)modlib$(DELIM)gnu-elf.ld
diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/knsh/Make.defs b/boards/arm/stm32/olimex-stm32-p407/configs/knsh/Make.defs
index feca09c..9a561b3 100644
--- a/boards/arm/stm32/olimex-stm32-p407/configs/knsh/Make.defs
+++ b/boards/arm/stm32/olimex-stm32-p407/configs/knsh/Make.defs
@@ -40,7 +40,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT1 = memory.ld
LDSCRIPT2 = kernel-space.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
@@ -102,7 +102,7 @@ LDNXFLATFLAGS = -e main -s 2048
CMODULEFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
LDMODULEFLAGS = -r -e module_initialize
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
else
LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
diff --git a/boards/arm/stm32/olimex-stm32-p407/kernel/Makefile b/boards/arm/stm32/olimex-stm32-p407/kernel/Makefile
index 48efb4f..c30bd90 100644
--- a/boards/arm/stm32/olimex-stm32-p407/kernel/Makefile
+++ b/boards/arm/stm32/olimex-stm32-p407/kernel/Makefile
@@ -47,7 +47,7 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done}
USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}"
diff --git a/boards/arm/stm32/olimex-stm32-p407/scripts/Make.defs b/boards/arm/stm32/olimex-stm32-p407/scripts/Make.defs
index e959b1c..a3ade24 100644
--- a/boards/arm/stm32/olimex-stm32-p407/scripts/Make.defs
+++ b/boards/arm/stm32/olimex-stm32-p407/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = flash.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
@@ -99,7 +99,7 @@ LDNXFLATFLAGS = -e main -s 2048
CMODULEFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
LDMODULEFLAGS = -r -e module_initialize
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
else
LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
diff --git a/boards/arm/stm32/olimexino-stm32/scripts/Make.defs b/boards/arm/stm32/olimexino-stm32/scripts/Make.defs
index 6c72c1c..30d0913 100644
--- a/boards/arm/stm32/olimexino-stm32/scripts/Make.defs
+++ b/boards/arm/stm32/olimexino-stm32/scripts/Make.defs
@@ -52,7 +52,7 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
ARCHXXINCLUDES = -I. -isystem $(TOPDIR)\include -isystem $(TOPDIR)\include\cxx
ARCHSCRIPT = -T$(TOPDIR)\boards\$(CONFIG_ARCH)\$(CONFIG_ARCH_CHIP)\$(CONFIG_ARCH_BOARD)\scripts\$(LDSCRIPT)
else
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32/omnibusf4/kernel/Makefile b/boards/arm/stm32/omnibusf4/kernel/Makefile
index 44b3b00..738c6f3 100644
--- a/boards/arm/stm32/omnibusf4/kernel/Makefile
+++ b/boards/arm/stm32/omnibusf4/kernel/Makefile
@@ -49,7 +49,7 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done}
USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}"
diff --git a/boards/arm/stm32/omnibusf4/scripts/Make.defs b/boards/arm/stm32/omnibusf4/scripts/Make.defs
index b1701dc..7b57a5b 100644
--- a/boards/arm/stm32/omnibusf4/scripts/Make.defs
+++ b/boards/arm/stm32/omnibusf4/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = ld.script
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
@@ -99,7 +99,7 @@ LDNXFLATFLAGS = -e main -s 2048
CMODULEFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
LDMODULEFLAGS = -r -e module_initialize
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
else
LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
@@ -111,7 +111,7 @@ CELFFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs
LDELFFLAGS = -r -e main
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}"
else
LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld
diff --git a/boards/arm/stm32/photon/scripts/Make.defs b/boards/arm/stm32/photon/scripts/Make.defs
index 44af6f5..83c4e28 100644
--- a/boards/arm/stm32/photon/scripts/Make.defs
+++ b/boards/arm/stm32/photon/scripts/Make.defs
@@ -43,7 +43,7 @@ else
LDSCRIPT = photon_jtag.ld
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32/shenzhou/scripts/Make.defs b/boards/arm/stm32/shenzhou/scripts/Make.defs
index 2e48a53..1c92df2 100644
--- a/boards/arm/stm32/shenzhou/scripts/Make.defs
+++ b/boards/arm/stm32/shenzhou/scripts/Make.defs
@@ -45,7 +45,7 @@ else
LDSCRIPT = ld.script
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32/stm3210e-eval/scripts/Make.defs b/boards/arm/stm32/stm3210e-eval/scripts/Make.defs
index a25d5c3..5e05bac 100644
--- a/boards/arm/stm32/stm3210e-eval/scripts/Make.defs
+++ b/boards/arm/stm32/stm3210e-eval/scripts/Make.defs
@@ -43,7 +43,7 @@ else
LDSCRIPT = ld.script
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32/stm3220g-eval/scripts/Make.defs b/boards/arm/stm32/stm3220g-eval/scripts/Make.defs
index 027c742..6654125 100644
--- a/boards/arm/stm32/stm3220g-eval/scripts/Make.defs
+++ b/boards/arm/stm32/stm3220g-eval/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = ld.script
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32/stm3240g-eval/configs/knxwm/Make.defs b/boards/arm/stm32/stm3240g-eval/configs/knxwm/Make.defs
index afb9c44..eed9d47 100644
--- a/boards/arm/stm32/stm3240g-eval/configs/knxwm/Make.defs
+++ b/boards/arm/stm32/stm3240g-eval/configs/knxwm/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32/stm3240g-eval/kernel/Makefile b/boards/arm/stm32/stm3240g-eval/kernel/Makefile
index 85ff502..cfeb35a 100644
--- a/boards/arm/stm32/stm3240g-eval/kernel/Makefile
+++ b/boards/arm/stm32/stm3240g-eval/kernel/Makefile
@@ -47,7 +47,7 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done}
USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}"
diff --git a/boards/arm/stm32/stm3240g-eval/scripts/Make.defs b/boards/arm/stm32/stm3240g-eval/scripts/Make.defs
index e0e30df..669d9ad 100644
--- a/boards/arm/stm32/stm3240g-eval/scripts/Make.defs
+++ b/boards/arm/stm32/stm3240g-eval/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = ld.script
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32/stm32_tiny/scripts/Make.defs b/boards/arm/stm32/stm32_tiny/scripts/Make.defs
index 7a38f37..8bc428a 100644
--- a/boards/arm/stm32/stm32_tiny/scripts/Make.defs
+++ b/boards/arm/stm32/stm32_tiny/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = ld.script
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32/stm32butterfly2/scripts/Make.defs b/boards/arm/stm32/stm32butterfly2/scripts/Make.defs
index 0b33628..31e72ae 100644
--- a/boards/arm/stm32/stm32butterfly2/scripts/Make.defs
+++ b/boards/arm/stm32/stm32butterfly2/scripts/Make.defs
@@ -43,7 +43,7 @@ else
LDSCRIPT = flash.ld
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32/stm32f103-minimum/scripts/Make.defs b/boards/arm/stm32/stm32f103-minimum/scripts/Make.defs
index 2331565..6442c06 100644
--- a/boards/arm/stm32/stm32f103-minimum/scripts/Make.defs
+++ b/boards/arm/stm32/stm32f103-minimum/scripts/Make.defs
@@ -43,7 +43,7 @@ else
LDSCRIPT = ld.script
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32/stm32f334-disco/scripts/Make.defs b/boards/arm/stm32/stm32f334-disco/scripts/Make.defs
index 1b51fd6..0ae2fd2 100644
--- a/boards/arm/stm32/stm32f334-disco/scripts/Make.defs
+++ b/boards/arm/stm32/stm32f334-disco/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = ld.script
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32/stm32f3discovery/scripts/Make.defs b/boards/arm/stm32/stm32f3discovery/scripts/Make.defs
index 76adc88..95eeb5b 100644
--- a/boards/arm/stm32/stm32f3discovery/scripts/Make.defs
+++ b/boards/arm/stm32/stm32f3discovery/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = ld.script
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32/stm32f411e-disco/scripts/Make.defs b/boards/arm/stm32/stm32f411e-disco/scripts/Make.defs
index 7b4cc4e..2075bda 100644
--- a/boards/arm/stm32/stm32f411e-disco/scripts/Make.defs
+++ b/boards/arm/stm32/stm32f411e-disco/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = f411ve.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32/stm32f429i-disco/scripts/Make.defs b/boards/arm/stm32/stm32f429i-disco/scripts/Make.defs
index af251d2..eeb1174 100644
--- a/boards/arm/stm32/stm32f429i-disco/scripts/Make.defs
+++ b/boards/arm/stm32/stm32f429i-disco/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = ld.script
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32/stm32f4discovery/configs/cxxtest/Make.defs b/boards/arm/stm32/stm32f4discovery/configs/cxxtest/Make.defs
index a50f8b9..b7ea823 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/cxxtest/Make.defs
+++ b/boards/arm/stm32/stm32f4discovery/configs/cxxtest/Make.defs
@@ -55,7 +55,7 @@ LIBSUPXX = ${shell $(CC) $(CXXFLAGS) --print-file-name=libsupc++.a}
EXTRA_LIBPATHS = -L "${shell dirname "$(LIBSUPXX)"}"
EXTRA_LIBS = -lsupc++
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32/stm32f4discovery/configs/elf/Make.defs b/boards/arm/stm32/stm32f4discovery/configs/elf/Make.defs
index 6ee1566..40d3c6f 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/elf/Make.defs
+++ b/boards/arm/stm32/stm32f4discovery/configs/elf/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = ld.script
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
@@ -102,7 +102,7 @@ CELFFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs
LDELFFLAGS = -r -e main
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}"
else
LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld
diff --git a/boards/arm/stm32/stm32f4discovery/configs/posix_spawn/Make.defs b/boards/arm/stm32/stm32f4discovery/configs/posix_spawn/Make.defs
index 2d1c6a0..a185cc8 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/posix_spawn/Make.defs
+++ b/boards/arm/stm32/stm32f4discovery/configs/posix_spawn/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = ld.script
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
@@ -102,7 +102,7 @@ CELFFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs
LDELFFLAGS = -r -e main
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}"
else
LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld
diff --git a/boards/arm/stm32/stm32f4discovery/configs/testlibcxx/Make.defs b/boards/arm/stm32/stm32f4discovery/configs/testlibcxx/Make.defs
index 9061bf1..8f7964f 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/testlibcxx/Make.defs
+++ b/boards/arm/stm32/stm32f4discovery/configs/testlibcxx/Make.defs
@@ -57,7 +57,7 @@ LIBSUPXX = ${shell $(CC) $(CXXFLAGS) --print-file-name=libsupc++.a}
EXTRA_LIBPATHS = -L "${shell dirname "$(LIBSUPXX)"}"
EXTRA_LIBS = -lsupc++
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32/stm32f4discovery/kernel/Makefile b/boards/arm/stm32/stm32f4discovery/kernel/Makefile
index b432fb3..d39beee 100644
--- a/boards/arm/stm32/stm32f4discovery/kernel/Makefile
+++ b/boards/arm/stm32/stm32f4discovery/kernel/Makefile
@@ -47,7 +47,7 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done}
USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}"
diff --git a/boards/arm/stm32/stm32f4discovery/scripts/Make.defs b/boards/arm/stm32/stm32f4discovery/scripts/Make.defs
index 9e0a715..9eefb97 100644
--- a/boards/arm/stm32/stm32f4discovery/scripts/Make.defs
+++ b/boards/arm/stm32/stm32f4discovery/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = ld.script
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
@@ -117,7 +117,7 @@ LDNXFLATFLAGS = -e main -s 2048
CMODULEFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
LDMODULEFLAGS = -r -e module_initialize
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
else
LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
@@ -129,7 +129,7 @@ CELFFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs
LDELFFLAGS = -r -e main
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}"
else
LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld
diff --git a/boards/arm/stm32/stm32ldiscovery/scripts/Make.defs b/boards/arm/stm32/stm32ldiscovery/scripts/Make.defs
index 65a663c..0b57801 100644
--- a/boards/arm/stm32/stm32ldiscovery/scripts/Make.defs
+++ b/boards/arm/stm32/stm32ldiscovery/scripts/Make.defs
@@ -43,7 +43,7 @@ else ifeq ($(CONFIG_ARCH_CHIP_STM32L152RC),y)
LDSCRIPT = stm32l152rc.ld
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32/stm32vldiscovery/scripts/Make.defs b/boards/arm/stm32/stm32vldiscovery/scripts/Make.defs
index a466db1..65f124d 100644
--- a/boards/arm/stm32/stm32vldiscovery/scripts/Make.defs
+++ b/boards/arm/stm32/stm32vldiscovery/scripts/Make.defs
@@ -40,7 +40,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = stm32vldiscovery.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32/viewtool-stm32f107/scripts/Make.defs b/boards/arm/stm32/viewtool-stm32f107/scripts/Make.defs
index 8d13f4f..e0ca473 100644
--- a/boards/arm/stm32/viewtool-stm32f107/scripts/Make.defs
+++ b/boards/arm/stm32/viewtool-stm32f107/scripts/Make.defs
@@ -43,7 +43,7 @@ else
LDSCRIPT = flash.ld
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/scripts/Make.defs b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/scripts/Make.defs
index dc00174..1edbb89 100644
--- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/scripts/Make.defs
+++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv6-m/Toolchain.defs
LDSCRIPT = ld.script
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32f0l0g0/nucleo-f072rb/scripts/Make.defs b/boards/arm/stm32f0l0g0/nucleo-f072rb/scripts/Make.defs
index 8b1041e..e156ab8 100644
--- a/boards/arm/stm32f0l0g0/nucleo-f072rb/scripts/Make.defs
+++ b/boards/arm/stm32f0l0g0/nucleo-f072rb/scripts/Make.defs
@@ -40,7 +40,7 @@ include ${TOPDIR}/arch/arm/src/armv6-m/Toolchain.defs
LDSCRIPT = flash.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32f0l0g0/nucleo-f091rc/scripts/Make.defs b/boards/arm/stm32f0l0g0/nucleo-f091rc/scripts/Make.defs
index 57e06b2..3a5a952 100644
--- a/boards/arm/stm32f0l0g0/nucleo-f091rc/scripts/Make.defs
+++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/scripts/Make.defs
@@ -40,7 +40,7 @@ include ${TOPDIR}/arch/arm/src/armv6-m/Toolchain.defs
LDSCRIPT = flash.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32f0l0g0/nucleo-g070rb/scripts/Make.defs b/boards/arm/stm32f0l0g0/nucleo-g070rb/scripts/Make.defs
index c74d71a..159ad5a 100644
--- a/boards/arm/stm32f0l0g0/nucleo-g070rb/scripts/Make.defs
+++ b/boards/arm/stm32f0l0g0/nucleo-g070rb/scripts/Make.defs
@@ -42,7 +42,7 @@ include ${TOPDIR}/arch/arm/src/armv6-m/Toolchain.defs
LDSCRIPT = ld.script
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32f0l0g0/nucleo-g071rb/scripts/Make.defs b/boards/arm/stm32f0l0g0/nucleo-g071rb/scripts/Make.defs
index 077b479..915a0c0 100644
--- a/boards/arm/stm32f0l0g0/nucleo-g071rb/scripts/Make.defs
+++ b/boards/arm/stm32f0l0g0/nucleo-g071rb/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv6-m/Toolchain.defs
LDSCRIPT = ld.script
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32f0l0g0/nucleo-l073rz/scripts/Make.defs b/boards/arm/stm32f0l0g0/nucleo-l073rz/scripts/Make.defs
index 806b184..3da8fc7 100644
--- a/boards/arm/stm32f0l0g0/nucleo-l073rz/scripts/Make.defs
+++ b/boards/arm/stm32f0l0g0/nucleo-l073rz/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv6-m/Toolchain.defs
LDSCRIPT = ld.script
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32f0l0g0/stm32f051-discovery/scripts/Make.defs b/boards/arm/stm32f0l0g0/stm32f051-discovery/scripts/Make.defs
index 5c3a0d4..518fa82 100644
--- a/boards/arm/stm32f0l0g0/stm32f051-discovery/scripts/Make.defs
+++ b/boards/arm/stm32f0l0g0/stm32f051-discovery/scripts/Make.defs
@@ -40,7 +40,7 @@ include ${TOPDIR}/arch/arm/src/armv6-m/Toolchain.defs
LDSCRIPT = flash.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32f0l0g0/stm32f072-discovery/scripts/Make.defs b/boards/arm/stm32f0l0g0/stm32f072-discovery/scripts/Make.defs
index 90dab3b..0fb25c1 100644
--- a/boards/arm/stm32f0l0g0/stm32f072-discovery/scripts/Make.defs
+++ b/boards/arm/stm32f0l0g0/stm32f072-discovery/scripts/Make.defs
@@ -40,7 +40,7 @@ include ${TOPDIR}/arch/arm/src/armv6-m/Toolchain.defs
LDSCRIPT = flash.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32f7/nucleo-144/configs/f722-nsh/Make.defs b/boards/arm/stm32f7/nucleo-144/configs/f722-nsh/Make.defs
index 1f5f3f6..2c8cac5 100644
--- a/boards/arm/stm32f7/nucleo-144/configs/f722-nsh/Make.defs
+++ b/boards/arm/stm32f7/nucleo-144/configs/f722-nsh/Make.defs
@@ -43,7 +43,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = f722-flash.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32f7/nucleo-144/configs/f746-evalos/Make.defs b/boards/arm/stm32f7/nucleo-144/configs/f746-evalos/Make.defs
index 1ef5309..f9eb315 100644
--- a/boards/arm/stm32f7/nucleo-144/configs/f746-evalos/Make.defs
+++ b/boards/arm/stm32f7/nucleo-144/configs/f746-evalos/Make.defs
@@ -41,7 +41,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = f746-flash.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32f7/nucleo-144/configs/f746-nsh/Make.defs b/boards/arm/stm32f7/nucleo-144/configs/f746-nsh/Make.defs
index f5cb027..f283a1f 100644
--- a/boards/arm/stm32f7/nucleo-144/configs/f746-nsh/Make.defs
+++ b/boards/arm/stm32f7/nucleo-144/configs/f746-nsh/Make.defs
@@ -40,7 +40,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = f746-flash.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32f7/nucleo-144/configs/f767-evalos/Make.defs b/boards/arm/stm32f7/nucleo-144/configs/f767-evalos/Make.defs
index 1a74a27..10a782d 100644
--- a/boards/arm/stm32f7/nucleo-144/configs/f767-evalos/Make.defs
+++ b/boards/arm/stm32f7/nucleo-144/configs/f767-evalos/Make.defs
@@ -41,7 +41,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = f767-flash.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/Make.defs b/boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/Make.defs
index 4062ba4..a3c1e31 100644
--- a/boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/Make.defs
+++ b/boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/Make.defs
@@ -40,7 +40,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = f767-flash.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32f7/nucleo-144/configs/f767-nsh/Make.defs b/boards/arm/stm32f7/nucleo-144/configs/f767-nsh/Make.defs
index 9020bfe..226c757 100644
--- a/boards/arm/stm32f7/nucleo-144/configs/f767-nsh/Make.defs
+++ b/boards/arm/stm32f7/nucleo-144/configs/f767-nsh/Make.defs
@@ -40,7 +40,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = f767-flash.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32f7/stm32f746-ws/scripts/Make.defs b/boards/arm/stm32f7/stm32f746-ws/scripts/Make.defs
index bbff564..736781c 100644
--- a/boards/arm/stm32f7/stm32f746-ws/scripts/Make.defs
+++ b/boards/arm/stm32f7/stm32f746-ws/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = flash.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32f7/stm32f746g-disco/kernel/Makefile b/boards/arm/stm32f7/stm32f746g-disco/kernel/Makefile
index 5b142bc..1c54f28 100644
--- a/boards/arm/stm32f7/stm32f746g-disco/kernel/Makefile
+++ b/boards/arm/stm32f7/stm32f746g-disco/kernel/Makefile
@@ -47,7 +47,7 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done}
USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}"
diff --git a/boards/arm/stm32f7/stm32f746g-disco/scripts/Make.defs b/boards/arm/stm32f7/stm32f746g-disco/scripts/Make.defs
index 272d11c..aa74fe9 100644
--- a/boards/arm/stm32f7/stm32f746g-disco/scripts/Make.defs
+++ b/boards/arm/stm32f7/stm32f746g-disco/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = flash.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
@@ -130,7 +130,7 @@ HOSTINCLUDES = -I.
HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -g -pipe
HOSTLDFLAGS =
-ifneq ($(WINTOOL),y)
+ifneq ($(CONFIG_CYGWIN_WINTOOL),y)
define DOWNLOAD
$(Q) st-flash write nuttx.bin 0x8000000
endef
diff --git a/boards/arm/stm32f7/stm32f769i-disco/kernel/Makefile b/boards/arm/stm32f7/stm32f769i-disco/kernel/Makefile
index b49ba78..92b218f 100644
--- a/boards/arm/stm32f7/stm32f769i-disco/kernel/Makefile
+++ b/boards/arm/stm32f7/stm32f769i-disco/kernel/Makefile
@@ -47,7 +47,7 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done}
USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}"
diff --git a/boards/arm/stm32f7/stm32f769i-disco/scripts/Make.defs b/boards/arm/stm32f7/stm32f769i-disco/scripts/Make.defs
index cc7353b..96d1925 100644
--- a/boards/arm/stm32f7/stm32f769i-disco/scripts/Make.defs
+++ b/boards/arm/stm32f7/stm32f769i-disco/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = flash.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32h7/nucleo-h743zi/kernel/Makefile b/boards/arm/stm32h7/nucleo-h743zi/kernel/Makefile
index 2ed4b0d..5df3373 100644
--- a/boards/arm/stm32h7/nucleo-h743zi/kernel/Makefile
+++ b/boards/arm/stm32h7/nucleo-h743zi/kernel/Makefile
@@ -47,7 +47,7 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done}
USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}"
diff --git a/boards/arm/stm32h7/nucleo-h743zi/scripts/Make.defs b/boards/arm/stm32h7/nucleo-h743zi/scripts/Make.defs
index 09ea95e..aa2d983 100644
--- a/boards/arm/stm32h7/nucleo-h743zi/scripts/Make.defs
+++ b/boards/arm/stm32h7/nucleo-h743zi/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = flash.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32h7/stm32h747i-disco/kernel/Makefile b/boards/arm/stm32h7/stm32h747i-disco/kernel/Makefile
index 5a8634b..6eb8139 100644
--- a/boards/arm/stm32h7/stm32h747i-disco/kernel/Makefile
+++ b/boards/arm/stm32h7/stm32h747i-disco/kernel/Makefile
@@ -47,7 +47,7 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done}
USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}"
diff --git a/boards/arm/stm32h7/stm32h747i-disco/scripts/Make.defs b/boards/arm/stm32h7/stm32h747i-disco/scripts/Make.defs
index b8e092b..854f067 100644
--- a/boards/arm/stm32h7/stm32h747i-disco/scripts/Make.defs
+++ b/boards/arm/stm32h7/stm32h747i-disco/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = flash.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32l4/b-l475e-iot01a/scripts/Make.defs b/boards/arm/stm32l4/b-l475e-iot01a/scripts/Make.defs
index 8519f68..134b2af 100644
--- a/boards/arm/stm32l4/b-l475e-iot01a/scripts/Make.defs
+++ b/boards/arm/stm32l4/b-l475e-iot01a/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
# TODO add stm32 bootloader support
LDSCRIPT = flash.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32l4/nucleo-l432kc/scripts/Make.defs b/boards/arm/stm32l4/nucleo-l432kc/scripts/Make.defs
index 543daef..2088815 100644
--- a/boards/arm/stm32l4/nucleo-l432kc/scripts/Make.defs
+++ b/boards/arm/stm32l4/nucleo-l432kc/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = l432kc.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32l4/nucleo-l452re/scripts/Make.defs b/boards/arm/stm32l4/nucleo-l452re/scripts/Make.defs
index 4d3533e..676f208 100644
--- a/boards/arm/stm32l4/nucleo-l452re/scripts/Make.defs
+++ b/boards/arm/stm32l4/nucleo-l452re/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = l452re-flash.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32l4/nucleo-l476rg/scripts/Make.defs b/boards/arm/stm32l4/nucleo-l476rg/scripts/Make.defs
index 1dc1165..461b578 100644
--- a/boards/arm/stm32l4/nucleo-l476rg/scripts/Make.defs
+++ b/boards/arm/stm32l4/nucleo-l476rg/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = l476rg.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32l4/nucleo-l496zg/scripts/Make.defs b/boards/arm/stm32l4/nucleo-l496zg/scripts/Make.defs
index de5c26a..9094dcf 100644
--- a/boards/arm/stm32l4/nucleo-l496zg/scripts/Make.defs
+++ b/boards/arm/stm32l4/nucleo-l496zg/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = l496zg-flash.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32l4/stm32l476-mdk/scripts/Make.defs b/boards/arm/stm32l4/stm32l476-mdk/scripts/Make.defs
index f8729a9..f32b508 100644
--- a/boards/arm/stm32l4/stm32l476-mdk/scripts/Make.defs
+++ b/boards/arm/stm32l4/stm32l476-mdk/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = stm32l476-mdk.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32l4/stm32l476vg-disco/configs/knsh/Make.defs b/boards/arm/stm32l4/stm32l476vg-disco/configs/knsh/Make.defs
index 6e21dbe..6173045 100644
--- a/boards/arm/stm32l4/stm32l476vg-disco/configs/knsh/Make.defs
+++ b/boards/arm/stm32l4/stm32l476vg-disco/configs/knsh/Make.defs
@@ -40,7 +40,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT1 = memory.ld
LDSCRIPT2 = kernel-space.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32l4/stm32l476vg-disco/kernel/Makefile b/boards/arm/stm32l4/stm32l476vg-disco/kernel/Makefile
index a83e1ed..11e6c44 100644
--- a/boards/arm/stm32l4/stm32l476vg-disco/kernel/Makefile
+++ b/boards/arm/stm32l4/stm32l476vg-disco/kernel/Makefile
@@ -47,7 +47,7 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done}
USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}"
diff --git a/boards/arm/stm32l4/stm32l476vg-disco/scripts/Make.defs b/boards/arm/stm32l4/stm32l476vg-disco/scripts/Make.defs
index 5a82ab5..619aee2 100644
--- a/boards/arm/stm32l4/stm32l476vg-disco/scripts/Make.defs
+++ b/boards/arm/stm32l4/stm32l476vg-disco/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = stm32l476vg-disco.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/configs/knsh/Make.defs b/boards/arm/stm32l4/stm32l4r9ai-disco/configs/knsh/Make.defs
index 75db9cd..bcc00b2 100644
--- a/boards/arm/stm32l4/stm32l4r9ai-disco/configs/knsh/Make.defs
+++ b/boards/arm/stm32l4/stm32l4r9ai-disco/configs/knsh/Make.defs
@@ -40,7 +40,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT1 = memory.ld
LDSCRIPT2 = kernel-space.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/kernel/Makefile b/boards/arm/stm32l4/stm32l4r9ai-disco/kernel/Makefile
index 4d8b030..67c5a30 100644
--- a/boards/arm/stm32l4/stm32l4r9ai-disco/kernel/Makefile
+++ b/boards/arm/stm32l4/stm32l4r9ai-disco/kernel/Makefile
@@ -47,7 +47,7 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done}
USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}"
diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/scripts/Make.defs b/boards/arm/stm32l4/stm32l4r9ai-disco/scripts/Make.defs
index a709f1e..04ff7e2 100644
--- a/boards/arm/stm32l4/stm32l4r9ai-disco/scripts/Make.defs
+++ b/boards/arm/stm32l4/stm32l4r9ai-disco/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = stm32l4r9ai-disco.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/str71x/olimex-strp711/scripts/Make.defs b/boards/arm/str71x/olimex-strp711/scripts/Make.defs
index 334e7a2..e12f831 100644
--- a/boards/arm/str71x/olimex-strp711/scripts/Make.defs
+++ b/boards/arm/str71x/olimex-strp711/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/arm/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/tiva/dk-tm4c129x/scripts/Make.defs b/boards/arm/tiva/dk-tm4c129x/scripts/Make.defs
index 1ffaf5a..648d3ff 100644
--- a/boards/arm/tiva/dk-tm4c129x/scripts/Make.defs
+++ b/boards/arm/tiva/dk-tm4c129x/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/tiva/eagle100/scripts/Make.defs b/boards/arm/tiva/eagle100/scripts/Make.defs
index cfde3fe..7b63a68 100644
--- a/boards/arm/tiva/eagle100/scripts/Make.defs
+++ b/boards/arm/tiva/eagle100/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/tiva/ekk-lm3s9b96/scripts/Make.defs b/boards/arm/tiva/ekk-lm3s9b96/scripts/Make.defs
index 4f8f742..0bab6dd 100644
--- a/boards/arm/tiva/ekk-lm3s9b96/scripts/Make.defs
+++ b/boards/arm/tiva/ekk-lm3s9b96/scripts/Make.defs
@@ -38,7 +38,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/tiva/launchxl-cc1310/scripts/Make.defs b/boards/arm/tiva/launchxl-cc1310/scripts/Make.defs
index b23d1b1..ee6e081 100644
--- a/boards/arm/tiva/launchxl-cc1310/scripts/Make.defs
+++ b/boards/arm/tiva/launchxl-cc1310/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = flash.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
@@ -99,7 +99,7 @@ LDNXFLATFLAGS = -e main -s 2048
CMODULEFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
LDMODULEFLAGS = -r -e module_initialize
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
else
LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
diff --git a/boards/arm/tiva/launchxl-cc1312r1/scripts/Make.defs b/boards/arm/tiva/launchxl-cc1312r1/scripts/Make.defs
index 62951b2..2c7cf25 100644
--- a/boards/arm/tiva/launchxl-cc1312r1/scripts/Make.defs
+++ b/boards/arm/tiva/launchxl-cc1312r1/scripts/Make.defs
@@ -43,7 +43,7 @@ else
LDSCRIPT = sram.ld
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
@@ -103,7 +103,7 @@ LDNXFLATFLAGS = -e main -s 2048
CMODULEFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
LDMODULEFLAGS = -r -e module_initialize
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
else
LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
diff --git a/boards/arm/tiva/lm3s6432-s2e/scripts/Make.defs b/boards/arm/tiva/lm3s6432-s2e/scripts/Make.defs
index e5d36e4..711a281 100644
--- a/boards/arm/tiva/lm3s6432-s2e/scripts/Make.defs
+++ b/boards/arm/tiva/lm3s6432-s2e/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/tiva/lm3s6965-ek/kernel/Makefile b/boards/arm/tiva/lm3s6965-ek/kernel/Makefile
index 9e1441a..dee70a6 100644
--- a/boards/arm/tiva/lm3s6965-ek/kernel/Makefile
+++ b/boards/arm/tiva/lm3s6965-ek/kernel/Makefile
@@ -32,7 +32,7 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done}
USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}"
diff --git a/boards/arm/tiva/lm3s6965-ek/scripts/Make.defs b/boards/arm/tiva/lm3s6965-ek/scripts/Make.defs
index 878d99e..e92d5e8 100644
--- a/boards/arm/tiva/lm3s6965-ek/scripts/Make.defs
+++ b/boards/arm/tiva/lm3s6965-ek/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
@@ -97,7 +97,7 @@ LDNXFLATFLAGS = -e main -s 2048
CMODULEFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
LDMODULEFLAGS = -r -e module_initialize
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
else
LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
@@ -109,7 +109,7 @@ CELFFLAGS = $(CFLAGS) -mlong-calls
CXXELFFLAGS = $(CXXFLAGS) -mlong-calls
LDELFFLAGS = -r -e main
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}"
else
LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld
diff --git a/boards/arm/tiva/lm3s8962-ek/scripts/Make.defs b/boards/arm/tiva/lm3s8962-ek/scripts/Make.defs
index 0b610a3..1f90eb9 100644
--- a/boards/arm/tiva/lm3s8962-ek/scripts/Make.defs
+++ b/boards/arm/tiva/lm3s8962-ek/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/tiva/lm4f120-launchpad/scripts/Make.defs b/boards/arm/tiva/lm4f120-launchpad/scripts/Make.defs
index 7fe047e..fee3022 100644
--- a/boards/arm/tiva/lm4f120-launchpad/scripts/Make.defs
+++ b/boards/arm/tiva/lm4f120-launchpad/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/tiva/tm4c123g-launchpad/scripts/Make.defs b/boards/arm/tiva/tm4c123g-launchpad/scripts/Make.defs
index 5c249e2..d0bb956 100644
--- a/boards/arm/tiva/tm4c123g-launchpad/scripts/Make.defs
+++ b/boards/arm/tiva/tm4c123g-launchpad/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/tiva/tm4c1294-launchpad/scripts/Make.defs b/boards/arm/tiva/tm4c1294-launchpad/scripts/Make.defs
index b0721fe..51f9c94 100644
--- a/boards/arm/tiva/tm4c1294-launchpad/scripts/Make.defs
+++ b/boards/arm/tiva/tm4c1294-launchpad/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/arm/tms570/launchxl-tms57004/scripts/Make.defs b/boards/arm/tms570/launchxl-tms57004/scripts/Make.defs
index 1869f61..540aa8b 100644
--- a/boards/arm/tms570/launchxl-tms57004/scripts/Make.defs
+++ b/boards/arm/tms570/launchxl-tms57004/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-r$(DELIM)Toolch
LDSCRIPT = flash-sram.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}"
ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}"
@@ -96,7 +96,7 @@ CELFFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs
LDELFFLAGS = -r -e main
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}"
else
LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld
@@ -127,7 +127,7 @@ else
HOSTEXEEXT =
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native host tools
DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)copydir.sh
DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh
diff --git a/boards/arm/tms570/tms570ls31x-usb-kit/scripts/Make.defs b/boards/arm/tms570/tms570ls31x-usb-kit/scripts/Make.defs
index d178a12..14f3e0d 100644
--- a/boards/arm/tms570/tms570ls31x-usb-kit/scripts/Make.defs
+++ b/boards/arm/tms570/tms570ls31x-usb-kit/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-r$(DELIM)Toolch
LDSCRIPT = flash-sram.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}"
ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}"
@@ -95,7 +95,7 @@ CELFFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs
LDELFFLAGS = -r -e main
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}"
else
LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld
@@ -126,7 +126,7 @@ else
HOSTEXEEXT =
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native host tools
DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)copydir.sh
DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh
diff --git a/boards/arm/xmc4/xmc4500-relax/scripts/Make.defs b/boards/arm/xmc4/xmc4500-relax/scripts/Make.defs
index 24747d2..3652760 100644
--- a/boards/arm/xmc4/xmc4500-relax/scripts/Make.defs
+++ b/boards/arm/xmc4/xmc4500-relax/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = flash.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
@@ -99,7 +99,7 @@ LDNXFLATFLAGS = -e main -s 2048
CMODULEFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
LDMODULEFLAGS = -r -e module_initialize
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
else
LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
diff --git a/boards/arm/xmc4/xmc4700-relax/scripts/Make.defs b/boards/arm/xmc4/xmc4700-relax/scripts/Make.defs
index 2fcb81e..68d1fac 100644
--- a/boards/arm/xmc4/xmc4700-relax/scripts/Make.defs
+++ b/boards/arm/xmc4/xmc4700-relax/scripts/Make.defs
@@ -24,7 +24,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
LDSCRIPT = flash.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
@@ -84,7 +84,7 @@ LDNXFLATFLAGS = -e main -s 2048
CMODULEFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
LDMODULEFLAGS = -r -e module_initialize
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
else
LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
diff --git a/boards/avr/at32uc3/avr32dev1/scripts/Make.defs b/boards/avr/at32uc3/avr32dev1/scripts/Make.defs
index 4cb5fe7..6eddad3 100644
--- a/boards/avr/at32uc3/avr32dev1/scripts/Make.defs
+++ b/boards/avr/at32uc3/avr32dev1/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/avr/src/avr32/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/avr/at90usb/micropendous3/scripts/Make.defs b/boards/avr/at90usb/micropendous3/scripts/Make.defs
index 7038e09..73d09c7 100644
--- a/boards/avr/at90usb/micropendous3/scripts/Make.defs
+++ b/boards/avr/at90usb/micropendous3/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/avr/src/avr/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/avr/at90usb/teensy-2.0/scripts/Make.defs b/boards/avr/at90usb/teensy-2.0/scripts/Make.defs
index f0d0fae..367c0ae 100644
--- a/boards/avr/at90usb/teensy-2.0/scripts/Make.defs
+++ b/boards/avr/at90usb/teensy-2.0/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/avr/src/avr/Toolchain.defs
LDSCRIPT = flash.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/avr/atmega/amber/scripts/Make.defs b/boards/avr/atmega/amber/scripts/Make.defs
index 4b7a9e2..2952f76 100644
--- a/boards/avr/atmega/amber/scripts/Make.defs
+++ b/boards/avr/atmega/amber/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/avr/src/avr/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/avr/atmega/arduino-mega2560/scripts/Make.defs b/boards/avr/atmega/arduino-mega2560/scripts/Make.defs
index 8ca4536..0b9d270 100644
--- a/boards/avr/atmega/arduino-mega2560/scripts/Make.defs
+++ b/boards/avr/atmega/arduino-mega2560/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/avr/src/avr/Toolchain.defs
LDSCRIPT = flash.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/avr/atmega/arduino-mega2560/src/Makefile b/boards/avr/atmega/arduino-mega2560/src/Makefile
index 4c8cea3..957f7fc 100644
--- a/boards/avr/atmega/arduino-mega2560/src/Makefile
+++ b/boards/avr/atmega/arduino-mega2560/src/Makefile
@@ -56,7 +56,7 @@ ifeq ($(CONFIG_ARCH_AVR),y)
ARCH_SUBDIR = avr
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
CFLAGS += -I "${shell cygpath -w $(TOPDIR)/sched}"
CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}"
CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/common}"
diff --git a/boards/avr/atmega/moteino-mega/scripts/Make.defs b/boards/avr/atmega/moteino-mega/scripts/Make.defs
index 85c6092..b04e9e6 100644
--- a/boards/avr/atmega/moteino-mega/scripts/Make.defs
+++ b/boards/avr/atmega/moteino-mega/scripts/Make.defs
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/avr/src/avr/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/hc/m9s12/demo9s12ne64/scripts/Make.defs b/boards/hc/m9s12/demo9s12ne64/scripts/Make.defs
index e25d4c9..ec56ca9 100644
--- a/boards/hc/m9s12/demo9s12ne64/scripts/Make.defs
+++ b/boards/hc/m9s12/demo9s12ne64/scripts/Make.defs
@@ -41,7 +41,6 @@ include ${TOPDIR}/tools/Config.mk
CROSSDEV = m9s12x-nuttx-elf-
MAXOPTIMIZATION = -Os
-WINTOOL = n
ifeq ($(CONFIG_HCS12_NONBANKED),y)
ARCHCPUFLAGS = -m9s12x -mshort -mnolong-calls
@@ -55,7 +54,7 @@ ifneq ($(CONFIG_HCS12_MSOFTREGS),0)
ARCHCPUFLAGS += -msoft-reg-count=$(CONFIG_HCS12_MSOFTREGS)
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/hc/m9s12/ne64badge/scripts/Make.defs b/boards/hc/m9s12/ne64badge/scripts/Make.defs
index e189712..f43f709 100644
--- a/boards/hc/m9s12/ne64badge/scripts/Make.defs
+++ b/boards/hc/m9s12/ne64badge/scripts/Make.defs
@@ -41,7 +41,6 @@ include ${TOPDIR}/tools/Config.mk
CROSSDEV = m9s12x-nuttx-elf-
MAXOPTIMIZATION = -Os
-WINTOOL = n
ifeq ($(CONFIG_HCS12_NONBANKED),y)
ARCHCPUFLAGS = -m9s12x -mshort -mnolong-calls
@@ -55,7 +54,7 @@ ifneq ($(CONFIG_HCS12_MSOFTREGS),0)
ARCHCPUFLAGS += -msoft-reg-count=$(CONFIG_HCS12_MSOFTREGS)
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/mips/pic32mx/mirtoo/scripts/Make.defs b/boards/mips/pic32mx/mirtoo/scripts/Make.defs
index 84ffc39..cd11f7d 100644
--- a/boards/mips/pic32mx/mirtoo/scripts/Make.defs
+++ b/boards/mips/pic32mx/mirtoo/scripts/Make.defs
@@ -38,7 +38,7 @@ include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/tools/pic32/Config.mk
include ${TOPDIR}/arch/mips/src/mips32/Toolchain.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/mips/pic32mx/pic32mx-starterkit/scripts/Make.defs b/boards/mips/pic32mx/pic32mx-starterkit/scripts/Make.defs
index 99652ea..d3f444c 100644
--- a/boards/mips/pic32mx/pic32mx-starterkit/scripts/Make.defs
+++ b/boards/mips/pic32mx/pic32mx-starterkit/scripts/Make.defs
@@ -54,7 +54,7 @@ ifeq ($(CONFIG_MIPS32_TOOLCHAIN_MICROCHIPW_LITE),y)
LDSCRIPT = c32-release.ld
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/mips/pic32mx/pic32mx7mmb/scripts/Make.defs b/boards/mips/pic32mx/pic32mx7mmb/scripts/Make.defs
index 5eca3cf..08d9dd0 100644
--- a/boards/mips/pic32mx/pic32mx7mmb/scripts/Make.defs
+++ b/boards/mips/pic32mx/pic32mx7mmb/scripts/Make.defs
@@ -54,7 +54,7 @@ ifeq ($(CONFIG_MIPS32_TOOLCHAIN_MICROCHIPW_LITE),y)
LDSCRIPT = c32-release.ld
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/mips/pic32mx/sure-pic32mx/scripts/Make.defs b/boards/mips/pic32mx/sure-pic32mx/scripts/Make.defs
index 7b93f25..b62e20f 100644
--- a/boards/mips/pic32mx/sure-pic32mx/scripts/Make.defs
+++ b/boards/mips/pic32mx/sure-pic32mx/scripts/Make.defs
@@ -54,7 +54,7 @@ ifeq ($(CONFIG_MIPS32_TOOLCHAIN_MICROCHIPW_LITE),y)
LDSCRIPT = c32-release.ld
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/mips/pic32mx/ubw32/scripts/Make.defs b/boards/mips/pic32mx/ubw32/scripts/Make.defs
index f03f2cd..792bd32 100644
--- a/boards/mips/pic32mx/ubw32/scripts/Make.defs
+++ b/boards/mips/pic32mx/ubw32/scripts/Make.defs
@@ -54,7 +54,7 @@ ifeq ($(CONFIG_MIPS32_TOOLCHAIN_MICROCHIPW_LITE),y)
LDSCRIPT = c32-release.ld
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/mips/pic32mz/flipnclick-pic32mz/scripts/Make.defs b/boards/mips/pic32mz/flipnclick-pic32mz/scripts/Make.defs
index 59eefc3..8810b7a 100644
--- a/boards/mips/pic32mz/flipnclick-pic32mz/scripts/Make.defs
+++ b/boards/mips/pic32mz/flipnclick-pic32mz/scripts/Make.defs
@@ -64,7 +64,7 @@ ifeq ($(CONFIG_MIPS32_TOOLCHAIN_MICROCHIPW_LITE),y)
LDSCRIPT = c32-debug.ld
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/mips/pic32mz/pic32mz-starterkit/scripts/Make.defs b/boards/mips/pic32mz/pic32mz-starterkit/scripts/Make.defs
index fb67cfa..98b3698 100644
--- a/boards/mips/pic32mz/pic32mz-starterkit/scripts/Make.defs
+++ b/boards/mips/pic32mz/pic32mz-starterkit/scripts/Make.defs
@@ -64,7 +64,7 @@ ifeq ($(CONFIG_MIPS32_TOOLCHAIN_MICROCHIPW_LITE),y)
LDSCRIPT = c32-debug.ld
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/misoc/lm32/misoc/scripts/Make.defs b/boards/misoc/lm32/misoc/scripts/Make.defs
index fdccf81..9f0a075 100644
--- a/boards/misoc/lm32/misoc/scripts/Make.defs
+++ b/boards/misoc/lm32/misoc/scripts/Make.defs
@@ -46,7 +46,7 @@ ifeq ($(CONFIG_ARCH_CHIP_MINERVA),y)
LDSCRIPT=minerva.ld
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/or1k/mor1kx/or1k/scripts/Make.defs b/boards/or1k/mor1kx/or1k/scripts/Make.defs
index 0127e00..6edf44f 100644
--- a/boards/or1k/mor1kx/or1k/scripts/Make.defs
+++ b/boards/or1k/mor1kx/or1k/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/or1k/src/mor1kx/Toolchain.defs
LDSCRIPT = flash.ld
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
@@ -112,7 +112,7 @@ else
HOSTEXEEXT =
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native host tools
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/renesas/rx65n/rx65n-grrose/scripts/Make.defs b/boards/renesas/rx65n/rx65n-grrose/scripts/Make.defs
index 14d1b3f..fdac443 100644
--- a/boards/renesas/rx65n/rx65n-grrose/scripts/Make.defs
+++ b/boards/renesas/rx65n/rx65n-grrose/scripts/Make.defs
@@ -44,8 +44,7 @@ ifneq ($(CONFIG_DEBUG_NOOPT),y)
ARCHOPTIMIZATION += -Os -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
endif
-ifeq ($(CONFIG_HOST_WINDOWS),y)
-WINTOOL=y
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
MKDEP = $(TOPDIR)/tools/mkwindeps.sh
@@ -93,7 +92,7 @@ NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel
LDNXFLATFLAGS = -e main -s 2048
LDMODULEFLAGS = -r -e module_initialize
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
else
LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
diff --git a/boards/renesas/rx65n/rx65n-rsk1mb/scripts/Make.defs b/boards/renesas/rx65n/rx65n-rsk1mb/scripts/Make.defs
index d7ee3c3..edae976 100644
--- a/boards/renesas/rx65n/rx65n-rsk1mb/scripts/Make.defs
+++ b/boards/renesas/rx65n/rx65n-rsk1mb/scripts/Make.defs
@@ -46,8 +46,7 @@ ifneq ($(CONFIG_DEBUG_NOOPT),y)
ARCHOPTIMIZATION += -Os -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
endif
-ifeq ($(CONFIG_HOST_WINDOWS),y)
-WINTOOL=y
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
MKDEP = $(TOPDIR)/tools/mkwindeps.sh
@@ -96,7 +95,7 @@ NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel
LDNXFLATFLAGS = -e main -s 2048
LDMODULEFLAGS = -r -e module_initialize
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
else
LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
diff --git a/boards/renesas/rx65n/rx65n-rsk2mb/scripts/Make.defs b/boards/renesas/rx65n/rx65n-rsk2mb/scripts/Make.defs
index 0465e65..7cbb106 100644
--- a/boards/renesas/rx65n/rx65n-rsk2mb/scripts/Make.defs
+++ b/boards/renesas/rx65n/rx65n-rsk2mb/scripts/Make.defs
@@ -46,8 +46,7 @@ ifneq ($(CONFIG_DEBUG_NOOPT),y)
ARCHOPTIMIZATION += -Os -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
endif
-ifeq ($(CONFIG_HOST_WINDOWS),y)
-WINTOOL=y
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
MKDEP = $(TOPDIR)/tools/mkwindeps.sh
@@ -96,7 +95,7 @@ NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel
LDNXFLATFLAGS = -e main -s 2048
LDMODULEFLAGS = -r -e module_initialize
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
else
LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
diff --git a/boards/renesas/rx65n/rx65n/scripts/Make.defs b/boards/renesas/rx65n/rx65n/scripts/Make.defs
index a0f8329..aefa11d 100644
--- a/boards/renesas/rx65n/rx65n/scripts/Make.defs
+++ b/boards/renesas/rx65n/rx65n/scripts/Make.defs
@@ -44,8 +44,7 @@ ifneq ($(CONFIG_DEBUG_NOOPT),y)
ARCHOPTIMIZATION += -Os -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
endif
-ifeq ($(CONFIG_HOST_WINDOWS),y)
-WINTOOL=y
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
MKDEP = $(TOPDIR)/tools/mkwindeps.sh
@@ -93,7 +92,7 @@ NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel
LDNXFLATFLAGS = -e main -s 2048
LDMODULEFLAGS = -r -e module_initialize
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
else
LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
diff --git a/boards/risc-v/fe310/hifive1-revb/scripts/Make.defs b/boards/risc-v/fe310/hifive1-revb/scripts/Make.defs
index 776a24b..63cd385 100644
--- a/boards/risc-v/fe310/hifive1-revb/scripts/Make.defs
+++ b/boards/risc-v/fe310/hifive1-revb/scripts/Make.defs
@@ -43,7 +43,7 @@ else
LDSCRIPT = ld.script
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/risc-v/gap8/gapuino/scripts/Make.defs b/boards/risc-v/gap8/gapuino/scripts/Make.defs
index 28c5a8f..8744f38 100644
--- a/boards/risc-v/gap8/gapuino/scripts/Make.defs
+++ b/boards/risc-v/gap8/gapuino/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/risc-v/src/rv32im/Toolchain.defs
LDSCRIPT = ld.script
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/risc-v/k210/maix-bit/kernel/Makefile b/boards/risc-v/k210/maix-bit/kernel/Makefile
index 94d3b1f..0ef0f4e 100644
--- a/boards/risc-v/k210/maix-bit/kernel/Makefile
+++ b/boards/risc-v/k210/maix-bit/kernel/Makefile
@@ -32,7 +32,7 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
# Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done}
USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}"
diff --git a/boards/risc-v/k210/maix-bit/scripts/Make.defs b/boards/risc-v/k210/maix-bit/scripts/Make.defs
index a02146a..9a2abe7 100644
--- a/boards/risc-v/k210/maix-bit/scripts/Make.defs
+++ b/boards/risc-v/k210/maix-bit/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/risc-v/src/rv64gc/Toolchain.defs
LDSCRIPT = ld.script
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
@@ -105,7 +105,7 @@ LDNXFLATFLAGS = -e main -s 2048
CMODULEFLAGS = $(CFLAGS)
LDMODULEFLAGS = -r -e module_initialize
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
else
LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
@@ -117,7 +117,7 @@ CELFFLAGS = $(CFLAGS)
CXXELFFLAGS = $(CXXFLAGS)
LDELFFLAGS = -r -e main
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}"
else
LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld
diff --git a/boards/risc-v/litex/arty_a7/scripts/Make.defs b/boards/risc-v/litex/arty_a7/scripts/Make.defs
index 88f21f3..6d42acb 100644
--- a/boards/risc-v/litex/arty_a7/scripts/Make.defs
+++ b/boards/risc-v/litex/arty_a7/scripts/Make.defs
@@ -24,7 +24,7 @@ include ${TOPDIR}/arch/risc-v/src/rv32im/Toolchain.defs
LDSCRIPT = ld.script
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/risc-v/nr5m100/nr5m100-nexys4/scripts/Make.defs b/boards/risc-v/nr5m100/nr5m100-nexys4/scripts/Make.defs
index 3e44d25..5fc7212 100644
--- a/boards/risc-v/nr5m100/nr5m100-nexys4/scripts/Make.defs
+++ b/boards/risc-v/nr5m100/nr5m100-nexys4/scripts/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/risc-v/src/rv32im/Toolchain.defs
LDSCRIPT = ld.script
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/sim/sim/sim/configs/cxxtest/Make.defs b/boards/sim/sim/sim/configs/cxxtest/Make.defs
index 165073a..7d01621 100644
--- a/boards/sim/sim/sim/configs/cxxtest/Make.defs
+++ b/boards/sim/sim/sim/configs/cxxtest/Make.defs
@@ -85,7 +85,7 @@ CMODULEFLAGS = $(CFLAGS)
CMODULEFLAGS += -fno-pic
LDMODULEFLAGS = -r -e module_initialize
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
else
LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
@@ -113,7 +113,7 @@ CELFFLAGS += -fno-pic
CXXELFFLAGS += -fno-pic
LDELFFLAGS = -r -e main
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}"
else
LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld
diff --git a/boards/sim/sim/sim/scripts/Make.defs b/boards/sim/sim/sim/scripts/Make.defs
index ebf091b..d3f08fb 100644
--- a/boards/sim/sim/sim/scripts/Make.defs
+++ b/boards/sim/sim/sim/scripts/Make.defs
@@ -87,7 +87,7 @@ CMODULEFLAGS = $(CFLAGS)
CMODULEFLAGS += -fno-pic
LDMODULEFLAGS = -r -e module_initialize
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
else
LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
@@ -115,7 +115,7 @@ CELFFLAGS += -fno-pic
CXXELFFLAGS += -fno-pic
LDELFFLAGS = -r -e main
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}"
else
LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld
diff --git a/boards/x86/qemu/qemu-i486/scripts/Make.defs b/boards/x86/qemu/qemu-i486/scripts/Make.defs
index 3690f34..c000f41 100644
--- a/boards/x86/qemu/qemu-i486/scripts/Make.defs
+++ b/boards/x86/qemu/qemu-i486/scripts/Make.defs
@@ -46,7 +46,7 @@ ifneq ($(CONFIG_DEBUG_NOOPT),y)
ARCHOPTIMIZATION += -O2
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/x86_64/intel64/qemu-intel64/scripts/Make.defs b/boards/x86_64/intel64/qemu-intel64/scripts/Make.defs
index 159d34b..51abe9e 100644
--- a/boards/x86_64/intel64/qemu-intel64/scripts/Make.defs
+++ b/boards/x86_64/intel64/qemu-intel64/scripts/Make.defs
@@ -32,7 +32,7 @@ ifneq ($(CONFIG_DEBUG_NOOPT),y)
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
diff --git a/boards/xtensa/esp32/esp32-core/scripts/Make.defs b/boards/xtensa/esp32/esp32-core/scripts/Make.defs
index 44b3ad1..b82e0ea 100644
--- a/boards/xtensa/esp32/esp32-core/scripts/Make.defs
+++ b/boards/xtensa/esp32/esp32-core/scripts/Make.defs
@@ -48,7 +48,7 @@ else
LDSCRIPT2 = $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/esp32_flash.ld
endif
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
@@ -108,7 +108,7 @@ LDNXFLATFLAGS = -e main -s 2048
CMODULEFLAGS = $(CFLAGS) -mtext-section-literals
LDMODULEFLAGS = -r -e module_initialize
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
else
LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
@@ -120,7 +120,7 @@ CELFFLAGS = $(CFLAGS) -mtext-section-literals
CXXELFFLAGS = $(CXXFLAGS) -mtext-section-literals
LDELFFLAGS = -r -e main
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}"
else
LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld
diff --git a/boards/z80/z180/p112/scripts/Make.defs b/boards/z80/z180/p112/scripts/Make.defs
index 4057146..1bca80a 100644
--- a/boards/z80/z180/p112/scripts/Make.defs
+++ b/boards/z80/z180/p112/scripts/Make.defs
@@ -160,7 +160,7 @@ else
# SDCC for Linux, macOS, or Cygwin understands symbolic links. Windows SDCC
# running under Cygwin does not
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)copydir.sh
else
DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)link.sh
diff --git a/boards/z80/z80/z80sim/scripts/Make.defs b/boards/z80/z80/z80sim/scripts/Make.defs
index bf1aa77..21b97ba 100644
--- a/boards/z80/z80/z80sim/scripts/Make.defs
+++ b/boards/z80/z80/z80sim/scripts/Make.defs
@@ -152,7 +152,7 @@ else
# This is the tool to use for dependencies
- ifeq ($(WINTOOL),y)
+ ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkwindeps.sh
else
MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
@@ -161,7 +161,7 @@ else
# SDCC for Linux, macOS, or Cygwin understands symbolic links. Windows SDCC
# running under Cygwin does not
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)copydir.sh
else
DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)link.sh
diff --git a/drivers/Makefile b/drivers/Makefile
index 3e355c5..c1fe761 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -36,7 +36,7 @@
-include $(TOPDIR)/Make.defs
DELIM ?= $(strip /)
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
INCDIROPT = -w
endif
diff --git a/graphics/Makefile b/graphics/Makefile
index 704a7ba..0602964 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -38,7 +38,7 @@
DEPPATH = --dep-path .
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
INCDIROPT = -w
endif
diff --git a/libs/libc/zoneinfo/Makefile b/libs/libc/zoneinfo/Makefile
index 59d0491..bd0f6bd 100644
--- a/libs/libc/zoneinfo/Makefile
+++ b/libs/libc/zoneinfo/Makefile
@@ -36,7 +36,7 @@
-include $(TOPDIR)/.config
-include $(TOPDIR)/Make.defs
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
INCDIROPT = -w
endif
diff --git a/pass1/Makefile b/pass1/Makefile
index 5eaacb8..49e0456 100644
--- a/pass1/Makefile
+++ b/pass1/Makefile
@@ -36,7 +36,7 @@
-include $(TOPDIR)/Make.defs
DELIM ?= $(strip /)
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
INCDIROPT = -w
endif
diff --git a/tools/Makefile.export b/tools/Makefile.export
index 25db226..156b4b9 100644
--- a/tools/Makefile.export
+++ b/tools/Makefile.export
@@ -41,7 +41,7 @@ ifdef ARCHSCRIPT
# ARCHSCRIPT may contain a leading -T; it must not be followed by a space
# for this to work.
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
LDPATH = $(shell cygpath -u $(patsubst -T%,%,$(ARCHSCRIPT)))
else
LDPATH = $(patsubst -T%,%,$(ARCHSCRIPT))
@@ -74,7 +74,6 @@ endif
@echo "ARCHWARNINGS=\"$(ARCHWARNINGS)\"" >> $(EXPORTDIR)/makeinfo.sh
@echo "ARCHWARNINGSXX=\"$(ARCHWARNINGSXX)\"" >> $(EXPORTDIR)/makeinfo.sh
@echo "ARCHOPTIMIZATION=\"$(ARCHOPTIMIZATION)\"" >> $(EXPORTDIR)/makeinfo.sh
- @echo "WINTOOL=\"$(WINTOOL)\"" >> $(EXPORTDIR)/makeinfo.sh
@echo "CROSSDEV=\"$(CROSSDEV)\"" >> $(EXPORTDIR)/makeinfo.sh
@echo "CC=\"$(CC)\"" >> $(EXPORTDIR)/makeinfo.sh
@echo "CXX=\"$(CXX)\"" >> $(EXPORTDIR)/makeinfo.sh
diff --git a/tools/Makefile.unix b/tools/Makefile.unix
index e99c4cf..c477d53 100644
--- a/tools/Makefile.unix
+++ b/tools/Makefile.unix
@@ -163,7 +163,7 @@ LINKLIBS = $(patsubst staging/%,%,$(NUTTXLIBS))
# Export tool definitions
MKEXPORT= tools/mkexport.sh
-MKEXPORT_ARGS = -w$(WINTOOL) -t "$(TOPDIR)"
+MKEXPORT_ARGS = -w$(CONFIG_CYGWIN_WINTOOL) -t "$(TOPDIR)"
ifneq ($(CONFIG_BUILD_FLAT),y)
MKEXPORT_ARGS += -u
diff --git a/tools/Makefile.win b/tools/Makefile.win
index 8c30247..d190209 100644
--- a/tools/Makefile.win
+++ b/tools/Makefile.win
@@ -145,7 +145,7 @@ LINKLIBS = $(patsubst staging\\%,%,$(NUTTXLIBS))
# Export tool definitions
MKEXPORT = tools\mkexport.bat
-MKEXPORT_ARGS = -w$(WINTOOL) -t "$(TOPDIR)"
+MKEXPORT_ARGS = -w$(CONFIG_CYGWIN_WINTOOL) -t "$(TOPDIR)"
ifneq ($(CONFIG_BUILD_FLAT),y)
MKEXPORT_ARGS += -u
@@ -554,7 +554,7 @@ savedefconfig: dirlinks apps_preconfig
# that the archiver is 'ar'
export: pass2deps
- $(Q) $(MKEXPORT) $(MKEXPORT_ARGS) -w$(WINTOOL) -t "$(TOPDIR)" -l "$(EXPORTLIBS)"
+ $(Q) $(MKEXPORT) $(MKEXPORT_ARGS) -l "$(EXPORTLIBS)"
# General housekeeping targets: dependencies, cleaning, etc.
#
diff --git a/tools/mkexport.sh b/tools/mkexport.sh
index 0d78344..e354d41 100755
--- a/tools/mkexport.sh
+++ b/tools/mkexport.sh
@@ -173,9 +173,10 @@ fi
cp -a "${TOPDIR}/.config" "${EXPORTDIR}/.config" ||
{ echo "MK: Failed to copy ${TOPDIR}/.config to ${EXPORTDIR}/.config"; exit 1; }
-# Copy the Make.defs files, but disable windows path conversions
+# Copy the Make.defs files
-grep -v "WINTOOL[ \t]*=[ \t]y" "${TOPDIR}/Make.defs" > "${EXPORTDIR}/Make.defs"
+cp -a "${TOPDIR}/Make.defs" "${EXPORTDIR}/Make.defs" ||
+ { echo "MK: Failed to copy ${TOPDIR}/Make.defs to ${EXPORTDIR}/Make.defs"; exit 1; }
# Extract information from the Make.defs file. A Makefile can do this best
@@ -233,7 +234,6 @@ echo "ARCHPICFLAGS = ${ARCHPICFLAGS}" >>"${EXPORTDIR}/scripts/Make.defs"
echo "ARCHWARNINGS = ${ARCHWARNINGS}" >>"${EXPORTDIR}/scripts/Make.defs"
echo "ARCHWARNINGSXX = ${ARCHWARNINGSXX}" >>"${EXPORTDIR}/scripts/Make.defs"
echo "ARCHOPTIMIZATION = ${ARCHOPTIMIZATION}" >>"${EXPORTDIR}/scripts/Make.defs"
-echo "WINTOOL = ${WINTOOL}" >>"${EXPORTDIR}/scripts/Make.defs"
echo "CROSSDEV = ${CROSSDEV}" >>"${EXPORTDIR}/scripts/Make.defs"
echo "CC = ${CC}" >>"${EXPORTDIR}/scripts/Make.defs"
echo "CXX = ${CXX}" >>"${EXPORTDIR}/scripts/Make.defs"
diff --git a/wireless/Makefile b/wireless/Makefile
index 2c85594..7dc9bb5 100644
--- a/wireless/Makefile
+++ b/wireless/Makefile
@@ -36,7 +36,7 @@
-include $(TOPDIR)/Make.defs
DELIM ?= $(strip /)
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
INCDIROPT = -w
endif