From c0dfcb50843f92682f5b21d97820bd046df87ab9 Mon Sep 17 00:00:00 2001 From: patacongo Date: Mon, 8 Dec 2008 21:21:46 +0000 Subject: [PATCH] Need to use cygpath consistently for compilation in subdirectories git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1439 42af7a65-404d-4744-a932-0658087f49c3 --- arch/z80/src/Makefile.zdsii | 4 +-- configs/ez80f910200kitg/ostest/Make.defs | 3 ++- configs/ez80f910200kitg/src/Makefile | 2 +- configs/ez80f910200zco/ostest/Make.defs | 4 +-- configs/ez80f910200zco/ostest/ostest.linkcmd | 26 ++++++++++---------- configs/ez80f910200zco/src/Makefile | 2 +- configs/z16f2800100zcog/ostest/Make.defs | 4 +-- configs/z16f2800100zcog/pashello/Make.defs | 6 ++--- configs/z16f2800100zcog/src/Makefile | 2 +- configs/z8encore000zco/ostest/Make.defs | 4 +-- configs/z8encore000zco/src/Makefile | 2 +- configs/z8f64200100kit/ostest/Make.defs | 4 +-- configs/z8f64200100kit/src/Makefile | 2 +- 13 files changed, 33 insertions(+), 32 deletions(-) diff --git a/arch/z80/src/Makefile.zdsii b/arch/z80/src/Makefile.zdsii index 315afd7566..4cda67369d 100644 --- a/arch/z80/src/Makefile.zdsii +++ b/arch/z80/src/Makefile.zdsii @@ -77,10 +77,10 @@ $(HEAD_GENSRC) $(GENSRCS) : %$(ASMEXT): %.S @rm $@.tmp $(AOBJS) $(HEAD_AOBJ): %$(OBJEXT): %$(ASMEXT) - $(call ASSEMBLE, `cygpath -w $<`, $@) + $(call ASSEMBLE, $<, $@) $(COBJS): %$(OBJEXT): %.c - $(call COMPILE, `cygpath -w $<`, $@) + $(call COMPILE, $<, $@) libarch$(LIBEXT): $(OBJS) @( for obj in $(OBJS) ; do \ diff --git a/configs/ez80f910200kitg/ostest/Make.defs b/configs/ez80f910200kitg/ostest/Make.defs index 5fa695fe32..83ae3abf8f 100644 --- a/configs/ez80f910200kitg/ostest/Make.defs +++ b/configs/ez80f910200kitg/ostest/Make.defs @@ -142,12 +142,13 @@ endef define COMPILE @#echo "CC: $1" - @$(CC) $(CFLAGS) $1 + @(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile) endef define ASSEMBLE @#echo "AS: $1" @$(AS) -c $(AFLAGS) $1 + @(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) endef define ARCHIVE diff --git a/configs/ez80f910200kitg/src/Makefile b/configs/ez80f910200kitg/src/Makefile index 0a477c0e5c..beb10178bf 100644 --- a/configs/ez80f910200kitg/src/Makefile +++ b/configs/ez80f910200kitg/src/Makefile @@ -61,7 +61,7 @@ $(AOBJS): %$(OBJEXT): %$(ASMEXT) $(call ASSEMBLE, $<, $@) $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c - $(call COMPILE, `cygpath -w $<`, $@) + $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) @( for obj in $(OBJS) ; do \ diff --git a/configs/ez80f910200zco/ostest/Make.defs b/configs/ez80f910200zco/ostest/Make.defs index a384004102..f829c40ac3 100644 --- a/configs/ez80f910200zco/ostest/Make.defs +++ b/configs/ez80f910200zco/ostest/Make.defs @@ -142,12 +142,12 @@ endef define COMPILE @#echo "CC: $1" - @$(CC) $(CFLAGS) $1 + @(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile) endef define ASSEMBLE @#echo "AS: $1" - @$(AS) -c $(AFLAGS) $1 + @(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) endef define ARCHIVE diff --git a/configs/ez80f910200zco/ostest/ostest.linkcmd b/configs/ez80f910200zco/ostest/ostest.linkcmd index 46d1fe50ba..2c88d78acb 100755 --- a/configs/ez80f910200zco/ostest/ostest.linkcmd +++ b/configs/ez80f910200zco/ostest/ostest.linkcmd @@ -38,11 +38,11 @@ -sort NAME=ascending -warn -NOdebug -NOigcase RANGE ROM $000000 : $03FFFF -RANGE RAM $B7E000 : $B7FFFF -RANGE EXTIO $000000 : $00FFFF -RANGE INTIO $000000 : $0000FF +RANGE RAM $B80000 : $BFFFFF +RANGE EXTIO $0 : $FFFF +RANGE INTIO $0 : $FF -CHANGE STRSECT = ROM +CHANGE STRSECT is ROM ORDER .RESET,.IVECTS,.STARTUP,CODE,DATA COPY DATA ROM @@ -64,17 +64,17 @@ DEFINE __CS0_LBR_INIT_PARAM = $10 DEFINE __CS0_UBR_INIT_PARAM = $1f DEFINE __CS0_CTL_INIT_PARAM = $a8 DEFINE __CS0_BMC_INIT_PARAM = $02 -DEFINE __CS1_LBR_INIT_PARAM = $b8 -DEFINE __CS1_UBR_INIT_PARAM = $b9 +DEFINE __CS1_LBR_INIT_PARAM = $c0 +DEFINE __CS1_UBR_INIT_PARAM = $c7 DEFINE __CS1_CTL_INIT_PARAM = $28 DEFINE __CS1_BMC_INIT_PARAM = $02 DEFINE __CS2_LBR_INIT_PARAM = $80 DEFINE __CS2_UBR_INIT_PARAM = $bf DEFINE __CS2_CTL_INIT_PARAM = $28 -DEFINE __CS2_BMC_INIT_PARAM = $02 -DEFINE __CS3_LBR_INIT_PARAM = $60 -DEFINE __CS3_UBR_INIT_PARAM = $7f -DEFINE __CS3_CTL_INIT_PARAM = $a8 +DEFINE __CS2_BMC_INIT_PARAM = $81 +DEFINE __CS3_LBR_INIT_PARAM = $00 +DEFINE __CS3_UBR_INIT_PARAM = $00 +DEFINE __CS3_CTL_INIT_PARAM = $00 DEFINE __CS3_BMC_INIT_PARAM = $02 DEFINE __RAM_CTL_INIT_PARAM = $C0 DEFINE __RAM_ADDR_U_INIT_PARAM = $B7 @@ -84,9 +84,9 @@ DEFINE __FLASH_ADDR_U_INIT_PARAM = $00 define _SYS_CLK_FREQ = 50000000 define _OSC_FREQ = 5000000 -define _SYS_CLK_SRC = 1 -define _OSC_FREQ_MULT = 10 -define __PLL_CTL0_INIT_PARAM = $41 +define _SYS_CLK_SRC = 0 +define _OSC_FREQ_MULT = 1 +define __PLL_CTL0_INIT_PARAM = $40 define _zsl_g_clock_xdefine = 50000000 diff --git a/configs/ez80f910200zco/src/Makefile b/configs/ez80f910200zco/src/Makefile index 66b05da7d0..e7bc3fc3ef 100644 --- a/configs/ez80f910200zco/src/Makefile +++ b/configs/ez80f910200zco/src/Makefile @@ -68,7 +68,7 @@ $(AOBJS): %$(OBJEXT): %$(ASMEXT) $(call ASSEMBLE, $<, $@) $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c - $(call COMPILE, `cygpath -w $<`, $@) + $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) @( for obj in $(OBJS) ; do \ diff --git a/configs/z16f2800100zcog/ostest/Make.defs b/configs/z16f2800100zcog/ostest/Make.defs index 58a4dbc5d5..273811bf70 100644 --- a/configs/z16f2800100zcog/ostest/Make.defs +++ b/configs/z16f2800100zcog/ostest/Make.defs @@ -136,12 +136,12 @@ endef define COMPILE @#echo "CC: $1" - @$(CC) $(CFLAGS) $1 + @(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile) endef define ASSEMBLE @#echo "AS: $1" - @$(AS) -c $(AFLAGS) $1 + @(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) endef define ARCHIVE diff --git a/configs/z16f2800100zcog/pashello/Make.defs b/configs/z16f2800100zcog/pashello/Make.defs index d77b201b90..c053a26507 100755 --- a/configs/z16f2800100zcog/pashello/Make.defs +++ b/configs/z16f2800100zcog/pashello/Make.defs @@ -136,12 +136,12 @@ endef define COMPILE @#echo "CC: $1" - @$(CC) $(CFLAGS) $1 -endef + @(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile) +eendef define ASSEMBLE @#echo "AS: $1" - @$(AS) -c $(AFLAGS) $1 + @(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) endef define ARCHIVE diff --git a/configs/z16f2800100zcog/src/Makefile b/configs/z16f2800100zcog/src/Makefile index 8291ab20f2..45564b0147 100644 --- a/configs/z16f2800100zcog/src/Makefile +++ b/configs/z16f2800100zcog/src/Makefile @@ -61,7 +61,7 @@ $(AOBJS): %$(OBJEXT): %$(ASMEXT) $(call ASSEMBLE, $<, $@) $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c - $(call COMPILE, `cygpath -w $<`, $@) + $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) @( for obj in $(OBJS) ; do \ diff --git a/configs/z8encore000zco/ostest/Make.defs b/configs/z8encore000zco/ostest/Make.defs index 87fa8df2a1..880c79e868 100644 --- a/configs/z8encore000zco/ostest/Make.defs +++ b/configs/z8encore000zco/ostest/Make.defs @@ -162,12 +162,12 @@ endef define COMPILE @#echo "CC: $1" - @$(CC) $(CFLAGS) $1 + @(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile) endef define ASSEMBLE @#echo "AS: $1" - @$(AS) -c $(AFLAGS) $1 + @(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) endef define ARCHIVE diff --git a/configs/z8encore000zco/src/Makefile b/configs/z8encore000zco/src/Makefile index a8b17432e5..80f2994103 100644 --- a/configs/z8encore000zco/src/Makefile +++ b/configs/z8encore000zco/src/Makefile @@ -61,7 +61,7 @@ $(AOBJS): %$(OBJEXT): %$(ASMEXT) $(call ASSEMBLE, $<, $@) $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c - $(call COMPILE, `cygpath -w $<`, $@) + $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) @( for obj in $(OBJS) ; do \ diff --git a/configs/z8f64200100kit/ostest/Make.defs b/configs/z8f64200100kit/ostest/Make.defs index 72e025a407..1428ef207e 100644 --- a/configs/z8f64200100kit/ostest/Make.defs +++ b/configs/z8f64200100kit/ostest/Make.defs @@ -162,12 +162,12 @@ endef define COMPILE @#echo "CC: $1" - @$(CC) $(CFLAGS) $1 + @(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile) endef define ASSEMBLE @#echo "AS: $1" - @$(AS) -c $(AFLAGS) $1 + @(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) endef define ARCHIVE diff --git a/configs/z8f64200100kit/src/Makefile b/configs/z8f64200100kit/src/Makefile index cb7c221083..7d68ee22cf 100644 --- a/configs/z8f64200100kit/src/Makefile +++ b/configs/z8f64200100kit/src/Makefile @@ -61,7 +61,7 @@ $(AOBJS): %$(OBJEXT): %$(ASMEXT) $(call ASSEMBLE, $<, $@) $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c - $(call COMPILE, `cygpath -w $<`, $@) + $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) @( for obj in $(OBJS) ; do \