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

arch/z80: Unify the toolchain definition of SDCC for linux and windows

Browse Source 
Signed-off-by: chao.an <anchao@xiaomi.com>
This commit is contained in:
chao.an 2022-04-19 14:53:42 +08:00 committed by Xiang Xiao
parent 0cf8088406
commit fc3565e9eb
5 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/z80/src/z180/Kconfig
View File

@ -304,17 +304,10 @@ endchoice
choice choice
prompt "Toolchain Selection" prompt "Toolchain Selection"
default Z180_TOOLCHAIN_SDCCW if TOOLCHAIN_WINDOWS default Z180_TOOLCHAIN_SDCC
default Z180_TOOLCHAIN_SDCCL if !TOOLCHAIN_WINDOWS
config Z180_TOOLCHAIN_SDCCL config Z180_TOOLCHAIN_SDCC
bool "SDCC for Linux, macOS, or Cygwin" bool "Win32, SDCC for Linux, macOS, or Cygwin"
depends on !WINDOWS_NATIVE
config Z180_TOOLCHAIN_SDCCW
bool "SDCC for Windows"
depends on TOOLCHAIN_WINDOWS
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
endchoice endchoice

3
arch/z80/src/z180/Toolchain.defs
View File

@ -29,8 +29,7 @@
# built to run on Windows as a POSIX toolchain. The various SDCC options # built to run on Windows as a POSIX toolchain. The various SDCC options
# are selected in the NuttX configuration with: # are selected in the NuttX configuration with:
# #
# CONFIG_Z180_TOOLCHAIN_SDCCL=y : SDCC for Linux, macOS or Cygwin # CONFIG_Z180_TOOLCHAIN_SDCC=y : Win32, SDCC for Linux, macOS or Cygwin
# CONFIG_Z180_TOOLCHAIN_SDCCW=y : SDCC for Win32
# #
# These are the directories where the SDCC toolchain is installed. NOTE # These are the directories where the SDCC toolchain is installed. NOTE

13
arch/z80/src/z80/Kconfig
View File

@ -7,17 +7,10 @@ if ARCH_CHIP_Z80
choice choice
prompt "Toolchain Selection" prompt "Toolchain Selection"
default Z80_TOOLCHAIN_SDCCW if TOOLCHAIN_WINDOWS default Z80_TOOLCHAIN_SDCC
default Z80_TOOLCHAIN_SDCCL if !TOOLCHAIN_WINDOWS
config Z80_TOOLCHAIN_SDCCL config Z80_TOOLCHAIN_SDCC
bool "SDCC for Linux, macOS, or Cygwin" bool "Win32, SDCC for Linux, macOS, or Cygwin"
depends on !WINDOWS_NATIVE
config Z80_TOOLCHAIN_SDCCW
bool "SDCC for Windows"
depends on TOOLCHAIN_WINDOWS
select CYGWIN_WINTOOL if WINDOWS_CYGWIN
endchoice endchoice

3
arch/z80/src/z80/Toolchain.defs
View File

@ -29,8 +29,7 @@
# built to run on Windows as a POSIX toolchain. The various SDCC options are # built to run on Windows as a POSIX toolchain. The various SDCC options are
# selected in the NuttX configuration with: # selected in the NuttX configuration with:
# #
# CONFIG_Z80_TOOLCHAIN_SDCCL=y : SDCC for Linux, macOS or Cygwin # CONFIG_Z80_TOOLCHAIN_SDCC=y : Win32, SDCC for Linux, macOS or Cygwin
# CONFIG_Z80_TOOLCHAIN_SDCCW=y : SDCC for Win32
# #
# These are the directories where the SDCC toolchain is installed. NOTE # These are the directories where the SDCC toolchain is installed. NOTE

6
boards/z80/z80/z80sim/README.txt
View File

@ -124,9 +124,6 @@ and the following changes to the configuration file:
+CONFIG_HOST_WINDOWS=y +CONFIG_HOST_WINDOWS=y
+CONFIG_WINDOWS_NATIVE=y +CONFIG_WINDOWS_NATIVE=y
-CONFIG_Z80_TOOLCHAIN_SDCCL=y
+CONFIG_Z80_TOOLCHAIN_SDCCW=y
You may need to first manually change the CONFIG_APPS_DIR="../apps" You may need to first manually change the CONFIG_APPS_DIR="../apps"
definition in the .config file because the forward slash may upset some definition in the .config file because the forward slash may upset some
Windows-based tools. Windows-based tools.
@ -151,8 +148,7 @@ site: http://sourceforge.net/projects/sdcc/files/ . Pre-built binaries are
available for Linux, macOS, and for Win32. Various SDCC options can be available for Linux, macOS, and for Win32. Various SDCC options can be
selected with: selected with:
CONFIG_Z80_TOOLCHAIN_SDCCL=y : SDCC for Linux, macOS or Cygwin (see below) CONFIG_Z80_TOOLCHAIN_SDCC=y : SDCC for Win32, Linux, macOS or Cygwin
CONFIG_Z80_TOOLCHAIN_SDCCW=y : SDCC for Win32
SDCC versions 3.2.0 or higher are recommended. SDCC versions 3.2.0 or higher are recommended.