From bd656888f26c92e8832f0e76b395a5ece7704530 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Mon, 18 May 2020 22:18:15 +0800 Subject: [PATCH] build: Replace WINTOOL with CYGWIN_WINTOOL Kconfig so the correct value can be determinated by Kconfig system automatically Signed-off-by: Xiang Xiao --- 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 +- .../am335x/beaglebone-black/scripts/Make.defs | 2 +- boards/arm/c5471/c5471evm/scripts/Make.defs | 2 +- .../arm/cxd56xx/spresense/scripts/Make.defs | 8 ++-- .../arm/dm320/ntosd-dm320/scripts/Make.defs | 2 +- .../efm32/efm32-g8xx-stk/scripts/Make.defs | 2 +- .../efm32/efm32gg-stk3700/scripts/Make.defs | 2 +- .../scripts/Make.defs | 2 +- boards/arm/imx6/sabre-6quad/scripts/Make.defs | 6 +-- .../arm/imxrt/imxrt1020-evk/scripts/Make.defs | 4 +- .../imxrt1050-evk/configs/knsh/Make.defs | 4 +- .../configs/libcxxtest/Make.defs | 4 +- .../arm/imxrt/imxrt1050-evk/kernel/Makefile | 2 +- .../arm/imxrt/imxrt1050-evk/scripts/Make.defs | 4 +- .../imxrt1060-evk/configs/knsh/Make.defs | 4 +- .../configs/libcxxtest/Make.defs | 4 +- .../arm/imxrt/imxrt1060-evk/kernel/Makefile | 2 +- .../arm/imxrt/imxrt1060-evk/scripts/Make.defs | 6 +-- .../kinetis/freedom-k28f/scripts/Make.defs | 2 +- .../kinetis/freedom-k64f/scripts/Make.defs | 2 +- .../kinetis/freedom-k66f/scripts/Make.defs | 2 +- .../kinetis/kwikstik-k40/scripts/Make.defs | 2 +- .../arm/kinetis/teensy-3.x/scripts/Make.defs | 2 +- .../arm/kinetis/twr-k60n512/scripts/Make.defs | 2 +- .../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 +- .../lc823450/lc823450-xgevk/kernel/Makefile | 2 +- .../lc823450/lc823450-xgevk/scripts/Make.defs | 6 +-- .../lpc17xx_40xx/lincoln60/scripts/Make.defs | 2 +- .../lpc4088-devkit/configs/knsh/Make.defs | 2 +- .../lpc4088-devkit/kernel/Makefile | 2 +- .../lpc4088-devkit/scripts/Make.defs | 2 +- .../lpc4088-quickstart/configs/knsh/Make.defs | 2 +- .../lpc4088-quickstart/kernel/Makefile | 2 +- .../lpc4088-quickstart/scripts/Make.defs | 2 +- .../configs/thttpd/Make.defs | 2 +- .../lpcxpresso-lpc1768/scripts/Make.defs | 2 +- .../arm/lpc17xx_40xx/lx_cpu/scripts/Make.defs | 6 +-- .../arm/lpc17xx_40xx/mbed/scripts/Make.defs | 2 +- .../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 +- .../open1788/configs/knsh/Make.defs | 2 +- .../open1788/configs/knxterm/Make.defs | 2 +- .../arm/lpc17xx_40xx/open1788/kernel/Makefile | 2 +- .../lpc17xx_40xx/open1788/scripts/Make.defs | 2 +- .../pnev5180b/configs/knsh/Make.defs | 2 +- .../lpc17xx_40xx/pnev5180b/kernel/Makefile | 2 +- .../lpc17xx_40xx/pnev5180b/scripts/Make.defs | 2 +- .../u-blox-c027/scripts/Make.defs | 2 +- .../zkit-arm-1769/scripts/Make.defs | 2 +- .../lpc214x/mcu123-lpc214x/scripts/Make.defs | 2 +- boards/arm/lpc214x/zp214xpa/scripts/Make.defs | 2 +- .../lpc2378/olimex-lpc2378/scripts/Make.defs | 2 +- .../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 +- .../olimex-lpc-h3131/scripts/Make.defs | 2 +- .../bambino-200e/configs/netnsh/Make.defs | 2 +- .../arm/lpc43xx/bambino-200e/kernel/Makefile | 2 +- .../lpc43xx/bambino-200e/scripts/Make.defs | 2 +- .../lpc43xx/lpc4330-xplorer/scripts/Make.defs | 2 +- .../arm/lpc43xx/lpc4337-ws/scripts/Make.defs | 2 +- .../arm/lpc43xx/lpc4357-evb/scripts/Make.defs | 2 +- .../lpc43xx/lpc4370-link2/scripts/Make.defs | 2 +- .../lpcxpresso-lpc54628/scripts/Make.defs | 2 +- .../max326xx/max32660-evsys/scripts/Make.defs | 4 +- boards/arm/moxart/moxa/scripts/Make.defs | 2 +- .../arm/nrf52/nrf52-feather/scripts/Make.defs | 2 +- .../arm/nrf52/nrf52832-dk/scripts/Make.defs | 2 +- .../arm/nrf52/nrf52840-dk/scripts/Make.defs | 2 +- .../nrf52/nrf52840-dongle/scripts/Make.defs | 2 +- .../nuc1xx/nutiny-nuc120/scripts/Make.defs | 4 +- .../rddrone-uavcan144/scripts/Make.defs | 4 +- .../rddrone-uavcan146/scripts/Make.defs | 4 +- .../arm/s32k1xx/s32k118evb/scripts/Make.defs | 4 +- .../arm/s32k1xx/s32k144evb/scripts/Make.defs | 4 +- .../arm/s32k1xx/s32k146evb/scripts/Make.defs | 4 +- .../arm/s32k1xx/s32k148evb/scripts/Make.defs | 4 +- .../arm/sam34/arduino-due/scripts/Make.defs | 2 +- .../sam34/flipnclick-sam3x/scripts/Make.defs | 2 +- .../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 +- .../sam34/sam4l-xplained/scripts/Make.defs | 2 +- .../sam4s-xplained-pro/scripts/Make.defs | 2 +- .../sam34/sam4s-xplained/scripts/Make.defs | 2 +- .../arm/sama5/sama5d2-xult/scripts/Make.defs | 6 +-- .../sama5/sama5d3-xplained/scripts/Make.defs | 6 +-- .../arm/sama5/sama5d3x-ek/scripts/Make.defs | 6 +-- .../sama5/sama5d4-ek/configs/knsh/Make.defs | 6 +-- boards/arm/sama5/sama5d4-ek/scripts/Make.defs | 6 +-- .../arm/samd2l2/arduino-m0/scripts/Make.defs | 4 +- .../samd2l2/samd20-xplained/scripts/Make.defs | 4 +- .../samd2l2/samd21-xplained/scripts/Make.defs | 4 +- .../samd2l2/saml21-xplained/scripts/Make.defs | 4 +- boards/arm/samd5e5/metro-m4/scripts/Make.defs | 4 +- .../same54-xplained-pro/scripts/Make.defs | 4 +- .../arm/samv7/same70-xplained/kernel/Makefile | 2 +- .../samv7/same70-xplained/scripts/Make.defs | 4 +- .../samv7/samv71-xult/configs/knsh/Make.defs | 4 +- boards/arm/samv7/samv71-xult/kernel/Makefile | 2 +- .../arm/samv7/samv71-xult/scripts/Make.defs | 4 +- boards/arm/stm32/axoloti/scripts/Make.defs | 6 +-- .../arm/stm32/clicker2-stm32/kernel/Makefile | 2 +- .../stm32/clicker2-stm32/scripts/Make.defs | 4 +- boards/arm/stm32/cloudctrl/scripts/Make.defs | 2 +- .../arm/stm32/fire-stm32v2/scripts/Make.defs | 2 +- .../arm/stm32/hymini-stm32v/scripts/Make.defs | 2 +- boards/arm/stm32/maple/scripts/Make.defs | 2 +- .../arm/stm32/mikroe-stm32f4/kernel/Makefile | 2 +- .../stm32/mikroe-stm32f4/scripts/Make.defs | 2 +- .../arm/stm32/nucleo-f103rb/scripts/Make.defs | 2 +- .../arm/stm32/nucleo-f207zg/scripts/Make.defs | 2 +- .../arm/stm32/nucleo-f302r8/scripts/Make.defs | 2 +- .../arm/stm32/nucleo-f303re/scripts/Make.defs | 2 +- .../arm/stm32/nucleo-f303ze/scripts/Make.defs | 2 +- .../arm/stm32/nucleo-f334r8/scripts/Make.defs | 2 +- .../arm/stm32/nucleo-f410rb/scripts/Make.defs | 2 +- .../arm/stm32/nucleo-f429zi/scripts/Make.defs | 2 +- .../arm/stm32/nucleo-f446re/scripts/Make.defs | 2 +- .../arm/stm32/nucleo-f4x1re/scripts/Make.defs | 2 +- .../arm/stm32/nucleo-l152re/scripts/Make.defs | 2 +- .../stm32/olimex-stm32-e407/scripts/Make.defs | 2 +- .../stm32/olimex-stm32-h405/scripts/Make.defs | 2 +- .../stm32/olimex-stm32-h407/scripts/Make.defs | 2 +- .../stm32/olimex-stm32-p107/scripts/Make.defs | 2 +- .../stm32/olimex-stm32-p207/scripts/Make.defs | 2 +- .../olimex-stm32-p407/configs/kelf/Make.defs | 6 +-- .../configs/kmodule/Make.defs | 6 +-- .../olimex-stm32-p407/configs/knsh/Make.defs | 4 +- .../stm32/olimex-stm32-p407/kernel/Makefile | 2 +- .../stm32/olimex-stm32-p407/scripts/Make.defs | 4 +- .../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 +- .../arm/stm32/stm3210e-eval/scripts/Make.defs | 2 +- .../arm/stm32/stm3220g-eval/scripts/Make.defs | 2 +- .../stm3240g-eval/configs/knxwm/Make.defs | 2 +- .../arm/stm32/stm3240g-eval/kernel/Makefile | 2 +- .../arm/stm32/stm3240g-eval/scripts/Make.defs | 2 +- boards/arm/stm32/stm32_tiny/scripts/Make.defs | 2 +- .../stm32/stm32butterfly2/scripts/Make.defs | 2 +- .../stm32/stm32f103-minimum/scripts/Make.defs | 2 +- .../stm32/stm32f334-disco/scripts/Make.defs | 2 +- .../stm32/stm32f3discovery/scripts/Make.defs | 2 +- .../stm32/stm32f411e-disco/scripts/Make.defs | 2 +- .../stm32/stm32f429i-disco/scripts/Make.defs | 2 +- .../configs/cxxtest/Make.defs | 2 +- .../stm32f4discovery/configs/elf/Make.defs | 4 +- .../configs/posix_spawn/Make.defs | 4 +- .../configs/testlibcxx/Make.defs | 2 +- .../stm32/stm32f4discovery/kernel/Makefile | 2 +- .../stm32/stm32f4discovery/scripts/Make.defs | 6 +-- .../stm32/stm32ldiscovery/scripts/Make.defs | 2 +- .../stm32/stm32vldiscovery/scripts/Make.defs | 2 +- .../viewtool-stm32f107/scripts/Make.defs | 2 +- .../b-l072z-lrwan1/scripts/Make.defs | 2 +- .../nucleo-f072rb/scripts/Make.defs | 2 +- .../nucleo-f091rc/scripts/Make.defs | 2 +- .../nucleo-g070rb/scripts/Make.defs | 2 +- .../nucleo-g071rb/scripts/Make.defs | 2 +- .../nucleo-l073rz/scripts/Make.defs | 2 +- .../stm32f051-discovery/scripts/Make.defs | 2 +- .../stm32f072-discovery/scripts/Make.defs | 2 +- .../nucleo-144/configs/f722-nsh/Make.defs | 2 +- .../nucleo-144/configs/f746-evalos/Make.defs | 2 +- .../nucleo-144/configs/f746-nsh/Make.defs | 2 +- .../nucleo-144/configs/f767-evalos/Make.defs | 2 +- .../nucleo-144/configs/f767-netnsh/Make.defs | 2 +- .../nucleo-144/configs/f767-nsh/Make.defs | 2 +- .../stm32f7/stm32f746-ws/scripts/Make.defs | 2 +- .../stm32f7/stm32f746g-disco/kernel/Makefile | 2 +- .../stm32f746g-disco/scripts/Make.defs | 4 +- .../stm32f7/stm32f769i-disco/kernel/Makefile | 2 +- .../stm32f769i-disco/scripts/Make.defs | 2 +- .../arm/stm32h7/nucleo-h743zi/kernel/Makefile | 2 +- .../stm32h7/nucleo-h743zi/scripts/Make.defs | 2 +- .../stm32h7/stm32h747i-disco/kernel/Makefile | 2 +- .../stm32h747i-disco/scripts/Make.defs | 2 +- .../stm32l4/b-l475e-iot01a/scripts/Make.defs | 2 +- .../stm32l4/nucleo-l432kc/scripts/Make.defs | 2 +- .../stm32l4/nucleo-l452re/scripts/Make.defs | 2 +- .../stm32l4/nucleo-l476rg/scripts/Make.defs | 2 +- .../stm32l4/nucleo-l496zg/scripts/Make.defs | 2 +- .../stm32l4/stm32l476-mdk/scripts/Make.defs | 2 +- .../stm32l476vg-disco/configs/knsh/Make.defs | 2 +- .../stm32l4/stm32l476vg-disco/kernel/Makefile | 2 +- .../stm32l476vg-disco/scripts/Make.defs | 2 +- .../stm32l4r9ai-disco/configs/knsh/Make.defs | 2 +- .../stm32l4/stm32l4r9ai-disco/kernel/Makefile | 2 +- .../stm32l4r9ai-disco/scripts/Make.defs | 2 +- .../str71x/olimex-strp711/scripts/Make.defs | 2 +- boards/arm/tiva/dk-tm4c129x/scripts/Make.defs | 2 +- boards/arm/tiva/eagle100/scripts/Make.defs | 2 +- .../arm/tiva/ekk-lm3s9b96/scripts/Make.defs | 2 +- .../tiva/launchxl-cc1310/scripts/Make.defs | 4 +- .../tiva/launchxl-cc1312r1/scripts/Make.defs | 4 +- .../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 +- .../tiva/lm4f120-launchpad/scripts/Make.defs | 2 +- .../tiva/tm4c123g-launchpad/scripts/Make.defs | 2 +- .../tiva/tm4c1294-launchpad/scripts/Make.defs | 2 +- .../launchxl-tms57004/scripts/Make.defs | 6 +-- .../tms570ls31x-usb-kit/scripts/Make.defs | 6 +-- .../arm/xmc4/xmc4500-relax/scripts/Make.defs | 4 +- .../arm/xmc4/xmc4700-relax/scripts/Make.defs | 4 +- .../avr/at32uc3/avr32dev1/scripts/Make.defs | 2 +- .../at90usb/micropendous3/scripts/Make.defs | 2 +- .../avr/at90usb/teensy-2.0/scripts/Make.defs | 2 +- boards/avr/atmega/amber/scripts/Make.defs | 2 +- .../atmega/arduino-mega2560/scripts/Make.defs | 2 +- .../avr/atmega/arduino-mega2560/src/Makefile | 2 +- .../avr/atmega/moteino-mega/scripts/Make.defs | 2 +- .../hc/m9s12/demo9s12ne64/scripts/Make.defs | 3 +- boards/hc/m9s12/ne64badge/scripts/Make.defs | 3 +- boards/mips/pic32mx/mirtoo/scripts/Make.defs | 2 +- .../pic32mx-starterkit/scripts/Make.defs | 2 +- .../pic32mx/pic32mx7mmb/scripts/Make.defs | 2 +- .../pic32mx/sure-pic32mx/scripts/Make.defs | 2 +- boards/mips/pic32mx/ubw32/scripts/Make.defs | 2 +- .../flipnclick-pic32mz/scripts/Make.defs | 2 +- .../pic32mz-starterkit/scripts/Make.defs | 2 +- boards/misoc/lm32/misoc/scripts/Make.defs | 2 +- boards/or1k/mor1kx/or1k/scripts/Make.defs | 4 +- .../rx65n/rx65n-grrose/scripts/Make.defs | 5 +-- .../rx65n/rx65n-rsk1mb/scripts/Make.defs | 5 +-- .../rx65n/rx65n-rsk2mb/scripts/Make.defs | 5 +-- boards/renesas/rx65n/rx65n/scripts/Make.defs | 5 +-- .../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 +- .../intel64/qemu-intel64/scripts/Make.defs | 2 +- .../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 a9e4cb04e0..85ee2404c9 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 2b508866be..beef032720 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 ca4b467375..b1c497d645 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 62bee95388..ee5bcc7d26 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 f1f829aa9b..06fbde455d 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 bd0cc7a645..e7dcef9bf1 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 c153fd4d80..f3e8bf33ee 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 7fbd2e3af2..318defd135 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 77f29104ec..eecf73d813 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 565edc175e..fab715a378 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 7255ddaad1..a3cfdaa4d7 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) - CROSSDEV ?= arm-none-eabi- - ARCROSSDEV ?= arm-none-eabi- - MAXOPTIMIZATION ?= -Os - ARCHCPUFLAGS = $(TOOLCHAIN_MCPU) -mthumb $(TOOLCHAIN_MFLOAT) - ifeq ($(CONFIG_WINDOWS_CYGWIN),y) - WINTOOL = y - endif -endif - -# Clang toolchain on macOS, Linux or any typical Posix system - -ifeq ($(CONFIG_ARMV7M_TOOLCHAIN),CLANGL) +ifeq ($(CONFIG_ARMV7M_TOOLCHAIN),CLANG) CROSSDEV ?= arm-none-eabi- ARCROSSDEV ?= arm-none-eabi- MAXOPTIMIZATION ?= -Os ARCHCPUFLAGS = $(TOOLCHAIN_MCPU) -mthumb $(TOOLCHAIN_MFLOAT) endif - -# Clang toolchain under Windows - -ifeq ($(CONFIG_ARMV7M_TOOLCHAIN),CLANGW) - CROSSDEV ?= arm-none-eabi- - ARCROSSDEV ?= arm-none-eabi- - MAXOPTIMIZATION ?= -Os - ARCHCPUFLAGS = $(TOOLCHAIN_MCPU) -mthumb $(TOOLCHAIN_MFLOAT) - ifeq ($(CONFIG_WINDOWS_CYGWIN),y) - WINTOOL = y - endif -endif - diff --git a/arch/arm/src/armv7-r/Kconfig b/arch/arm/src/armv7-r/Kconfig index 96278c4191..ec787e786a 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 aeedf54cfb..3c93ce5d6a 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 016d8d4241..5339c752ab 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 7a355e1cb7..e8ffcca0fa 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) - CROSSDEV ?= arm-none-eabi- - ARCROSSDEV ?= arm-none-eabi- - MAXOPTIMIZATION ?= -Os - ARCHCPUFLAGS = $(TOOLCHAIN_MCPU) -mthumb $(TOOLCHAIN_MFLOAT) - ifeq ($(CONFIG_WINDOWS_CYGWIN),y) - WINTOOL = y - endif -endif - -# Clang toolchain on OS X, Linux or any typical Posix system - -ifeq ($(CONFIG_ARMV8M_TOOLCHAIN),CLANGL) +ifeq ($(CONFIG_ARMV8M_TOOLCHAIN),CLANG) CROSSDEV ?= arm-none-eabi- ARCROSSDEV ?= arm-none-eabi- MAXOPTIMIZATION ?= -Os ARCHCPUFLAGS = $(TOOLCHAIN_MCPU) -mthumb $(TOOLCHAIN_MFLOAT) endif - -# Clang toolchain under Windows - -ifeq ($(CONFIG_ARMV8M_TOOLCHAIN),CLANGW) - CROSSDEV ?= arm-none-eabi- - ARCROSSDEV ?= arm-none-eabi- - MAXOPTIMIZATION ?= -Os - ARCHCPUFLAGS = $(TOOLCHAIN_MCPU) -mthumb $(TOOLCHAIN_MFLOAT) - ifeq ($(CONFIG_WINDOWS_CYGWIN),y) - WINTOOL = y - endif -endif - diff --git a/arch/avr/src/Makefile b/arch/avr/src/Makefile index 4f81ea9078..cfe7ef1e3c 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 e044b77a91..fb84ec8a65 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 65fabd24a6..07143f91ea 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 05a056b698..005f1b86f6 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 6a2b34d2fe..30b6af7a26 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 525743442c..9881eb7c4c 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 3725fd8ec2..7b3063d166 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 f3f1b73430..bde51e3b49 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 c76b0d800b..51f682e8fd 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 c40a0077b4..3327d10244 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 fe021ee6ae..83ce834dce 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 0796cf079a..d0cc812479 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 91a93b5490..3be1b36d58 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 808e194d60..4bf3c286d3 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 7b605d3e06..5c6e46736c 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 041d98b3ca..edb3afbf05 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 9ba5ec8a34..58c68b321e 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 7d7b96a522..fd5939b82e 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 669edb7d72..b1ba0e2894 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 35dfecbd08..7781d2f0b9 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 91698dc568..ea947c3948 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 20f681788a..d4d4aca83e 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 702d24982d..9b42b9e0c6 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 6658c82b41..1de88f591f 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 0b457113ce..28ed7edc07 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 6dedd02507..3c8466a92b 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 5c808ffce9..bb38d16156 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 7687b935a6..fe2d30b3a9 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 eeb8c7f36f..f622c2eaac 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 ee5a57f8e4..9d0d7b1f5c 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 21acba1b7e..e21664a3ed 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 ed609e7a5e..f97656ec59 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 005fd00cf3..251c463821 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 fef3f261c8..6814e15a7a 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 e1354d8500..276946577f 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 caa9b968ad..9ca2274843 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 618f984814..3959836831 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 1d87fe46d9..0c9a9d9727 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 84bd673289..c65c32ba98 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 67b66bf58c..6bc874359d 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 2ee1f1382c..bee2ebaa1c 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 3d4e184086..375a3c1b90 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 6136a68bea..4b0a3c2d1e 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 aba2136e21..52a8167c6b 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 09a43ab79b..f8d2236a44 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 24a1df4f28..612159e2d2 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 a7a13ef87e..f2876cae91 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 06477cb7fe..dc4516c5d0 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 e989a8e36e..46f71d89e9 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 0999e247f2..d3b759decf 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 dc96e55b62..33951b208e 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 a74a4b0973..1d800839df 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 556da0606e..8efd0c550a 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 450e25e9e2..30659cfd8c 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 f8c91bda75..6ebb5be7b0 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 9674b9bacc..267f410d2c 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 3309455277..66b7b4a713 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 f0e93ffcaf..bc5d307cf2 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 bf92e3244d..087b960d03 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 f7cce8485a..aed72863cb 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 e07db528b5..5f99f8e519 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 f56075ce1f..b7b746519b 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 b96aed1ace..3ebdb5bdbe 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 14d5243ac5..6095104b1b 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 be599f16c3..4313380a4c 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 9ac1ff5c01..2b829f2f2d 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 45a49ecca3..c80d218c59 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 d15b10fe32..8e4c91beca 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 79e02d6887..b1aba56ab9 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 68b0ee23f6..b4d5fb4d50 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 6e01e5273d..13e198f31b 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 b7f87f29c9..84d845c414 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 bec88330d8..344d3f0227 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 7de1fdd6e5..0984405850 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 4c9d2effc7..ad55c1db77 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 68a4af7085..68c6b9b4fc 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 fd374dbf43..1bf3eb15b4 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 57dcb77f40..67b4ac4cbe 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 36aad68fdb..22780cde9b 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 863c6911de..7f532d6387 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 f3c0504628..105a8d204f 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 d26fb2c067..5afd468e5c 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 27689b25b4..5614f267ba 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 85d6a84e33..1d64dc0dd9 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 b386b52847..df0ddab06e 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 8239951289..4a5d29fc33 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 bf0952965a..992ed953f5 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 a8d9731d0f..6c89fa4483 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 ee762c6364..4ffeb5947c 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 9f13ab1c79..04b5db82ad 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 a8775123c8..442c92da6d 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 601502aa49..5455ac2514 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 9058a5a3bd..7ee605eaff 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 113a840494..00eb1d5e8b 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 44045a11a9..3b6b47e323 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 c16bab6f17..b10b45e82b 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 baac89ea3c..09a70b2e50 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 cc18dbf243..5e221e7828 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 41648baa54..4d1f21f9e7 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 928f46054d..56f1b2a242 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 c926ae2040..8cb7bc46eb 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 de742f8d12..f154dcb720 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 1fcded41cd..e743fb6b22 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 38d5bbd03d..c05f2087ee 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 a7612832ba..5fe7699a24 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 470fbe9911..9f7b484cbd 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 a6b60f9e14..46bdd13e88 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 0a3abb3340..3c2d51080b 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 dc9f4f7d23..b3f0a50b25 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 e93e23f133..ad882fb829 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 991a6a10d9..62b9e5124b 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 5a5b1ab9c8..708d475fb6 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 cfd334a641..49803b53b8 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 45ac9c0d06..c4f1f852ba 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 b9b2104f3f..844dc4943a 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 02af4a648b..47a046b3bf 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 b56ce6649d..80f4ee277d 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 b7d0a5dec7..811cea4aae 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 b2ac122bee..399d6f0e25 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 48091415d9..f35850457b 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 a5e92a57d9..cb77077058 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 532fd1594f..daef1f5065 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 d4571cf110..a5e0b3d061 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 c8827279ac..459e2ffd2c 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 31fe03c44c..357f49f50d 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 0f59f70663..49bf308271 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 7b6d29575f..baebdbbff7 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 df65ae8da1..62e1e87a6f 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 fc2157a012..b92fafece9 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 c3e55de0b7..e6ed4b6c3c 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 a87a436d64..cd1f47d3c1 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 b5a6f8a002..d27dbb12c3 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 e7cb484a3f..7721eadb73 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 79ed42b7c0..7aec9fe4d7 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 cd84429caa..a7b16abf71 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 ae198a7e6a..4d1cfd3b9a 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 af24fb254c..af0aaa63d5 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 b822ebb0fa..9aadf4a9ce 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 4b8c9ad1d1..f2c840c285 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 c347bc18e2..ac78201dba 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 46b0fd92f7..60f38f1676 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 31e7fe9658..eba8249058 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 2c1191ddd3..eaa0ff952a 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 6aa6ba577e..2f7f12b523 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 b696bd2e53..04d1393d9c 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 990451207f..513aa40904 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 5ba14f7725..c1595278c7 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 74300197e5..99025abf66 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 353cb8fbab..9de8d30d23 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 c243b8dfc3..9b18283b22 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 95e5885b5a..becbbe3374 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 90aa9b71bf..1a7f4c425a 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 c806ba8f6a..d5d86692ce 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 37e8558ddd..96830db395 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 3d7c700991..4fd8226ea0 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 538a75b626..dcad42c46d 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 60e1e3fb61..7bf2b9f66f 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 f80baac5fd..e1947de9ba 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 2c872aad6d..a16598aada 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 0fd86152cf..0f70f1adc7 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 9dbeb771c9..04ae54cdfe 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 bc65c9394b..aa613725d7 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 b43ba22455..4bd9cc2669 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 63b0168769..8bc8c8e08d 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 46ba83b56a..a027f33f38 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 f16d9e6b28..682a761bed 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 7714ab6d81..d0c7b9eb39 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 3f52a12c33..e5ef070048 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 431779b15a..196e819571 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 e884068e96..e8d1464c6a 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 181660c06a..26d03b773a 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 34092fd6b2..c40170fc73 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 feca09c156..9a561b316b 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 48efb4f153..c30bd90941 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 e959b1c2a7..a3ade2495c 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 6c72c1c534..30d091322d 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 44b3b00ed2..738c6f3266 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 b1701dcf95..7b57a5b6bf 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 44af6f5481..83c4e281da 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 2e48a53bd1..1c92df2b35 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 a25d5c3913..5e05bac29d 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 027c74295a..6654125f8b 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 afb9c44699..eed9d47498 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 85ff502dc3..cfeb35a680 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 e0e30df339..669d9add4c 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 7a38f37845..8bc428ae10 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 0b33628c46..31e72aec44 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 2331565737..6442c06ba1 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 1b51fd6f73..0ae2fd2daa 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 76adc889d3..95eeb5b491 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 7b4cc4e0a2..2075bdaab9 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 af251d2945..eeb117477b 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 a50f8b9bf9..b7ea8231c4 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 6ee15667ec..40d3c6f2b8 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 2d1c6a0c97..a185cc8ecb 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 9061bf152a..8f7964f2ca 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 b432fb32db..d39beeea7f 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 9e0a715b50..9eefb97e60 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 65a663c3bf..0b578010fa 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 a466db1aef..65f124d0f7 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 8d13f4faba..e0ca473c5b 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 dc00174a91..1edbb890c2 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 8b1041ef52..e156ab8734 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 57e06b2216..3a5a952450 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 c74d71a649..159ad5a836 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 077b479b50..915a0c0590 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 806b184707..3da8fc78d9 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 5c3a0d48e8..518fa82900 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 90dab3b07b..0fb25c13df 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 1f5f3f6862..2c8cac5553 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 1ef53092ae..f9eb315ba9 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 f5cb027d44..f283a1f3af 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 1a74a27ad9..10a782db7a 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 4062ba42dd..a3c1e31543 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 9020bfebae..226c757c4a 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 bbff5641a1..736781c349 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 5b142bcbf9..1c54f284d3 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 272d11c091..aa74fe9dc2 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 b49ba78139..92b218fc8e 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 cc7353b712..96d1925d0c 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 2ed4b0d284..5df3373742 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 09ea95e773..aa2d983d4a 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 5a8634b057..6eb81391fc 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 b8e092b589..854f06736e 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 8519f68fd6..134b2afc3e 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 543daeffa1..2088815157 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 4d3533e766..676f2088f8 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 1dc11650a0..461b578b14 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 de5c26a9bb..9094dcff34 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 f8729a9bab..f32b50804e 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 6e21dbec9b..617304588d 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 a83e1ed7e2..11e6c443ea 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 5a82ab5f4c..619aee2601 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 75db9cd9af..bcc00b2f0e 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 4d8b030248..67c5a30341 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 a709f1e145..04ff7e2654 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 334e7a2e69..e12f831ac8 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 1ffaf5a6ad..648d3ff1e3 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 cfde3fecf0..7b63a68d63 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 4f8f74237d..0bab6ddff3 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 b23d1b158a..ee6e081f3a 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 62951b2b38..2c7cf25358 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 e5d36e464c..711a281974 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 9e1441ae72..dee70a63a7 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 878d99edfd..e92d5e890b 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 0b610a394a..1f90eb9a14 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 7fe047e1a9..fee3022b9f 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 5c249e2c87..d0bb95673d 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 b0721fe3ea..51f9c94d46 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 1869f61ff1..540aa8beec 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 d178a12b05..14f3e0df2a 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 24747d2036..3652760ff0 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 2fcb81edb1..68d1fac9d9 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 4cb5fe7906..6eddad3df0 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 7038e092bc..73d09c7a4b 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 f0d0faeda9..367c0ae10f 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 4b7a9e207f..2952f76444 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 8ca4536358..0b9d2704fa 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 4c8cea3f1b..957f7fce8e 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 85c6092293..b04e9e6d38 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 e25d4c98bb..ec56ca9ab3 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 e189712322..f43f709b3a 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 84ffc39cdb..cd11f7d533 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 99652ea690..d3f444c8ff 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 5eca3cf7ce..08d9dd0e27 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 7b93f25069..b62e20f2ac 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 f03f2cd70e..792bd32121 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 59eefc35f7..8810b7a4dc 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 fb67cfa960..98b3698c8c 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 fdccf81544..9f0a075e3e 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 0127e00468..6edf44f0e9 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 14d1b3fcc7..fdac443ef3 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 d7ee3c3e68..edae9761b5 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 0465e65c57..7cbb106d79 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 a0f8329d6b..aefa11d0e6 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 776a24bcc1..63cd3855d0 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 28c5a8f357..8744f38619 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 94d3b1f658..0ef0f4ef94 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 a02146ac5e..9a2abe7678 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 88f21f3922..6d42acb9ba 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 3e44d25b83..5fc7212ab3 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 165073ae67..7d016210e6 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 ebf091b202..d3f08fb35a 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 3690f34fa4..c000f41e30 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 159d34b9ce..51abe9e70e 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 44b3ad1e7f..b82e0ead40 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 4057146c45..1bca80abd2 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 bf1aa77a72..21b97ba9a6 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 3e355c57c2..c1fe761b1b 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 704a7babcd..0602964972 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 59d0491340..bd0f6bda3f 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 5eaacb8c56..49e045627f 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 25db2263cd..156b4b9fd0 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 e99c4cf104..c477d53e1d 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 8c302473bf..d1902098d8 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 0d78344b1c..e354d41821 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 2c8559454f..7dc9bb559a 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