From fc3565e9eb3823654c91618985850038eb8382d8 Mon Sep 17 00:00:00 2001 From: "chao.an" Date: Tue, 19 Apr 2022 14:53:42 +0800 Subject: [PATCH] arch/z80: Unify the toolchain definition of SDCC for linux and windows Signed-off-by: chao.an --- arch/z80/src/z180/Kconfig | 13 +++---------- arch/z80/src/z180/Toolchain.defs | 3 +-- arch/z80/src/z80/Kconfig | 13 +++---------- arch/z80/src/z80/Toolchain.defs | 3 +-- boards/z80/z80/z80sim/README.txt | 6 +----- 5 files changed, 9 insertions(+), 29 deletions(-) diff --git a/arch/z80/src/z180/Kconfig b/arch/z80/src/z180/Kconfig index ab982aed8b..6363f40a7e 100644 --- a/arch/z80/src/z180/Kconfig +++ b/arch/z80/src/z180/Kconfig @@ -304,17 +304,10 @@ endchoice choice prompt "Toolchain Selection" - default Z180_TOOLCHAIN_SDCCW if TOOLCHAIN_WINDOWS - default Z180_TOOLCHAIN_SDCCL if !TOOLCHAIN_WINDOWS + default Z180_TOOLCHAIN_SDCC -config Z180_TOOLCHAIN_SDCCL - bool "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 +config Z180_TOOLCHAIN_SDCC + bool "Win32, SDCC for Linux, macOS, or Cygwin" endchoice diff --git a/arch/z80/src/z180/Toolchain.defs b/arch/z80/src/z180/Toolchain.defs index cd8d16f7a5..2ba6b30768 100644 --- a/arch/z80/src/z180/Toolchain.defs +++ b/arch/z80/src/z180/Toolchain.defs @@ -29,8 +29,7 @@ # built to run on Windows as a POSIX toolchain. The various SDCC options # are selected in the NuttX configuration with: # -# CONFIG_Z180_TOOLCHAIN_SDCCL=y : SDCC for Linux, macOS or Cygwin -# CONFIG_Z180_TOOLCHAIN_SDCCW=y : SDCC for Win32 +# CONFIG_Z180_TOOLCHAIN_SDCC=y : Win32, SDCC for Linux, macOS or Cygwin # # These are the directories where the SDCC toolchain is installed. NOTE diff --git a/arch/z80/src/z80/Kconfig b/arch/z80/src/z80/Kconfig index f97656ec59..b5bfd1d37e 100644 --- a/arch/z80/src/z80/Kconfig +++ b/arch/z80/src/z80/Kconfig @@ -7,17 +7,10 @@ if ARCH_CHIP_Z80 choice prompt "Toolchain Selection" - default Z80_TOOLCHAIN_SDCCW if TOOLCHAIN_WINDOWS - default Z80_TOOLCHAIN_SDCCL if !TOOLCHAIN_WINDOWS + default Z80_TOOLCHAIN_SDCC -config Z80_TOOLCHAIN_SDCCL - bool "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 +config Z80_TOOLCHAIN_SDCC + bool "Win32, SDCC for Linux, macOS, or Cygwin" endchoice diff --git a/arch/z80/src/z80/Toolchain.defs b/arch/z80/src/z80/Toolchain.defs index e9a5ef421c..fa74c9c414 100644 --- a/arch/z80/src/z80/Toolchain.defs +++ b/arch/z80/src/z80/Toolchain.defs @@ -29,8 +29,7 @@ # built to run on Windows as a POSIX toolchain. The various SDCC options are # selected in the NuttX configuration with: # -# CONFIG_Z80_TOOLCHAIN_SDCCL=y : SDCC for Linux, macOS or Cygwin -# CONFIG_Z80_TOOLCHAIN_SDCCW=y : SDCC for Win32 +# CONFIG_Z80_TOOLCHAIN_SDCC=y : Win32, SDCC for Linux, macOS or Cygwin # # These are the directories where the SDCC toolchain is installed. NOTE diff --git a/boards/z80/z80/z80sim/README.txt b/boards/z80/z80/z80sim/README.txt index c98546b7cb..84ac69bc58 100644 --- a/boards/z80/z80/z80sim/README.txt +++ b/boards/z80/z80/z80sim/README.txt @@ -124,9 +124,6 @@ and the following changes to the configuration file: +CONFIG_HOST_WINDOWS=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" definition in the .config file because the forward slash may upset some 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 selected with: - CONFIG_Z80_TOOLCHAIN_SDCCL=y : SDCC for Linux, macOS or Cygwin (see below) - CONFIG_Z80_TOOLCHAIN_SDCCW=y : SDCC for Win32 + CONFIG_Z80_TOOLCHAIN_SDCC=y : SDCC for Win32, Linux, macOS or Cygwin SDCC versions 3.2.0 or higher are recommended.