diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-02-12 01:35:08 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-02-12 01:35:08 +0000 |
| commit | 84eb7fe1709023514ee0a1c85af34cda2a37bd07 (patch) | |
| tree | 7dde30adf776d9878aebbe59ed0bf9048478104b | |
| parent | bec5afdfb8ac3ef9abf83433f09bc711951479f1 (diff) | |
| download | px4-nuttx-84eb7fe1709023514ee0a1c85af34cda2a37bd07.tar.gz px4-nuttx-84eb7fe1709023514ee0a1c85af34cda2a37bd07.tar.bz2 px4-nuttx-84eb7fe1709023514ee0a1c85af34cda2a37bd07.zip | |
Fix z80 problems introduced by z8
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@670 42af7a65-404d-4744-a932-0658087f49c3
| -rw-r--r-- | nuttx/arch/z80/src/Makefile.sdcc | 4 | ||||
| -rwxr-xr-x | nuttx/arch/z80/src/mkhpbase.sh | 2 | ||||
| -rw-r--r-- | nuttx/configs/z80sim/nsh/Make.defs | 2 | ||||
| -rw-r--r-- | nuttx/configs/z80sim/ostest/Make.defs | 2 | ||||
| -rw-r--r-- | nuttx/configs/z80sim/pashello/Make.defs | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/nuttx/arch/z80/src/Makefile.sdcc b/nuttx/arch/z80/src/Makefile.sdcc index 13e56c4bf..500ed001e 100644 --- a/nuttx/arch/z80/src/Makefile.sdcc +++ b/nuttx/arch/z80/src/Makefile.sdcc @@ -107,7 +107,7 @@ up_mem.h: @echo "#ifndef __UP_MEM_H" >up_mem.h @echo "#define __UP_MEM_H" >>up_mem.h @echo "" >>up_mem.h - @echo "#include <nuttx/config.h> + @echo "#include <nuttx/config.h>" >>up_mem.h @echo "" >>up_mem.h @echo "#define CONFIG_STACK_END $(CONFIG_DRAM_SIZE)" >> up_mem.h @echo "#define CONFIG_STACK_BASE (CONFIG_STACK_END - $(CONFIG_PROC_STACK_SIZE))" >> up_mem.h @@ -216,6 +216,6 @@ distclean: clean @if [ -e board/Makefile ]; then \ $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean ; \ fi - rm -f Make.dep .depend + @rm -f Make.dep .depend -include Make.dep diff --git a/nuttx/arch/z80/src/mkhpbase.sh b/nuttx/arch/z80/src/mkhpbase.sh index a2c9a64a8..48647e822 100755 --- a/nuttx/arch/z80/src/mkhpbase.sh +++ b/nuttx/arch/z80/src/mkhpbase.sh @@ -103,7 +103,7 @@ if [ -e ${MAPFILE} ]; then else # pass1.map does not yet exist. In this case, just output a valid, default heap size - echo "(UP_HEAP1_END - 8192)" + echo "(CONFIG_HEAP1_END - 8192)" fi diff --git a/nuttx/configs/z80sim/nsh/Make.defs b/nuttx/configs/z80sim/nsh/Make.defs index 75b6de6c8..6c95d3296 100644 --- a/nuttx/configs/z80sim/nsh/Make.defs +++ b/nuttx/configs/z80sim/nsh/Make.defs @@ -83,7 +83,7 @@ define ARCHIVE endef define CLEAN - @rm -f *.asm *.rel *.lst *.rst *.sym *.adb *.lnk *.map *.mem *.ihx *.hex + @rm -f *.o *.asm *.rel *.lst *.rst *.sym *.adb *.lnk *.map *.mem *.ihx *.hex endef MKDEP = $(TOPDIR)/tools/mkdeps.sh diff --git a/nuttx/configs/z80sim/ostest/Make.defs b/nuttx/configs/z80sim/ostest/Make.defs index 75b6de6c8..6c95d3296 100644 --- a/nuttx/configs/z80sim/ostest/Make.defs +++ b/nuttx/configs/z80sim/ostest/Make.defs @@ -83,7 +83,7 @@ define ARCHIVE endef define CLEAN - @rm -f *.asm *.rel *.lst *.rst *.sym *.adb *.lnk *.map *.mem *.ihx *.hex + @rm -f *.o *.asm *.rel *.lst *.rst *.sym *.adb *.lnk *.map *.mem *.ihx *.hex endef MKDEP = $(TOPDIR)/tools/mkdeps.sh diff --git a/nuttx/configs/z80sim/pashello/Make.defs b/nuttx/configs/z80sim/pashello/Make.defs index 75b6de6c8..6c95d3296 100644 --- a/nuttx/configs/z80sim/pashello/Make.defs +++ b/nuttx/configs/z80sim/pashello/Make.defs @@ -83,7 +83,7 @@ define ARCHIVE endef define CLEAN - @rm -f *.asm *.rel *.lst *.rst *.sym *.adb *.lnk *.map *.mem *.ihx *.hex + @rm -f *.o *.asm *.rel *.lst *.rst *.sym *.adb *.lnk *.map *.mem *.ihx *.hex endef MKDEP = $(TOPDIR)/tools/mkdeps.sh |