phone-side
/
nuttx-bb
9
0
Fork 0
Code Releases Activity

Fixes for z16f compile 

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@1472 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo 2009-02-07 02:07:42 +00:00
parent 05f4fadbac
commit 206db0a9b8
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nuttx/ChangeLog
View File

@ -609,4 +609,5 @@
* Updated all ARM Make.def files to work with gcc 2.4.2 (However, there are
still some build issues associated with that toolchain in use of arm-elf-objcopy
-- see the TODO.txt list for details)
* Fix problems with Z16F compilation introduced with recent changes.

5
nuttx/Documentation/NuttX.html
View File

@ -8,7 +8,7 @@
<tr align="center" bgcolor="#e4e4e4">
<td>
<h1><big><font color="#3c34ec"><i>NuttX RTOS</i></font></big></h1>
<p>Last Updated: January 6, 2009</p>
<p>Last Updated: February 6, 2009</p>
</td>
</tr>
</table>
@ -1105,7 +1105,7 @@ m68k, m68hc11, m68hc12, and SuperH ports.</blockquote>
</p>
</ul>
<p>
At present, on the Zilog Z16F port uses a native Windows toolchain
At present, only the Zilog Z16F, z8Encore, and ez80Acclaim ports use a native Windows toolchain
(the Zilog ZDS-II toolchain).
</p.
</td>
@ -1297,6 +1297,7 @@ nuttx-0.4.1 2008-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
* Updated all ARM Make.def files to work with gcc 2.4.2 (However, there are
still some build issues associated with that toolchain in use of arm-elf-objcopy
-- see the TODO.txt list for details)
* Fix problems with Z16F compilation introduced with recent changes.
pascal-0.1.3 2008-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;

6
nuttx/arch/z16/src/Makefile
View File

@ -39,7 +39,7 @@
COMPILER = ${shell basename $(CC)}
ARCHSRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
ifeq ($(COMPILER),zneocc.exe)
WARCHSRCDIR = ${shell cygpath -w $(ARCHSRCDIR)}
WARCHSRCDIR := ${shell cygpath -w $(ARCHSRCDIR)}
USRINCLUDES = -usrinc:'.;$(WTOPDIR)\sched;$(WARCHSRCDIR);$(WARCHSRCDIR)\common'
else
WARCHSRCDIR = $(ARCHSRCDIR)
@ -85,11 +85,7 @@ $(OBJS) $(HEAD_AOBJ): %$(OBJEXT): %.S
endif
$(COBJS): %$(OBJEXT): %.c
ifeq ($(COMPILER),zneocc.exe)
$(call COMPILE, `cygpath -w $<`, $@)
else
$(call COMPILE, $<, $@)
endif
libarch$(LIBEXT): $(OBJS)
@( for obj in $(OBJS) ; do \

2
nuttx/configs/z16f2800100zcog/pashello/Make.defs
View File

@ -137,7 +137,7 @@ endef
define COMPILE
@#echo "CC: $1"
@(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile)
eendef
endef
define ASSEMBLE
@#echo "AS: $1"

6
nuttx/drivers/mmcsd/mmcsd_spi.c
View File

@ -62,7 +62,9 @@
/* Configuration ************************************************************/
#ifndef CONFIG_MMCSD_NSLOTS
# warning "CONFIG_MMCSD_NSLOTS not defined"
# ifdef CONFIG_CPP_HAVE_WARNING
# warning "CONFIG_MMCSD_NSLOTS not defined"
# endif
# define CONFIG_MMCSD_NSLOTS 1
#endif
@ -1098,7 +1100,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
{
FAR struct spi_dev_s *spi = slot->spi;
ubyte csd[16];
uint32 result;
uint32 result = MMCSD_SPIR1_IDLESTATE;
int i, j;
/* Assume that the card is not ready (we'll clear this on successful car