Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-01 07:45:16 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

build: Replace WINTOOL with CYGWIN_WINTOOL Kconfig

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

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao
2020-05-18 22:18:15 +08:00
committed by patacongo
parent 05ebb39998
commit bd656888f2
312 changed files with 469 additions and 713 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/z80/Kconfig
+2
View File
@@ -26,6 +26,7 @@ config ARCH_CHIP_Z180
config ARCH_CHIP_EZ80
bool "eZ80 Family (ez80 Acclaim)"
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
select MM_SMALL if EZ80_Z80MODE
select ARCH_HAVE_PHY
---help---
@@ -33,6 +34,7 @@ config ARCH_CHIP_EZ80
config ARCH_CHIP_Z8
bool "z8 Family"
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
select MM_SMALL
select ENDIAN_BIG
---help---
arch/z80/src/ez80/Toolchain.defs
-13
View File
@@ -18,19 +18,6 @@
#
############################################################################
# Setup for the selected toolchain
#
# The ZiLOG ZDS-II Windows toolchain is the only toolchain available for
# the ez80.
#
CONFIG_EZ80_TOOLCHAIN ?= ZDSII
ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
WINTOOL = y
endif
# These are the default directories where the ZDS-II toolchain is installed.
# NOTE that short 8.3 path names are used in order to avoid spaces. On my
# machine I have:
arch/z80/src/z180/Kconfig
+1
View File
@@ -314,6 +314,7 @@ config Z180_TOOLCHAIN_SDCCL
config Z180_TOOLCHAIN_SDCCW
bool "SDCC for Windows"
depends on TOOLCHAIN_WINDOWS
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
endchoice
arch/z80/src/z180/Toolchain.defs
-24
View File
@@ -47,27 +47,3 @@
# CONFIG_Z180_TOOLCHAIN_SDCCL=y : SDCC for Linux, macOS or Cygwin
# CONFIG_Z180_TOOLCHAIN_SDCCW=y : SDCC for Win32
#
ifeq ($(filter y, \
$(CONFIG_Z180_TOOLCHAIN_SDCCL) \
),y)
CONFIG_Z180_TOOLCHAIN ?= SDCCPOSIX
endif
ifeq ($(filter y, \
$(CONFIG_Z180_TOOLCHAIN_SDCCW) \
),y)
CONFIG_Z180_TOOLCHAIN ?= SDCCWIN32
endif
# SDCC toolchain under Linux, macOS or Cygwin
ifeq ($(CONFIG_Z180_TOOLCHAIN),POSIX)
endif
# SDCC toolchain under Windows/Cygwin
ifeq ($(CONFIG_AVR_TOOLCHAIN),SDCCWIN32)
ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
WINTOOL = y
endif
endif
arch/z80/src/z8/Toolchain.defs
-14
View File
@@ -33,19 +33,6 @@
#
############################################################################
# Setup for the selected toolchain
#
# The ZiLOG ZDS-II Windows toolchain is the only toolchain available for
# the z8.
#
CONFIG_Z8_TOOLCHAIN ?= ZDSII
ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
WINTOOL = y
endif
# These are the directories where the ZDS-II toolchain is installed. NOTE
# that short 8.3 path names are used in order to avoid spaces. On my machine
# I have:
@@ -76,7 +63,6 @@ endif
ZDSSTDLIBDIR = $(INSTALLDIR)\lib\std
ZDSZILOGLIBDIR = $(INSTALLDIR)\lib\zilog
else
WINTOOL = y
ZDSINSTALLDIR = C:/PROGRA~2/ZiLOG/ZDSII_Z8Encore!_$(ZDSVERSION)
INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"}
ZDSBINDIR = $(INSTALLDIR)/bin
arch/z80/src/z80/Kconfig
+1
View File
@@ -17,6 +17,7 @@ config Z80_TOOLCHAIN_SDCCL
config Z80_TOOLCHAIN_SDCCW
bool "SDCC for Windows"
depends on TOOLCHAIN_WINDOWS
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
endchoice
arch/z80/src/z80/Toolchain.defs
-24
View File
@@ -47,27 +47,3 @@
# CONFIG_Z80_TOOLCHAIN_SDCCL=y : SDCC for Linux, macOS or Cygwin
# CONFIG_Z80_TOOLCHAIN_SDCCW=y : SDCC for Win32
#
ifeq ($(filter y, \
$(CONFIG_Z80_TOOLCHAIN_SDCCL) \
),y)
CONFIG_Z80_TOOLCHAIN ?= SDCCPOSIX
endif
ifeq ($(filter y, \
$(CONFIG_Z80_TOOLCHAIN_SDCCW) \
),y)
CONFIG_Z80_TOOLCHAIN ?= SDCCWIN32
endif
# SDCC toolchain under Linux, macOS or Cygwin
ifeq ($(CONFIG_Z80_TOOLCHAIN),POSIX)
endif
# SDCC toolchain under Windows/Cygwin
ifeq ($(CONFIG_AVR_TOOLCHAIN),SDCCWIN32)
ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
WINTOOL = y
endif
endif