Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-30 21:36:28 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

boards/z80/ez80: Update compiler support

Browse Source 
boards/z80/ez80:  Update to latest ZDS-II verstion 5.3.3 compiler
arch/z80/src/ez80:  Fix some regressions on ez80f91 build due to ez80f92
changes.
This commit is contained in:
Gregory Nutt
2020-02-19 19:28:11 -06:00
committed by Xiang Xiao
parent 9909b7636c
commit c015e42602
10 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/z80/src/ez80/Kconfig
+4 -1
View File
@@ -73,7 +73,7 @@ config EZ80_TOOLCHAIN_ZDSII
choice choice
prompt "ZDS-II Toolchain version" prompt "ZDS-II Toolchain version"
default EZ80_ZDSII_V530 default EZ80_ZDSII_V533
config EZ80_ZDSII_V511 config EZ80_ZDSII_V511
bool "ZDS-II 5.1.1" bool "ZDS-II 5.1.1"
@@ -84,6 +84,9 @@ config EZ80_ZDSII_V521
config EZ80_ZDSII_V530 config EZ80_ZDSII_V530
bool "ZDS-II 5.3.0" bool "ZDS-II 5.3.0"
config EZ80_ZDSII_V533
bool "ZDS-II 5.3.3"
endchoice # ZDS-II Toolchain version endchoice # ZDS-II Toolchain version
if EZ80_EMAC if EZ80_EMAC
arch/z80/src/ez80/ez80_vectors.asm
+2 -1
View File
@@ -53,6 +53,7 @@ EZ80_S_FLAG EQU 80h ; Bit 7: Sign flag
;************************************************************************** ;**************************************************************************
xref _ez80_handlers xref _ez80_handlers
xref _handlersize
xref _ez80_startup xref _ez80_startup
xref _z80_doirq xref _z80_doirq
@@ -212,7 +213,7 @@ _ez80_initvectors:
ld bc, 4 ld bc, 4
ld b, NVECTORS ld b, NVECTORS
xor a, a ; Clear carry xor a, a ; Clear carry
ld de, handlersize ; Length of one irq handler in de ld de, _handlersize ; Length of one irq handler in de
ld hl, _ez80_handlers ; Start of handlers in hl ld hl, _ez80_handlers ; Start of handlers in hl
ld a, 0 ld a, 0
arch/z80/src/ez80/ez80f91_handlers.asm
+2 -1
View File
@@ -37,6 +37,7 @@ EZ80_UNUSED EQU 40h
;************************************************************************** ;**************************************************************************
xdef _ez80_handlers xdef _ez80_handlers
xdef _handlersize
;************************************************************************** ;**************************************************************************
; Macros ; Macros
@@ -65,7 +66,7 @@ irqhandler: macro vectno
;----------------- --- ----- ----- ;----------------- --- ----- -----
_ez80_handlers: _ez80_handlers:
irqhandler 0 ; EZ80_EMACRX_IRQ 0 0 0x040 irqhandler 0 ; EZ80_EMACRX_IRQ 0 0 0x040
handlersize equ $-_ez80_handlers _handlersize equ $-_ez80_handlers
irqhandler 1 ; EZ80_EMACTX_IRQ 1 1 0x044 irqhandler 1 ; EZ80_EMACTX_IRQ 1 1 0x044
irqhandler 2 ; EZ80_EMACSYS_IRQ 2 2 0x048 irqhandler 2 ; EZ80_EMACSYS_IRQ 2 2 0x048
irqhandler 3 ; EZ80_PLL_IRQ 3 3 0x04c irqhandler 3 ; EZ80_PLL_IRQ 3 3 0x04c
arch/z80/src/ez80/ez80f92_handlers.asm
+2 -1
View File
@@ -37,6 +37,7 @@ EZ80_UNUSED EQU 40h
;************************************************************************** ;**************************************************************************
xdef _ez80_handlers xdef _ez80_handlers
xdef _handlersize
;************************************************************************** ;**************************************************************************
; Macros ; Macros
@@ -65,7 +66,7 @@ irqhandler: macro vectno
;----------------- --- ----- ----- ;----------------- --- ----- -----
_ez80_handlers: _ez80_handlers:
irqhandler EZ80_UNUSED ; 0 0x040 irqhandler EZ80_UNUSED ; 0 0x040
handlersize equ $-_ez80_handlers _handlersize equ $-_ez80_handlers
irqhandler EZ80_UNUSED+1 ; 1 0x044 irqhandler EZ80_UNUSED+1 ; 1 0x044
irqhandler EZ80_UNUSED+2 ; 2 0x045 irqhandler EZ80_UNUSED+2 ; 2 0x045
irqhandler EZ80_UNUSED+3 ; 3 0x04c irqhandler EZ80_UNUSED+3 ; 3 0x04c
boards/z80/ez80/ez80f910200kitg/README.txt
+5 -1
View File
@@ -12,9 +12,13 @@ ZDSVERSION (if present) and ZDSINSTALLDIR.
NOTE: Different versions of the ZDS-II compiler may also require NOTE: Different versions of the ZDS-II compiler may also require
different versions of .linkcmd and .zdsproj files as well. different versions of .linkcmd and .zdsproj files as well.
Version 5.3.3
As of this writing, this is the latest version available.
Version 4.11.0 Version 4.11.0
The 5.1.1 version of the ZDS-II tools are currently configured for The 5.3.3 version of the ZDS-II tools is the default configured for
all ez80 boards. However, it is the older version 4.11.0 that this code all ez80 boards. However, it is the older version 4.11.0 that this code
has been verified against. has been verified against.
boards/z80/ez80/ez80f910200kitg/scripts/Make.defs
+5 -2
View File
@@ -46,7 +46,7 @@ include $(TOPDIR)/tools/Config.mk
# #
# Your PC may be configured differently. # Your PC may be configured differently.
# #
# Version 5.3.0, the default install location is C:\ZiLOG # Version 5.3.0 and 5.3.3, the default install location is C:\ZiLOG
ifeq ($(CONFIG_EZ80_ZDSII_V511),y) ifeq ($(CONFIG_EZ80_ZDSII_V511),y)
INSTALLROOT = C:/PROGRA~2/ZiLOG INSTALLROOT = C:/PROGRA~2/ZiLOG
@@ -57,6 +57,9 @@ ZDSVERSION := 5.2.1
else ifeq ($(CONFIG_EZ80_ZDSII_V530),y) else ifeq ($(CONFIG_EZ80_ZDSII_V530),y)
INSTALLROOT = C:/ZiLOG INSTALLROOT = C:/ZiLOG
ZDSVERSION := 5.3.0 ZDSVERSION := 5.3.0
else ifeq ($(CONFIG_EZ80_ZDSII_V533),y)
INSTALLROOT = C:/ZiLOG
ZDSVERSION := 5.3.3
endif endif
ifeq ($(CONFIG_WINDOWS_NATIVE),y) ifeq ($(CONFIG_WINDOWS_NATIVE),y)
@@ -68,7 +71,7 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
ZDSSTDLIBDIR := $(INSTALLDIR)\lib\std ZDSSTDLIBDIR := $(INSTALLDIR)\lib\std
ZDSZILOGLIBDIR := $(INSTALLDIR)\lib\zilog ZDSZILOGLIBDIR := $(INSTALLDIR)\lib\zilog
# CFLAGs # CFLAGS
ARCHASMINCLUDES = -include:$(TOPDIR)\include;$(ZDSSTDINCDIR);$(ZDSZILOGINCDIR) ARCHASMINCLUDES = -include:$(TOPDIR)\include;$(ZDSSTDINCDIR);$(ZDSZILOGINCDIR)
EARCHASMINCLUDES = -include:$(TOPDIR)\include;$(ZDSSTDINCDIR);$(ZDSZILOGINCDIR) EARCHASMINCLUDES = -include:$(TOPDIR)\include;$(ZDSSTDINCDIR);$(ZDSZILOGINCDIR)
boards/z80/ez80/ez80f910200zco/README.txt
+5 -1
View File
@@ -12,9 +12,13 @@ ZDSVERSION (if present) and ZDSINSTALLDIR.
NOTE: Different versions of the ZDS-II compiler may also require NOTE: Different versions of the ZDS-II compiler may also require
different versions of .linkcmd and .zdsproj files as well. different versions of .linkcmd and .zdsproj files as well.
Version 5.3.3
As of this writing, this is the latest version available.
Version 4.11.0 Version 4.11.0
The 5.1.1 version of the ZDS-II tools are currently configured for The 5.3.3 version of the ZDS-II tools is the default configured for
all ez80 boards. However, it is the older version 4.11.0 that this code all ez80 boards. However, it is the older version 4.11.0 that this code
has been verified against. has been verified against.
boards/z80/ez80/ez80f910200zco/scripts/Make.defs
+5 -2
View File
@@ -46,7 +46,7 @@ include $(TOPDIR)/tools/Config.mk
# #
# Your PC may be configured differently. # Your PC may be configured differently.
# #
# Version 5.3.0, the default install location is C:\ZiLOG # Version 5.3.0 and 5.3.3, the default install location is C:\ZiLOG
ifeq ($(CONFIG_EZ80_ZDSII_V511),y) ifeq ($(CONFIG_EZ80_ZDSII_V511),y)
INSTALLROOT = C:/PROGRA~2/ZiLOG INSTALLROOT = C:/PROGRA~2/ZiLOG
@@ -57,6 +57,9 @@ ZDSVERSION := 5.2.1
else ifeq ($(CONFIG_EZ80_ZDSII_V530),y) else ifeq ($(CONFIG_EZ80_ZDSII_V530),y)
INSTALLROOT = C:/ZiLOG INSTALLROOT = C:/ZiLOG
ZDSVERSION := 5.3.0 ZDSVERSION := 5.3.0
else ifeq ($(CONFIG_EZ80_ZDSII_V533),y)
INSTALLROOT = C:/ZiLOG
ZDSVERSION := 5.3.3
endif endif
ifeq ($(CONFIG_WINDOWS_NATIVE),y) ifeq ($(CONFIG_WINDOWS_NATIVE),y)
@@ -68,7 +71,7 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
ZDSSTDLIBDIR := $(INSTALLDIR)\lib\std ZDSSTDLIBDIR := $(INSTALLDIR)\lib\std
ZDSZILOGLIBDIR := $(INSTALLDIR)\lib\zilog ZDSZILOGLIBDIR := $(INSTALLDIR)\lib\zilog
# CFLAGs # CFLAGS
ARCHASMINCLUDES = -include:$(TOPDIR)\include;$(ZDSSTDINCDIR);$(ZDSZILOGINCDIR) ARCHASMINCLUDES = -include:$(TOPDIR)\include;$(ZDSSTDINCDIR);$(ZDSZILOGINCDIR)
EARCHASMINCLUDES = -include:$(TOPDIR)\include;$(ZDSSTDINCDIR);$(ZDSZILOGINCDIR) EARCHASMINCLUDES = -include:$(TOPDIR)\include;$(ZDSSTDINCDIR);$(ZDSZILOGINCDIR)
boards/z80/ez80/makerlisp/README.txt
+5
View File
@@ -35,6 +35,11 @@ Contents
ZDS-II Compiler Versions ZDS-II Compiler Versions
======================== ========================
Version 5.3.3
As of this writing, this is the latest version available. This is the
default configured for all ez80 boards.
Version 5.3.0 Version 5.3.0
I verified compilation using 5.30 on June 2, 2019. To use this version, I verified compilation using 5.30 on June 2, 2019. To use this version,
boards/z80/ez80/makerlisp/scripts/Make.defs
+5 -2
View File
@@ -46,7 +46,7 @@ include $(TOPDIR)/tools/Config.mk
# #
# Your PC may be configured differently. # Your PC may be configured differently.
# #
# Version 5.3.0, the default install location is C:\ZiLOG # Version 5.3.0 and 5.3.3, the default install location is C:\ZiLOG
ifeq ($(CONFIG_EZ80_ZDSII_V511),y) ifeq ($(CONFIG_EZ80_ZDSII_V511),y)
INSTALLROOT = C:/PROGRA~2/ZiLOG INSTALLROOT = C:/PROGRA~2/ZiLOG
@@ -57,6 +57,9 @@ ZDSVERSION := 5.2.1
else ifeq ($(CONFIG_EZ80_ZDSII_V530),y) else ifeq ($(CONFIG_EZ80_ZDSII_V530),y)
INSTALLROOT = C:/ZiLOG INSTALLROOT = C:/ZiLOG
ZDSVERSION := 5.3.0 ZDSVERSION := 5.3.0
else ifeq ($(CONFIG_EZ80_ZDSII_V533),y)
INSTALLROOT = C:/ZiLOG
ZDSVERSION := 5.3.3
endif endif
ifeq ($(CONFIG_WINDOWS_NATIVE),y) ifeq ($(CONFIG_WINDOWS_NATIVE),y)
@@ -68,7 +71,7 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
ZDSSTDLIBDIR := $(INSTALLDIR)\lib\std ZDSSTDLIBDIR := $(INSTALLDIR)\lib\std
ZDSZILOGLIBDIR := $(INSTALLDIR)\lib\zilog ZDSZILOGLIBDIR := $(INSTALLDIR)\lib\zilog
# CFLAGs # CFLAGS
ARCHASMINCLUDES = -include:$(TOPDIR)\include;$(ZDSSTDINCDIR);$(ZDSZILOGINCDIR) ARCHASMINCLUDES = -include:$(TOPDIR)\include;$(ZDSSTDINCDIR);$(ZDSZILOGINCDIR)
EARCHASMINCLUDES = -include:$(TOPDIR)\include;$(ZDSSTDINCDIR);$(ZDSZILOGINCDIR) EARCHASMINCLUDES = -include:$(TOPDIR)\include;$(ZDSSTDINCDIR);$(ZDSZILOGINCDIR)