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

Misc build fixes, some from Mike some for ez80 native build

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5389 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2012-11-26 15:06:50 +00:00
parent 4dcc80f24f
commit 25f1b3b97b
6 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/lpc31xx/lpc31_usbdev.c
+1 -1
View File
@@ -75,7 +75,7 @@
/* Configuration ***************************************************************/ /* Configuration ***************************************************************/
#ifndef CONFIG_LPC31_USBDEV_EP0_MAXSIZE #ifndef CONFIG_LPC31_USBDEV_EP0_MAXSIZE
# define CONFIG_LPC31_LPC31_USBDEV_EP0_MAXSIZE 64 # define CONFIG_LPC31_USBDEV_EP0_MAXSIZE 64
#endif #endif
#ifndef CONFIG_USBDEV_MAXPOWER #ifndef CONFIG_USBDEV_MAXPOWER
arch/z80/src/Makefile.zdsii
+3 -3
View File
@@ -130,12 +130,12 @@ ifeq ($(CONFIG_ARCH_CHIP_EZ80F91),y)
@echo "$(ZDSZILOGLIBDIR)\uartf91$(LIBEXT)">>nuttx.linkcmd @echo "$(ZDSZILOGLIBDIR)\uartf91$(LIBEXT)">>nuttx.linkcmd
endif endif
else else
@echo "\"${shell cygpath -w "$(TOPDIR)/nuttx\"= \\" >>nuttx.linkcmd @echo "\"${shell cygpath -w "$(TOPDIR)/nuttx"}\"= \\" >>nuttx.linkcmd
@echo " \"${shell cygpath -w "$(ARCHSRCDIR)/$(HEAD_OBJ)\", \\" >>nuttx.linkcmd @echo " \"${shell cygpath -w "$(ARCHSRCDIR)/$(HEAD_OBJ)"}\", \\" >>nuttx.linkcmd
$(Q) ( for lib in $(LINKLIBS); do \ $(Q) ( for lib in $(LINKLIBS); do \
echo " \"`cygpath -w "$(TOPDIR)/lib/$${lib}"`\", \\" >>nuttx.linkcmd; \ echo " \"`cygpath -w "$(TOPDIR)/lib/$${lib}"`\", \\" >>nuttx.linkcmd; \
done ; ) done ; )
@echo " \"${shell cygpath -w "$(ARCHSRCDIR)/board/libboard$(LIBEXT)\", \\" >>nuttx.linkcmd @echo " \"${shell cygpath -w "$(ARCHSRCDIR)/board/libboard$(LIBEXT)"}\", \\" >>nuttx.linkcmd
ifeq ($(CONFIG_ARCH_CHIP_Z8F640X),y) ifeq ($(CONFIG_ARCH_CHIP_Z8F640X),y)
@echo " \"${shell cygpath -w "$(ZDSSTDLIBDIR)/chelprevaaD$(LIBEXT)"}\", \\" >>nuttx.linkcmd @echo " \"${shell cygpath -w "$(ZDSSTDLIBDIR)/chelprevaaD$(LIBEXT)"}\", \\" >>nuttx.linkcmd
@echo " \"${shell cygpath -w "$(ZDSSTDLIBDIR)/crtrevaaLDD$(LIBEXT)"}\", \\" >>nuttx.linkcmd @echo " \"${shell cygpath -w "$(ZDSSTDLIBDIR)/crtrevaaLDD$(LIBEXT)"}\", \\" >>nuttx.linkcmd
configs/ez80f910200kitg/ostest/Make.defs
+8 -18
View File
@@ -33,8 +33,8 @@
# #
############################################################################ ############################################################################
include ${TOPDIR}/.config include $(TOPDIR)/.config
include ${TOPDIR}/tools/Config.mk include $(TOPDIR)/tools/Config.mk
# These are the directories where the ZDS-II toolchain is installed # These are the directories where the ZDS-II toolchain is installed
@@ -140,21 +140,11 @@ LINKCMDTEMPLATE = $(TOPDIR)$(DELIM)configs$(DELIM)ez80f910200kitg$(DELIM)ostest$
# Tool names/pathes # Tool names/pathes
CROSSDEV = CROSSDEV =
CC = ez80cc.exe
CPP = gcc -E CPP = gcc -E
LD = ez80link.exe
ifeq ($(CONFIG_WINDOWS_NATIVE),y) AS = ez80asm.exe
# PATH varialble should be set AR = ez80lib.exe
CC = ez80cc.exe
LD = ez80link.exe
AS = ez80asm.exe
AR = ez80lib.exe
else
# Cygwin PATH variable is not sufficient
CC = "$(ZDSBINDIR)$(DELIM)ez80cc.exe"
LD = "$(ZDSBINDIR)$(DELIM)ez80link.exe"
AS = "$(ZDSBINDIR)$(DELIM)ez80asm.exe"
AR = "$(ZDSBINDIR)$(DELIM)ez80lib.exe"
endif
# File extensions # File extensions
@@ -205,11 +195,11 @@ define PREPROCESS
endef endef
define COMPILE define COMPILE
$(Q) "$(CC)" $(CFLAGS) ${shell echo $1 | sed -e "s/\//\\/g"} $(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile)
endef endef
define ASSEMBLE define ASSEMBLE
$(Q) "$(AS)" $(AFLAGS) ${shell echo $1 | sed -e "s/\//\\/g"} $(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile)
endef endef
define ARCHIVE define ARCHIVE
configs/ez80f910200kitg/ostest/setenv.sh
+5 -2
View File
@@ -54,7 +54,10 @@ fi
TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_5.1.1\bin" TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_5.1.1\bin"
# #
# Add the path to the toolchain to the PATH varialble # Add the path to the toolchain to the PATH varialble. NOTE that /bin and /usr/bin
# preceded the toolchain bin directory. This is because the ZDSII bin directory
# includes binaries like make.exe that will interfere with the normal build process
# if we do not give priority to the versions at /bin and /usr/bin.
# #
export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}" export PATH="/bin:/usr/bin:${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
echo "PATH : ${PATH}" echo "PATH : ${PATH}"
configs/olimex-stm32-p107/nsh/Make.defs
+6
View File
@@ -37,6 +37,12 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
ifeq ($(CONFIG_STM32_DFU),y)
LDSCRIPT = ld.script.dfu
else
LDSCRIPT = ld.script
endif
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
# Windows-native toolchains # Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/winlink.sh DIRLINK = $(TOPDIR)/tools/winlink.sh
configs/olimex-stm32-p107/ostest/Make.defs
+6
View File
@@ -37,6 +37,12 @@ include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
ifeq ($(CONFIG_STM32_DFU),y)
LDSCRIPT = ld.script.dfu
else
LDSCRIPT = ld.script
endif
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
# Windows-native toolchains # Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/winlink.sh DIRLINK = $(TOPDIR)/tools/winlink.sh