Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 00:14:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixes for z16f compile

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1472 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2009-02-07 02:07:42 +00:00
parent 0fc51ed9e2
commit 88bb6cca07
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+1
View File
@@ -609,4 +609,5 @@
* Updated all ARM Make.def files to work with gcc 2.4.2 (However, there are * 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 still some build issues associated with that toolchain in use of arm-elf-objcopy
-- see the TODO.txt list for details) -- see the TODO.txt list for details)
* Fix problems with Z16F compilation introduced with recent changes.
Documentation/NuttX.html
+3 -2
View File
@@ -8,7 +8,7 @@
<tr align="center" bgcolor="#e4e4e4"> <tr align="center" bgcolor="#e4e4e4">
<td> <td>
<h1><big><font color="#3c34ec"><i>NuttX RTOS</i></font></big></h1> <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> </td>
</tr> </tr>
</table> </table>
@@ -1105,7 +1105,7 @@ m68k, m68hc11, m68hc12, and SuperH ports.</blockquote>
</p> </p>
</ul> </ul>
<p> <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). (the Zilog ZDS-II toolchain).
</p. </p.
</td> </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 * 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 still some build issues associated with that toolchain in use of arm-elf-objcopy
-- see the TODO.txt list for details) -- 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; pascal-0.1.3 2008-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
arch/z16/src/Makefile
+1 -5
View File
@@ -39,7 +39,7 @@
COMPILER = ${shell basename $(CC)} COMPILER = ${shell basename $(CC)}
ARCHSRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src ARCHSRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
ifeq ($(COMPILER),zneocc.exe) ifeq ($(COMPILER),zneocc.exe)
WARCHSRCDIR = ${shell cygpath -w $(ARCHSRCDIR)} WARCHSRCDIR := ${shell cygpath -w $(ARCHSRCDIR)}
USRINCLUDES = -usrinc:'.;$(WTOPDIR)\sched;$(WARCHSRCDIR);$(WARCHSRCDIR)\common' USRINCLUDES = -usrinc:'.;$(WTOPDIR)\sched;$(WARCHSRCDIR);$(WARCHSRCDIR)\common'
else else
WARCHSRCDIR = $(ARCHSRCDIR) WARCHSRCDIR = $(ARCHSRCDIR)
@@ -85,11 +85,7 @@ $(OBJS) $(HEAD_AOBJ): %$(OBJEXT): %.S
endif endif
$(COBJS): %$(OBJEXT): %.c $(COBJS): %$(OBJEXT): %.c
ifeq ($(COMPILER),zneocc.exe)
$(call COMPILE, `cygpath -w $<`, $@)
else
$(call COMPILE, $<, $@) $(call COMPILE, $<, $@)
endif
libarch$(LIBEXT): $(OBJS) libarch$(LIBEXT): $(OBJS)
@( for obj in $(OBJS) ; do \ @( for obj in $(OBJS) ; do \
configs/z16f2800100zcog/pashello/Make.defs
+1 -1
View File
@@ -137,7 +137,7 @@ endef
define COMPILE define COMPILE
@#echo "CC: $1" @#echo "CC: $1"
@(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile) @(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile)
eendef endef
define ASSEMBLE define ASSEMBLE
@#echo "AS: $1" @#echo "AS: $1"
drivers/mmcsd/mmcsd_spi.c
+4 -2
View File
@@ -62,7 +62,9 @@
/* Configuration ************************************************************/ /* Configuration ************************************************************/
#ifndef CONFIG_MMCSD_NSLOTS #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 # define CONFIG_MMCSD_NSLOTS 1
#endif #endif
@@ -1098,7 +1100,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
{ {
FAR struct spi_dev_s *spi = slot->spi; FAR struct spi_dev_s *spi = slot->spi;
ubyte csd[16]; ubyte csd[16];
uint32 result; uint32 result = MMCSD_SPIR1_IDLESTATE;
int i, j; int i, j;
/* Assume that the card is not ready (we'll clear this on successful car /* Assume that the card is not ready (we'll clear this on successful car