diff options
Diffstat (limited to 'nuttx/configs/xtrs')
-rw-r--r-- | nuttx/configs/xtrs/README.txt | 48 | ||||
-rw-r--r-- | nuttx/configs/xtrs/include/board.h | 2 | ||||
-rw-r--r-- | nuttx/configs/xtrs/include/trs80-m3.h | 2 | ||||
-rw-r--r-- | nuttx/configs/xtrs/nsh/Make.defs | 39 | ||||
-rw-r--r-- | nuttx/configs/xtrs/nsh/defconfig | 2 | ||||
-rwxr-xr-x | nuttx/configs/xtrs/nsh/setenv.sh | 2 | ||||
-rw-r--r-- | nuttx/configs/xtrs/ostest/Make.defs | 39 | ||||
-rwxr-xr-x | nuttx/configs/xtrs/ostest/setenv.sh | 2 | ||||
-rw-r--r-- | nuttx/configs/xtrs/pashello/Make.defs | 39 | ||||
-rwxr-xr-x | nuttx/configs/xtrs/pashello/setenv.sh | 2 | ||||
-rw-r--r-- | nuttx/configs/xtrs/src/xtr_irq.c | 2 | ||||
-rw-r--r-- | nuttx/configs/xtrs/src/xtr_lowputc.c | 2 | ||||
-rw-r--r-- | nuttx/configs/xtrs/src/xtr_serial.c | 2 | ||||
-rw-r--r-- | nuttx/configs/xtrs/src/xtr_timerisr.c | 2 |
14 files changed, 115 insertions, 70 deletions
diff --git a/nuttx/configs/xtrs/README.txt b/nuttx/configs/xtrs/README.txt index a4067b3e4..ecd44e4e2 100644 --- a/nuttx/configs/xtrs/README.txt +++ b/nuttx/configs/xtrs/README.txt @@ -50,11 +50,10 @@ Configuring NuttX This configuration performs a simple, minimal OS test using examples/ostest. This can be configurated as follows: - cd tools - ./configure.sh xtrs/ostest - cd - - . ./setenv.sh - + cd tools + ./configure.sh xtrs/ostest + cd - + . ./setenv.sh nsh This configuration file builds NSH (examples/nsh). This @@ -63,10 +62,10 @@ Configuring NuttX This configuration can be selected by: - cd tools - ./configure.sh xtrs/nsh - cd - - . ./setenv.sh + cd tools + ./configure.sh xtrs/nsh + cd - + . ./setenv.sh pashello Configures to use examples/pashello for execution from FLASH @@ -77,10 +76,10 @@ Configuring NuttX This configuration can be selected by: - cd tools - ./configure.sh xtrs/pashello - cd - - . ./setenv.sh + cd tools + ./configure.sh xtrs/pashello + cd - + . ./setenv.sh Building the SDCC toolchain ^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -122,11 +121,11 @@ has some compatibilty problems with the older SDCC compiler. For one, you will need to change the Z80 assember name and options in the Make.defs files as follows: --AS = as-z80 -+AS = sdasz80 +-AS = as-z80 ++AS = sdasz80 -- @$(AS) $(ASFLAGS) $2 $1 -+ $(AS) $(ASFLAGS) $1 +- @$(AS) $(ASFLAGS) $2 $1 ++ $(AS) $(ASFLAGS) $1 For another, I had other problems building with that 20091106 that look like compiler bugs. If you are using UBUNTU 9.10, you may have to either @@ -134,6 +133,9 @@ like compiler bugs. If you are using UBUNTU 9.10, you may have to either the older stable releases, or (2) wait for the next stable SDCC release after 2.9.0. +See below: If you wish to continue using the older SDCC toolchain, you +must now also add CONFIG_SDCC_OLD=y to your configuration file. + Newer SDCC Versions ^^^^^^^^^^^^^^^^^^^ @@ -154,4 +156,14 @@ This is the text of bug 3468951 reported on the SourceForge website: sdcc-2.6.0-asz80-symlen.patch is unnecessary, and it and the corresponding section from the README can be removed. -These changes have not yet been incorporated or verified.
\ No newline at end of file +These changes *have* been incorporated but only partially verified. In order +to get a successful compilation, I had to copy stdarg.h out of the SDCC source +(at sdcc/device/include/stdarg.h) to include/nuttx/stdarg.h. + +There are also some library related issues when you get to the final build +that I have not looked into yet. + +If you want to back out these change and continue to use the older toolchain +in your build, simpy define the following in your configuration file: + + CONFIG_SDCC_OLD=y diff --git a/nuttx/configs/xtrs/include/board.h b/nuttx/configs/xtrs/include/board.h index f8f74b219..02ab012f8 100644 --- a/nuttx/configs/xtrs/include/board.h +++ b/nuttx/configs/xtrs/include/board.h @@ -1,5 +1,5 @@ /************************************************************ - * board/board.h + * configs/xtrs/include/board.h * * Copyright (C) 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/configs/xtrs/include/trs80-m3.h b/nuttx/configs/xtrs/include/trs80-m3.h index 4a2a45332..1a23b2d7b 100644 --- a/nuttx/configs/xtrs/include/trs80-m3.h +++ b/nuttx/configs/xtrs/include/trs80-m3.h @@ -1,5 +1,5 @@ /**************************************************************************** - * board/trs80-m3.h + * configs/xtrs/include/trs80-m3.h * * Copyright (C) 2008 Jacques Pelletier. All rights reserved. * Author: Jacques Pelletier diff --git a/nuttx/configs/xtrs/nsh/Make.defs b/nuttx/configs/xtrs/nsh/Make.defs index e1d147dc4..947deb5af 100644 --- a/nuttx/configs/xtrs/nsh/Make.defs +++ b/nuttx/configs/xtrs/nsh/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# configs/xtrs/Make.defs +# configs/xtrs/nsh/Make.defs # # Copyright (C) 2007, 2008, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> @@ -36,27 +36,38 @@ include ${TOPDIR}/.config include ${TOPDIR}/tools/Config.mk -ifeq ("${CONFIG_DEBUG_SYMBOLS}","y") +CROSSDEV = +CC = sdcc +CPP = sdcpp +AR = sdcclib -a + +ifeq ($(CONFIG_SDCC_OLD),y) + +LD = link-z80 +AS = as-z80 +ARCHCPUFLAGS = -mz80 --stack-auto --int-long-reent --float-reent + +else + +LD = sdldz80 +AS = sdasz80 +ARCHCPUFLAGS = -mz80 + +endif + +ifeq ($(CONFIG_DEBUG_SYMBOLS),y) ARCHOPTIMIZATION = --debug else ARCHOPTIMIZATION = endif -ARCHCPUFLAGS = -mz80 --stack-auto --int-long-reent --float-reent -ARCHPICFLAGS = -ARCHWARNINGS = +ARCHPICFLAGS = +ARCHWARNINGS = ARCHDEFINES = -ARCHINCLUDES = -I. -I$(TOPDIR)/include - -CROSSDEV = -CC = sdcc -CPP = sdcpp -LD = link-z80 -AS = as-z80 -AR = sdcclib -a +ARCHINCLUDES = -I. -I$(TOPDIR)/include CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \ - $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) + $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) ASFLAGS = -x -a -l -o -s diff --git a/nuttx/configs/xtrs/nsh/defconfig b/nuttx/configs/xtrs/nsh/defconfig index 76f4e7fa9..b8bd5d6f2 100644 --- a/nuttx/configs/xtrs/nsh/defconfig +++ b/nuttx/configs/xtrs/nsh/defconfig @@ -1,5 +1,5 @@ ############################################################################ -# sim/xtrs/nsh/defconfig +# configs/xtrs/nsh/defconfig # # Copyright (C) 2007-2010, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/configs/xtrs/nsh/setenv.sh b/nuttx/configs/xtrs/nsh/setenv.sh index c59e0abc1..99d45f97a 100755 --- a/nuttx/configs/xtrs/nsh/setenv.sh +++ b/nuttx/configs/xtrs/nsh/setenv.sh @@ -1,5 +1,5 @@ #!/bin/bash -# xtrs/setenv.sh +# configs/xtrs/nsh/setenv.sh # # Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/configs/xtrs/ostest/Make.defs b/nuttx/configs/xtrs/ostest/Make.defs index 773b97d9d..06cc05db0 100644 --- a/nuttx/configs/xtrs/ostest/Make.defs +++ b/nuttx/configs/xtrs/ostest/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# configs/xtrs/Make.defs +# configs/xtrs/ostest/Make.defs # # Copyright (C) 2008, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> @@ -36,27 +36,38 @@ include ${TOPDIR}/.config include ${TOPDIR}/tools/Config.mk -ifeq ("${CONFIG_DEBUG_SYMBOLS}","y") +CROSSDEV = +CC = sdcc +CPP = sdcpp +AR = sdcclib -a + +ifeq ($(CONFIG_SDCC_OLD),y) + +LD = link-z80 +AS = as-z80 +ARCHCPUFLAGS = -mz80 --stack-auto --int-long-reent --float-reent + +else + +LD = sdldz80 +AS = sdasz80 +ARCHCPUFLAGS = -mz80 + +endif + +ifeq ($(CONFIG_DEBUG_SYMBOLS),y) ARCHOPTIMIZATION = --debug else ARCHOPTIMIZATION = endif -ARCHCPUFLAGS = -mz80 --stack-auto --int-long-reent --float-reent -ARCHPICFLAGS = -ARCHWARNINGS = +ARCHPICFLAGS = +ARCHWARNINGS = ARCHDEFINES = -ARCHINCLUDES = -I. -I$(TOPDIR)/include - -CROSSDEV = -CC = sdcc -CPP = sdcpp -LD = link-z80 -AS = as-z80 -AR = sdcclib -a +ARCHINCLUDES = -I. -I$(TOPDIR)/include CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \ - $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) + $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) ASFLAGS = -x -a -l -o -s diff --git a/nuttx/configs/xtrs/ostest/setenv.sh b/nuttx/configs/xtrs/ostest/setenv.sh index cf7b5d796..73454b772 100755 --- a/nuttx/configs/xtrs/ostest/setenv.sh +++ b/nuttx/configs/xtrs/ostest/setenv.sh @@ -1,5 +1,5 @@ #!/bin/bash -# xtrs/setenv.sh +# configs/xtrs/ostest/setenv.sh # # Copyright (C) 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/configs/xtrs/pashello/Make.defs b/nuttx/configs/xtrs/pashello/Make.defs index 773b97d9d..2c2fb47ce 100644 --- a/nuttx/configs/xtrs/pashello/Make.defs +++ b/nuttx/configs/xtrs/pashello/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# configs/xtrs/Make.defs +# configs/xtrs/pashello/Make.defs # # Copyright (C) 2008, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> @@ -36,27 +36,38 @@ include ${TOPDIR}/.config include ${TOPDIR}/tools/Config.mk -ifeq ("${CONFIG_DEBUG_SYMBOLS}","y") +CROSSDEV = +CC = sdcc +CPP = sdcpp +AR = sdcclib -a + +ifeq ($(CONFIG_SDCC_OLD),y) + +LD = link-z80 +AS = as-z80 +ARCHCPUFLAGS = -mz80 --stack-auto --int-long-reent --float-reent + +else + +LD = sdldz80 +AS = sdasz80 +ARCHCPUFLAGS = -mz80 + +endif + +ifeq ($(CONFIG_DEBUG_SYMBOLS),y) ARCHOPTIMIZATION = --debug else ARCHOPTIMIZATION = endif -ARCHCPUFLAGS = -mz80 --stack-auto --int-long-reent --float-reent -ARCHPICFLAGS = -ARCHWARNINGS = +ARCHPICFLAGS = +ARCHWARNINGS = ARCHDEFINES = -ARCHINCLUDES = -I. -I$(TOPDIR)/include - -CROSSDEV = -CC = sdcc -CPP = sdcpp -LD = link-z80 -AS = as-z80 -AR = sdcclib -a +ARCHINCLUDES = -I. -I$(TOPDIR)/include CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \ - $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) + $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) ASFLAGS = -x -a -l -o -s diff --git a/nuttx/configs/xtrs/pashello/setenv.sh b/nuttx/configs/xtrs/pashello/setenv.sh index cf7b5d796..4e2e98e31 100755 --- a/nuttx/configs/xtrs/pashello/setenv.sh +++ b/nuttx/configs/xtrs/pashello/setenv.sh @@ -1,5 +1,5 @@ #!/bin/bash -# xtrs/setenv.sh +# configs/xtrs/pashello/setenv.sh # # Copyright (C) 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/configs/xtrs/src/xtr_irq.c b/nuttx/configs/xtrs/src/xtr_irq.c index 4e17c37bc..72f6c10e2 100644 --- a/nuttx/configs/xtrs/src/xtr_irq.c +++ b/nuttx/configs/xtrs/src/xtr_irq.c @@ -1,5 +1,5 @@ /**************************************************************************** - * board/xtr_irq.c + * configs/xtrs/src/xtr_irq.c * * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/configs/xtrs/src/xtr_lowputc.c b/nuttx/configs/xtrs/src/xtr_lowputc.c index 344f22061..8ed166211 100644 --- a/nuttx/configs/xtrs/src/xtr_lowputc.c +++ b/nuttx/configs/xtrs/src/xtr_lowputc.c @@ -1,5 +1,5 @@ /******************************************************************************** - * board/xtr_lowputc.c + * configs/xtrs/src//xtr_lowputc.c * * Copyright (C) 2008 Jacques Pelletier. All rights reserved. * Author: Jacques Pelletier diff --git a/nuttx/configs/xtrs/src/xtr_serial.c b/nuttx/configs/xtrs/src/xtr_serial.c index df76b1e3f..42cffb740 100644 --- a/nuttx/configs/xtrs/src/xtr_serial.c +++ b/nuttx/configs/xtrs/src/xtr_serial.c @@ -1,5 +1,5 @@ /**************************************************************************** - * board/xtr_serial.c + * config/xtrs/src/xtr_serial.c * * Copyright (C) 2008 Jacques Pelletier. All rights reserved. * Author: Jacques Pelletier diff --git a/nuttx/configs/xtrs/src/xtr_timerisr.c b/nuttx/configs/xtrs/src/xtr_timerisr.c index 21a77706f..295bc65d7 100644 --- a/nuttx/configs/xtrs/src/xtr_timerisr.c +++ b/nuttx/configs/xtrs/src/xtr_timerisr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * board/xtr_timerisr.c + * configs/xtrs/src/xtr_timerisr.c * * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> |