From 1c47b7feda772c2bb2f8c60dc663c6cb1cc00b86 Mon Sep 17 00:00:00 2001 From: patacongo Date: Mon, 11 Feb 2008 19:16:45 +0000 Subject: [PATCH] Changes for Z8Encore\! compile git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@668 42af7a65-404d-4744-a932-0658087f49c3 --- configs/z8encore000zco/ostest/Make.defs | 24 ++-- configs/z8encore000zco/ostest/ostest.linkcmd | 83 ++++++------ configs/z8encore000zco/ostest/ostest.zfpproj | 134 +++++++++++++------ configs/z8encore000zco/src/Makefile | 4 +- 4 files changed, 146 insertions(+), 99 deletions(-) diff --git a/configs/z8encore000zco/ostest/Make.defs b/configs/z8encore000zco/ostest/Make.defs index 3adff0b38b..030478e3df 100644 --- a/configs/z8encore000zco/ostest/Make.defs +++ b/configs/z8encore000zco/ostest/Make.defs @@ -41,16 +41,17 @@ ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_Z8Encore!_4.10.1 ZDSBINDIR := $(ZDSINSTALLDIR)/bin ZDSSTDINCDIR := $(ZDSINSTALLDIR)/include/std ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog +ZDSF46XINCDIR := $(ZDSZILOGINCDIR)/Z8Encore_F642X ZDSSTDLIBDIR := $(ZDSINSTALLDIR)/lib/std ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog - # These are the same directories but with the directory separator # character swapped as needed by the ZDS-II compiler WTOPDIR := ${shell cygpath -w $(TOPDIR)} WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)} WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)} +WZDSF46XINCDIR := ${shell cygpath -w $(ZDSF46XINCDIR)} WZDSSTDLIBDIR := ${shell cygpath -w $(ZDSSTDLIBDIR)} WZDSZILOGLIBDIR := ${shell cygpath -w $(ZDSZILOGLIBDIR)} @@ -63,15 +64,15 @@ EZDSZILOGINCDIR := ${shell echo "$(WZDSZILOGINCDIR)" | sed -e "s/ /%20/g"} # Assembler definitions ifeq ("${CONFIG_DEBUG}","y") - ARCHASMOPTIMIZATION = -debug + ARCHASMOPTIMIZATION = -debug -sdiopt else - ARCHASMOPTIMIZATION = -nodebug + ARCHASMOPTIMIZATION = -nodebug -sdiopt endif -ARCHASMCPUFLAGS = -cpu:Z16F2811AL -NOigcase -ARCHASMLIST = -NOlistmac -name -pagelen:56 -pagewidth:80 -quiet +ARCHASMCPUFLAGS = -cpu:Z8F6423 -NOigcase -NOrevaa +ARCHASMLIST = -list -NOlistmac -name -pagelen:56 -pagewidth:80 -quiet ARCHASMWARNINGS = -warn -ARCHASMDEFINES = -define:_Z16F2811AL=1 -define:_Z16K_SERIES=1 -define:_Z16F_SERIES=1 \ -define:__ASSEMBLY__ +ARCHASMDEFINES = -define:_Z8F6423=1 -define:_Z8ENCORE_64K_SERIES=1 -define:_Z8ENCORE_F642X=1 \ -define:__ASSEMBLY__ ARCHASMINCLUDES = -include:'$(ETOPDIR)\include;$(EZDSSTDINCDIR);$(EZDSZILOGINCDIR)' AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) \ $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION) @@ -84,20 +85,19 @@ else ARCHOPTIMIZATION = -nodebug -regvar endif -ARCHCPUFLAGS = -chartype:S -model:L -NOmodsect -cpu:Z16F2811AL -NOgenprint \ +ARCHCPUFLAGS = -chartype:S -model:L -const:RAM -NOoptlink -promote -cpu:Z8F6423 -NOgenprintf \ -asmsw:" $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)" -ARCHLIST = -keeplst -NOlist -NOlistinc -NOkeepasm +ARCHLIST = -keeplst -NOlist -NOlistinc -keepasm ARCHPICFLAGS = ARCHWARNINGS = -warn -ARCHDEFINES = -define:_Z16F2811AL -define:_Z16K_SERIES \ - -define:_Z16F_SERIES -ARCHSTDINCLUDES = -stdinc:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)' +ARCHDEFINES = -define:_Z8ENCORE_F642X -define:_Z8F6423 -define:_Z8ENCORE_64K_SERIES +ARCHSTDINCLUDES = -stdinc:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR);$(WZDSF46XINCDIR)' ARCHUSRINCLUDES = -usrinc:'.' ARCHINCLUDES = $(ARCHSTDINCLUDES) $(ARCHUSRINCLUDES) CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) \ $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) -CPPDEFINES = -D_Z16F2811AL -D_Z16K_SERIES -D_Z16F_SERIES -D__ASSEMBLY__ +CPPDEFINES = -D_Z8ENCORE_F642X -D_Z8F6423 -D_Z8ENCORE_64K_SERIES -D__ASSEMBLY__ CPPINCLUDES = -I$(TOPDIR)/include CPPFLAGS = $(CPPDEFINES) $(CPPINCLUDES) diff --git a/configs/z8encore000zco/ostest/ostest.linkcmd b/configs/z8encore000zco/ostest/ostest.linkcmd index 67204eadf6..2084663c79 100755 --- a/configs/z8encore000zco/ostest/ostest.linkcmd +++ b/configs/z8encore000zco/ostest/ostest.linkcmd @@ -35,7 +35,7 @@ -FORMAT=OMF695,INTEL32 -map -maxhexlen=64 -quiet -sort NAME=ascending -unresolved=fatal --warnoverlap -NOxref -warn -debug -NOigcase +-NOwarnoverlap -NOxref -warn -debug -NOigcase -quiet RANGE ROM $000000 : $007FFF RANGE RAM $FFB000 : $FFBFFF @@ -43,50 +43,45 @@ RANGE IODATA $FFC000 : $FFFFFF RANGE EROM $008000 : $01FFFF RANGE ERAM $800000 : $87FFFF -CHANGE NEAR_TEXT=NEAR_DATA -CHANGE FAR_TEXT=FAR_DATA +RANGE ROM $0 : $FFFF +RANGE RDATA $20 : $FF +RANGE EDATA $100 : $EFF +RANGE PRAM FORBIDDEN -ORDER FAR_BSS, FAR_DATA -ORDER NEAR_BSS, NEAR_DATA -COPY NEAR_DATA EROM -COPY FAR_DATA EROM +CHANGE TEXT=EDATA +CHANGE TEXT=FAR_DATA +change NEAR_TXT=NEAR_DATA +change FAR_TXT=FAR_DATA +ORDER FAR_BSS, FAR_DATA +ORDER NEAR_BSS,NEAR_DATA +COPY NEAR_DATA ROM +COPY FAR_DATA ROM -define _0_exit = 0 -define _low_near_romdata = copy base of NEAR_DATA -define _low_neardata = base of NEAR_DATA -define _len_neardata = length of NEAR_DATA -define _low_far_romdata = copy base of FAR_DATA -define _low_fardata = base of FAR_DATA -define _len_fardata = length of FAR_DATA -define _low_nearbss = base of NEAR_BSS -define _len_nearbss = length of NEAR_BSS -define _low_farbss = base of FAR_BSS -define _len_farbss = length of FAR_BSS -define _near_heaptop = highaddr of RAM -define _far_heaptop = highaddr of ERAM -define _far_stack = highaddr of ERAM -define _near_stack = highaddr of RAM -define _near_heapbot = top of RAM -define _far_heapbot = top of ERAM +define _low_near_romdata = copy base of NEAR_DATA +define _low_neardata = base of NEAR_DATA +define _len_neardata = length of NEAR_DATA +define _low_far_romdata = copy base of FAR_DATA +define _low_fardata = base of FAR_DATA +define _len_fardata = length of FAR_DATA +define _low_nearbss = base of NEAR_BSS +define _len_nearbss = length of NEAR_BSS +define _low_farbss = base of FAR_BSS +define _len_farbss = length of FAR_BSS +define _far_heaptop = highaddr of EDATA +define _far_stack = highaddr of EDATA +define _near_stack = highaddr of RDATA +define _far_heapbot = top of EDATA +define _near_heaptop = highaddr of RDATA +define _near_heapbot = top of RDATA +define _low_pramseg = base of PRAMSEG +define _len_pramseg = length of PRAMSEG +define _low_pram_romdata = copy base of PRAMSEG +define _READ_NVDS=$1000 +define _WRITE_NVDS=$10B3 +define _READ_NVDS_GET_STATUS=$1000 +define _WRITE_NVDS_GET_STATUS=$10B3 +/* Set frequency to 18432000 Hz */ +define __user_frequency = 18432000 -define _SYS_CLK_SRC = 2 -define _SYS_CLK_FREQ = 20000000 - -define __EXTCT_INIT_PARAM = $80 -define __EXTCS0_INIT_PARAM = $8012 -define __EXTCS1_INIT_PARAM = $8001 -define __EXTCS2_INIT_PARAM = $0000 -define __EXTCS3_INIT_PARAM = $0000 -define __EXTCS4_INIT_PARAM = $0000 -define __EXTCS5_INIT_PARAM = $0000 - -define __PFAF_INIT_PARAM = $ff -define __PGAF_INIT_PARAM = $ff -define __PDAF_INIT_PARAM = $ff00 -define __PAAF_INIT_PARAM = $0000 -define __PCAF_INIT_PARAM = $0000 -define __PHAF_INIT_PARAM = $0300 -define __PKAF_INIT_PARAM = $0f - -/* arch/z16/src/Makefile will append target, object and library paths below */ +/* arch/z80/src/Makefile.zdsii will append target, object and library paths below */ diff --git a/configs/z8encore000zco/ostest/ostest.zfpproj b/configs/z8encore000zco/ostest/ostest.zfpproj index ade3d73d42..0c65b6ec72 100644 --- a/configs/z8encore000zco/ostest/ostest.zfpproj +++ b/configs/z8encore000zco/ostest/ostest.zfpproj @@ -1,5 +1,5 @@ - -Z16F2811AL + +Z8F6423 @@ -12,7 +12,7 @@ - + @@ -20,31 +20,37 @@ + + - - + + + - + - - + + + + + + - - - - + + + @@ -52,8 +58,6 @@ - - @@ -65,8 +69,9 @@ + + - @@ -81,46 +86,55 @@ - - - - + + + - + + + - + - + - + + + + + + + + + - + @@ -128,24 +142,28 @@ + + - - + + + - + + + + + - - - @@ -153,6 +171,8 @@ + + @@ -160,8 +180,6 @@ - - @@ -173,8 +191,9 @@ + + - @@ -189,39 +208,48 @@ - - - - + + + - + + + - + - + - + + + + + + + + + @@ -235,4 +263,28 @@ + + + +000000000000 +000000000000 +0 + + +000000000000 +000000000000 +0 + + +000000000000 +000000000000 +0 + + +000000000000 +000000000000 +0 + + + \ No newline at end of file diff --git a/configs/z8encore000zco/src/Makefile b/configs/z8encore000zco/src/Makefile index 8291ab20f2..c20d8d6da4 100644 --- a/configs/z8encore000zco/src/Makefile +++ b/configs/z8encore000zco/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# configs/z16f2800100zcog/Makefile +# configs/z8encore000zco/Makefile # # Copyright (C) 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt @@ -43,7 +43,7 @@ CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCH ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) -CSRCS = z16f_lowinit.c z16f_leds.c +CSRCS = z8_lowinit.c z8_leds.c COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS)