Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-27 19:36:35 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Correct some issues with last check-in; ez80 still does not build

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5339 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2012-11-11 23:44:31 +00:00
parent a1cf659333
commit a5f761c24e
47 changed files with 603 additions and 485 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+1 -1
View File
@@ -56,7 +56,7 @@ endif
# This define is passed as EXTRADEFINES for kernel-mode builds. It is also passed # This define is passed as EXTRADEFINES for kernel-mode builds. It is also passed
# during PASS1 (but not PASS2) context and depend targets. # during PASS1 (but not PASS2) context and depend targets.
KDEFINE = ${shell $(TOPDIR)/tools/define.sh $(CC) __KERNEL__} KDEFINE = ${shell $(TOPDIR)/tools/define.sh "$(CC)" __KERNEL__}
# Process architecture and board-specific directories # Process architecture and board-specific directories
arch/8051/src/Makefile
+4 -4
View File
@@ -171,7 +171,7 @@ board/libboard$(LIBEXT):
pass1.hex: up_mem.h $(SDCCLIBDIR)/libmysdcc.lib $(LINKOBJS) board/libboard$(LIBEXT) pass1.hex: up_mem.h $(SDCCLIBDIR)/libmysdcc.lib $(LINKOBJS) board/libboard$(LIBEXT)
@echo "LD: $@" @echo "LD: $@"
@$(CC) $(LDFLAGS) $(LDPATHS) -L$(BOARDDIR) $(SDCCPATH) $(LINKOBJS) \ @"$(CC)" $(LDFLAGS) $(LDPATHS) -L$(BOARDDIR) $(SDCCPATH) $(LINKOBJS) \
$(LDLIBS) -llibboard$(LIBEXT) $(SDCCLIBS) -o $@ $(LDLIBS) -llibboard$(LIBEXT) $(SDCCLIBS) -o $@
@rm -f up_mem.h @rm -f up_mem.h
@rm -f up_allocateheap$(OBJEXT) libarch$(LIBEXT) @rm -f up_allocateheap$(OBJEXT) libarch$(LIBEXT)
@@ -179,7 +179,7 @@ pass1.hex: up_mem.h $(SDCCLIBDIR)/libmysdcc.lib $(LINKOBJS) board/libboard$(LIBE
nuttx.hex: up_mem.h $(SDCCLIBDIR)/libmysdcc.lib $(LINKOBJS) nuttx.hex: up_mem.h $(SDCCLIBDIR)/libmysdcc.lib $(LINKOBJS)
@echo "LD: $@" @echo "LD: $@"
@$(CC) $(LDFLAGS) $(LDPATHS) -L$(BOARDDIR) $(SDCCPATH) $(LINKOBJS) \ @"$(CC)" $(LDFLAGS) $(LDPATHS) -L$(BOARDDIR) $(SDCCPATH) $(LINKOBJS) \
$(LDLIBS) -llibboard$(LIBEXT) $(SDCCLIBS) -o $@ $(LDLIBS) -llibboard$(LIBEXT) $(SDCCLIBS) -o $@
nuttx$(EXEEXT): pass1.hex nuttx.hex nuttx$(EXEEXT): pass1.hex nuttx.hex
@@ -201,7 +201,7 @@ export_head: board/libboard$(LIBEXT) p_head$(OBJEXT)
# a PHONY target that just sets upt the up_irqtest build correctly # a PHONY target that just sets upt the up_irqtest build correctly
up_irqtest.hex: $(TESTOBJS) up_irqtest.hex: $(TESTOBJS)
$(CC) $(LDFLAGS) -L. $(SDCCPATH) $(TESTLINKOBJS) $(TESTOBJS) $(TESTEXTRAOBJS) $(SDCCLIBS) -o $@ "$(CC)" $(LDFLAGS) -L. $(SDCCPATH) $(TESTLINKOBJS) $(TESTOBJS) $(TESTEXTRAOBJS) $(SDCCLIBS) -o $@
irqtest: irqtest:
@$(MAKE) TOPDIR=../../.. up_irqtest.hex @$(MAKE) TOPDIR=../../.. up_irqtest.hex
@@ -212,7 +212,7 @@ irqtest:
@if [ -e board/Makefile ]; then \ @if [ -e board/Makefile ]; then \
$(MAKE) -C board TOPDIR=$(TOPDIR) depend ; \ $(MAKE) -C board TOPDIR=$(TOPDIR) depend ; \
fi fi
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep @$(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ @touch $@
depend: .depend depend: .depend
arch/arm/src/Makefile
+14 -14
View File
@@ -78,32 +78,32 @@ EXTRA_LIBPATHS ?=
LINKLIBS ?= LINKLIBS ?=
ifeq ($(CONFIG_WINDOWS_NATIVE),y) ifeq ($(CONFIG_WINDOWS_NATIVE),y)
BOARDDIR = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile") BOARDMAKE = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile")
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\lib"}" LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\lib"}"
ifneq ($(BOARDDIR),) ifdef BOARDMAKE
LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}" LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board"}"
endif endif
else else
BOARDDIR = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile") BOARDMAKE = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile")
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}" LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}"
ifneq ($(BOARDDIR),) ifdef BOARDMAKE
LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}" LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"}"
endif endif
else else
LIBPATHS += -L"(TOPDIR)/lib" LIBPATHS += -L"$(TOPDIR)/lib"
ifneq ($(BOARDDIR),) ifdef BOARDMAKE
LIBPATHS += -L"$(BOARDDIR)" LIBPATHS += -L"$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"
endif endif
endif endif
endif endif
LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS))) LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS)))
LIBGCC = "${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name}" LIBGCC = "${shell "$(CC)" $(ARCHCPUFLAGS) -print-libgcc-file-name}"
GCC_LIBDIR := ${shell dirname $(LIBGCC)} GCC_LIBDIR := ${shell dirname $(LIBGCC)}
VPATH = chip:common:$(ARCH_SUBDIR) VPATH = chip:common:$(ARCH_SUBDIR)
@@ -150,24 +150,24 @@ endif
# Dependencies # Dependencies
.depend: Makefile chip/Make.defs $(SRCS) .depend: Makefile chip/Make.defs $(SRCS)
ifneq ($(BOARDDIR),) ifdef BOARDMAKE
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" depend $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" depend
endif endif
$(Q) $(MKDEP) --dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR) \ $(Q) $(MKDEP) --dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR) \
$(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
$(Q) touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
ifneq ($(BOARDDIR),) ifdef BOARDMAKE
$(MAKE) -C board TOPDIR="$(TOPDIR)" clean $(MAKE) -C board TOPDIR="$(TOPDIR)" clean
endif endif
$(Q) rm -f libarch$(LIBEXT) *~ .*.swp $(Q) rm -f libarch$(LIBEXT) *~ .*.swp
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
ifneq ($(BOARDDIR),) ifdef BOARDMAKE
$(MAKE) -C board TOPDIR="$(TOPDIR)" distclean $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean
endif endif
$(Q) rm -f Make.dep .depend $(Q) rm -f Make.dep .depend
arch/avr/src/Makefile
+14 -14
View File
@@ -79,25 +79,25 @@ EXTRA_LIBS ?=
LINKLIBS ?= LINKLIBS ?=
ifeq ($(CONFIG_WINDOWS_NATIVE),y) ifeq ($(CONFIG_WINDOWS_NATIVE),y)
BOARDDIR = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile") BOARDMAKE = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile")
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\lib"}" LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\lib"}"
ifneq ($(BOARDDIR),) ifdef BOARDMAKE
LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}" LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board"}"
endif endif
else else
BOARDDIR = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile") BOARDMAKE = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile")
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}" LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}"
ifneq ($(BOARDDIR),) ifdef BOARDMAKE
LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}" LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"}"
endif endif
else else
LIBPATHS += -L"(TOPDIR)/lib" LIBPATHS += -L"$(TOPDIR)/lib"
ifneq ($(BOARDDIR),) ifdef BOARDMAKE
LIBPATHS += -L"$(BOARDDIR)" LIBPATHS += -L"$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"
endif endif
endif endif
endif endif
@@ -105,7 +105,7 @@ endif
LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS))) LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS)))
LIBGCC = "${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name}" LIBGCC = "${shell "$(CC)" $(ARCHCPUFLAGS) -print-libgcc-file-name}"
VPATH = chip:common:$(ARCH_SUBDIR) VPATH = chip:common:$(ARCH_SUBDIR)
@@ -146,24 +146,24 @@ export_head: board/libboard$(LIBEXT) $(HEAD_OBJ)
# Dependencies # Dependencies
.depend: Makefile chip/Make.defs $(SRCS) .depend: Makefile chip/Make.defs $(SRCS)
ifneq ($(BOARDDIR),) ifdef BOARDMAKE
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" depend $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" depend
endif endif
$(Q) $(MKDEP) --dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR) \ $(Q) $(MKDEP) --dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR) \
$(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
$(Q) touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
ifneq ($(BOARDDIR),) ifdef BOARDMAKE
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" clean $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" clean
endif endif
$(Q) rm -f libarch$(LIBEXT) *~ .*.swp $(Q) rm -f libarch$(LIBEXT) *~ .*.swp
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
ifneq ($(BOARDDIR),) ifdef BOARDMAKE
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean
endif endif
$(Q) rm -f Make.dep .depend $(Q) rm -f Make.dep .depend
arch/hc/src/Makefile
+14 -14
View File
@@ -72,32 +72,32 @@ EXTRA_LIBS ?=
LINKLIBS ?= LINKLIBS ?=
ifeq ($(CONFIG_WINDOWS_NATIVE),y) ifeq ($(CONFIG_WINDOWS_NATIVE),y)
BOARDDIR = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile") BOARDMAKE = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile")
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\lib"}" LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\lib"}"
ifneq ($(BOARDDIR),) ifdef BOARDMAKE
LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}" LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board"}"
endif endif
else else
BOARDDIR = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile") BOARDMAKE = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile")
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}" LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}"
ifneq ($(BOARDDIR),) ifdef BOARDMAKE
LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}" LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"}"
endif endif
else else
LIBPATHS += -L"(TOPDIR)/lib" LIBPATHS += -L"$(TOPDIR)/lib"
ifneq ($(BOARDDIR),) ifdef BOARDMAKE
LIBPATHS += -L"$(BOARDDIR)" LIBPATHS += -L"$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"
endif endif
endif endif
endif endif
LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS))) LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS)))
LIBGCC = "${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name}" LIBGCC = "${shell "$(CC)" $(ARCHCPUFLAGS) -print-libgcc-file-name}"
VPATH = chip:common:$(ARCH_SUBDIR) VPATH = chip:common:$(ARCH_SUBDIR)
@@ -137,24 +137,24 @@ export_head: board/libboard$(LIBEXT) $(HEAD_OBJ)
# Dependencies # Dependencies
.depend: Makefile chip/Make.defs $(SRCS) .depend: Makefile chip/Make.defs $(SRCS)
ifneq ($(BOARDDIR),) ifdef BOARDMAKE
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" depend $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" depend
endif endif
$(Q) $(MKDEP) --dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR) \ $(Q) $(MKDEP) --dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR) \
$(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
$(Q) touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
ifneq ($(BOARDDIR),) ifdef BOARDMAKE
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" clean $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" clean
endif endif
$(Q) rm -f libarch$(LIBEXT) *~ .*.swp $(Q) rm -f libarch$(LIBEXT) *~ .*.swp
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
ifneq ($(BOARDDIR),) ifdef BOARDMAKE
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean
endif endif
$(Q) rm -f Make.dep .depend $(Q) rm -f Make.dep .depend
arch/mips/src/Makefile
+14 -14
View File
@@ -69,32 +69,32 @@ EXTRA_LIBS ?=
LINKLIBS ?= LINKLIBS ?=
ifeq ($(CONFIG_WINDOWS_NATIVE),y) ifeq ($(CONFIG_WINDOWS_NATIVE),y)
BOARDDIR = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile") BOARDMAKE = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile")
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\lib"}" LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\lib"}"
ifneq ($(BOARDDIR),) ifdef BOARDMAKE
LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}" LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board"}"
endif endif
else else
BOARDDIR = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile") BOARDMAKE = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile")
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}" LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}"
ifneq ($(BOARDDIR),) ifdef BOARDMAKE
LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}" LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"}"
endif endif
else else
LIBPATHS += -L"(TOPDIR)/lib" LIBPATHS += -L"$(TOPDIR)/lib"
ifneq ($(BOARDDIR),) ifdef BOARDMAKE
LIBPATHS += -L"$(BOARDDIR)" LIBPATHS += -L"$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"
endif endif
endif endif
endif endif
LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS))) LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS)))
LIBGCC = "${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name}" LIBGCC = "${shell "$(CC)" $(ARCHCPUFLAGS) -print-libgcc-file-name}"
VPATH = chip:common:$(ARCH_SUBDIR) VPATH = chip:common:$(ARCH_SUBDIR)
@@ -135,24 +135,24 @@ export_head: board/libboard$(LIBEXT) $(HEAD_OBJ)
# Dependencies # Dependencies
.depend: Makefile chip/Make.defs $(SRCS) .depend: Makefile chip/Make.defs $(SRCS)
ifneq ($(BOARDDIR),) ifdef BOARDMAKE
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" depend $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" depend
endif endif
$(Q) $(MKDEP) --dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR) \ $(Q) $(MKDEP) --dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR) \
$(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
$(Q) touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
ifneq ($(BOARDDIR),) ifdef BOARDMAKE
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" clean $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" clean
endif endif
$(Q) rm -f libarch$(LIBEXT) *~ .*.swp $(Q) rm -f libarch$(LIBEXT) *~ .*.swp
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
ifneq ($(BOARDDIR),) ifdef BOARDMAKE
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean
endif endif
$(Q) rm -f Make.dep .depend $(Q) rm -f Make.dep .depend
arch/rgmp/src/Makefile
+2 -2
View File
@@ -55,7 +55,7 @@ LINKOBJS = $(LINKSRCS:.c=$(OBJEXT))
LDFLAGS += -T$(RGMPLKSCPT) LDFLAGS += -T$(RGMPLKSCPT)
LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS))) LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS)))
LDPATHS += -L"$(TOPDIR)/lib -L$(RGMPLIBDIR) LDPATHS += -L"$(TOPDIR)/lib -L$(RGMPLIBDIR)
LDLIBS += -lrgmp $(shell $(CC) -print-libgcc-file-name) LDLIBS += -lrgmp $(shell "$(CC)" -print-libgcc-file-name)
all: libarch$(LIBEXT) all: libarch$(LIBEXT)
@@ -90,7 +90,7 @@ export_head:
# Dependencies # Dependencies
.depend: Makefile $(SRCS) $(LINKSRCS) .depend: Makefile $(SRCS) $(LINKSRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) $(LINKSRCS) >Make.dep @$(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) $(LINKSRCS) >Make.dep
@touch $@ @touch $@
depend: .depend depend: .depend
arch/sh/src/Makefile
+15 -15
View File
@@ -55,32 +55,32 @@ EXTRA_LIBS ?=
LINKLIBS ?= LINKLIBS ?=
ifeq ($(CONFIG_WINDOWS_NATIVE),y) ifeq ($(CONFIG_WINDOWS_NATIVE),y)
BOARDDIR = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile") BOARDMAKE = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile")
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\lib"}" LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\lib"}"
ifneq ($(BOARDDIR),) ifdef BOARDMAKE
LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}" LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board"}"
endif endif
else else
BOARDDIR = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile") BOARDMAKE = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile")
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}" LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}"
ifneq ($(BOARDDIR),) ifdef BOARDMAKE
LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}" LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"}"
endif endif
else else
LIBPATHS += -L"(TOPDIR)/lib" LIBPATHS += -L"$(TOPDIR)/lib"
ifneq ($(BOARDDIR),) ifdef BOARDMAKE
LIBPATHS += -L"$(BOARDDIR)" LIBPATHS += -L"$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"
endif endif
endif endif
endif endif
LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS))) LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS)))
LIBGCC = ${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name} LIBGCC = ${shell "$(CC)" $(ARCHCPUFLAGS) -print-libgcc-file-name}
VPATH = chip:common VPATH = chip:common
@@ -102,7 +102,7 @@ board/libboard$(LIBEXT):
nuttx: $(HEAD_OBJ) board/libboard$(LIBEXT) nuttx: $(HEAD_OBJ) board/libboard$(LIBEXT)
@echo "LD: nuttx" @echo "LD: nuttx"
$(Q) $(LD) --entry=__start $(LDFLAGS) $(LDPATHS) -L$(BOARDDIR) -o $(TOPDIR)/$@ $(HEAD_OBJ) \ $(Q) $(LD) --entry=__start $(LDFLAGS) $(LDPATHS) -L$(BOARDMAKE) -o $(TOPDIR)/$@ $(HEAD_OBJ) \
--start-group $(LDLIBS) -lboard $(EXTRA_LIBS) $(LIBGCC) --end-group --start-group $(LDLIBS) -lboard $(EXTRA_LIBS) $(LIBGCC) --end-group
$(Q) $(NM) $(TOPDIR)/$@ | \ $(Q) $(NM) $(TOPDIR)/$@ | \
grep -v '\(compiled\)\|\(\$(OBJEXT)$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \ grep -v '\(compiled\)\|\(\$(OBJEXT)$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \
@@ -121,23 +121,23 @@ export_head: board/libboard$(LIBEXT) $(HEAD_OBJ)
# Dependencies # Dependencies
.depend: Makefile chip/Make.defs $(SRCS) .depend: Makefile chip/Make.defs $(SRCS)
ifneq ($(BOARDDIR),) ifdef BOARDMAKE
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" depend $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" depend
endif endif
$(Q) $(MKDEP) --dep-path chip --dep-path common $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) --dep-path chip --dep-path common "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
$(Q) touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
ifneq ($(BOARDDIR),) ifdef BOARDMAKE
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" clean $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" clean
endif endif
$(Q) rm -f libarch$(LIBEXT) *~ .*.swp $(Q) rm -f libarch$(LIBEXT) *~ .*.swp
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
ifneq ($(BOARDDIR),) ifdef BOARDMAKE
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean
endif endif
$(Q) rm -f Make.dep .depend $(Q) rm -f Make.dep .depend
arch/sim/src/Makefile
+5 -5
View File
@@ -127,8 +127,8 @@ endif
# Most are provided by LINKLIBS on the MAKE command line # Most are provided by LINKLIBS on the MAKE command line
LINKLIBS ?= LINKLIBS ?=
LIBPATHS += -L"(TOPDIR)/lib" LIBPATHS += -L"$(TOPDIR)/lib"
LIBPATHS += -L"$(BOARDDIR)" LIBPATHS += -Lboard
LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS))) LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS)))
# Add the board-specific library and directory # Add the board-specific library and directory
@@ -150,7 +150,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c
$(HOSTOBJS): %$(OBJEXT): %.c $(HOSTOBJS): %$(OBJEXT): %.c
$(Q) echo "CC: $<" $(Q) echo "CC: $<"
$(Q) $(CC) -c $(HOSTCFLAGS) $< -o $@ $(Q) "$(CC)" -c $(HOSTCFLAGS) $< -o $@
# The architecture-specific library # The architecture-specific library
@@ -186,7 +186,7 @@ nuttx.rel : libarch$(LIBEXT) board/libboard$(LIBEXT) $(HOSTOS)-names.dat $(LINKO
nuttx$(EXEEXT): cleanrel nuttx.rel $(HOSTOBJS) nuttx$(EXEEXT): cleanrel nuttx.rel $(HOSTOBJS)
$(Q) echo "LD: nuttx$(EXEEXT)" $(Q) echo "LD: nuttx$(EXEEXT)"
$(Q) $(CC) $(CCLINKFLAGS) $(LDPATHS) -o $(TOPDIR)/$@ nuttx.rel $(HOSTOBJS) $(DRVLIB) $(STDLIBS) $(Q) "$(CC)" $(CCLINKFLAGS) $(LDPATHS) -o $(TOPDIR)/$@ nuttx.rel $(HOSTOBJS) $(DRVLIB) $(STDLIBS)
$(Q) $(NM) $(TOPDIR)/$@ | \ $(Q) $(NM) $(TOPDIR)/$@ | \
grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \ grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \
sort > $(TOPDIR)/System.map sort > $(TOPDIR)/System.map
@@ -202,7 +202,7 @@ export_head: board/libboard$(LIBEXT) up_head.o $(HOSTOBJS)
# Dependencies # Dependencies
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
$(Q) touch $@ $(Q) touch $@
depend: .depend depend: .depend
arch/x86/src/Makefile
+14 -14
View File
@@ -69,32 +69,32 @@ EXTRA_LIBS ?=
LINKLIBS ?= LINKLIBS ?=
ifeq ($(CONFIG_WINDOWS_NATIVE),y) ifeq ($(CONFIG_WINDOWS_NATIVE),y)
BOARDDIR = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile") BOARDMAKE = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile")
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\lib"}" LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\lib"}"
ifneq ($(BOARDDIR),) ifdef BOARDMAKE
LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}" LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board"}"
endif endif
else else
BOARDDIR = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile") BOARDMAKE = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile")
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}" LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}"
ifneq ($(BOARDDIR),) ifdef BOARDMAKE
LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}" LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"}"
endif endif
else else
LIBPATHS += -L"(TOPDIR)/lib" LIBPATHS += -L"$(TOPDIR)/lib"
ifneq ($(BOARDDIR),) ifdef BOARDMAKE
LIBPATHS += -L"$(BOARDDIR)" LIBPATHS += -L"$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"
endif endif
endif endif
endif endif
LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS))) LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS)))
LIBGCC = "${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name}" LIBGCC = "${shell "$(CC)" $(ARCHCPUFLAGS) -print-libgcc-file-name}"
ifeq ($(HOSTOS),FreeBSD) ifeq ($(HOSTOS),FreeBSD)
HOST_ARCH = ${shell uname -m 2>/dev/null || echo "Other"} HOST_ARCH = ${shell uname -m 2>/dev/null || echo "Other"}
@@ -143,24 +143,24 @@ export_head: board/libboard$(LIBEXT) $(HEAD_OBJ)
# Dependencies # Dependencies
.depend: Makefile chip/Make.defs $(SRCS) .depend: Makefile chip/Make.defs $(SRCS)
ifneq ($(BOARDDIR),) ifdef BOARDMAKE
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" depend $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" depend
endif endif
$(Q) $(MKDEP) --dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR) \ $(Q) $(MKDEP) --dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR) \
$(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
$(Q) touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
ifneq ($(BOARDDIR),) ifdef BOARDMAKE
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" clean $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" clean
endif endif
$(Q) rm -f libarch$(LIBEXT) *~ .*.swp $(Q) rm -f libarch$(LIBEXT) *~ .*.swp
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
ifneq ($(BOARDDIR),) ifdef BOARDMAKE
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean
endif endif
$(Q) rm -f Make.dep .depend $(Q) rm -f Make.dep .depend
arch/z16/src/Makefile
+2 -4
View File
@@ -36,7 +36,7 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
-include chip/Make.defs -include chip/Make.defs
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)}
@@ -65,8 +65,6 @@ COBJS = $(CSRCS:.c=$(OBJEXT))
DEPSRCS = $(SSRCS) $(CSRCS) DEPSRCS = $(SSRCS) $(CSRCS)
OBJS = $(AOBJS) $(COBJS) OBJS = $(AOBJS) $(COBJS)
BOARDDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src/board
VPATH = chip:common VPATH = chip:common
all: $(HEAD_OBJ) libarch$(LIBEXT) all: $(HEAD_OBJ) libarch$(LIBEXT)
@@ -118,7 +116,7 @@ nuttx$(EXEEXT): $(HEAD_OBJ) board/libboard$(LIBEXT) nuttx.linkcmd
@if [ -e board/Makefile ]; then \ @if [ -e board/Makefile ]; then \
$(MAKE) -C board TOPDIR="$(TOPDIR)" depend ; \ $(MAKE) -C board TOPDIR="$(TOPDIR)" depend ; \
fi fi
@$(MKDEP) --dep-path chip --dep-path common $(CC) -- $(CFLAGS) -- $(DEPSRCS) >Make.dep @$(MKDEP) --dep-path chip --dep-path common "$(CC)" -- $(CFLAGS) -- $(DEPSRCS) >Make.dep
@touch $@ @touch $@
# This is part of the top-level export target # This is part of the top-level export target
arch/z80/src/Makefile
+1 -1
View File
@@ -42,7 +42,7 @@
############################################################################ ############################################################################
# Compiler-Dependent Make # Compiler-Dependent Make
COMPILER = ${shell basename $(CC)} COMPILER = ${shell basename "$(CC)"}
ifeq ($(COMPILER),sdcc) ifeq ($(COMPILER),sdcc)
include Makefile.sdcc include Makefile.sdcc
else else
arch/z80/src/Makefile.sdcc
+23 -23
View File
@@ -75,7 +75,7 @@ VPATH = chip:common:board
# Libraries # Libraries
LIBGCC = ${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name} LIBGCC = ${shell "$(CC)" $(ARCHCPUFLAGS) -print-libgcc-file-name}
# Supports dynamic sizing of HEAP. # Supports dynamic sizing of HEAP.
# #
@@ -97,11 +97,11 @@ $(COBJS): %$(OBJEXT): %.c
# This is a kludge to work around some conflicting symbols in libsdcc.lib # This is a kludge to work around some conflicting symbols in libsdcc.lib
$(SDCCLIBDIR)/myz80.lib: $(SDCCLIBDIR)/$(SDCCLIB) $(SDCCLIBDIR)/myz80.lib: $(SDCCLIBDIR)/$(SDCCLIB)
@cat $(SDCCLIBDIR)/$(SDCCLIB) | \ $(Q) cat $(SDCCLIBDIR)/$(SDCCLIB) | \
grep -v alloc | grep -v free | grep -v printf | \ grep -v alloc | grep -v free | grep -v printf | \
grep -v _str | grep -v _mem | grep -v crt0\.o \ grep -v _str | grep -v _mem | grep -v crt0\.o \
> myz80.lib > myz80.lib
@mv -f myz80.lib $(SDCCLIBDIR)/myz80.lib $(Q) mv -f myz80.lib $(SDCCLIBDIR)/myz80.lib
# Create a header file that contains addressing information needed by the code # Create a header file that contains addressing information needed by the code
@@ -139,7 +139,7 @@ libarch$(LIBEXT): up_mem.h asm_mem.h $(OBJS)
# This builds the libboard library in the board/ subdirectory # This builds the libboard library in the board/ subdirectory
board/libboard$(LIBEXT): board/libboard$(LIBEXT):
@$(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES) $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES)
# This target builds the final executable # This target builds the final executable
@@ -149,7 +149,7 @@ pass1.hex: up_mem.h asm_mem.h $(SDCCLIBDIR)/myz80.lib $(HEAD_OBJ) board/libboard
@echo "-k $(BOARDDIR)" >>pass1.lnk # Path to board library @echo "-k $(BOARDDIR)" >>pass1.lnk # Path to board library
@echo "-k $(SDCCLIBDIR)" >>pass1.lnk # Path to SDCC z80 library @echo "-k $(SDCCLIBDIR)" >>pass1.lnk # Path to SDCC z80 library
@echo "-l libboard$(LIBEXT)" >>pass1.lnk # Name of board library @echo "-l libboard$(LIBEXT)" >>pass1.lnk # Name of board library
@for LIB in $(LINKLIBS); do \ $(Q) for LIB in $(LINKLIBS); do \
echo "-l $(TOPDIR)/lib/$$LIB" >> pass1.lnk ;\ echo "-l $(TOPDIR)/lib/$$LIB" >> pass1.lnk ;\
done done
@echo "-l myz80.lib" >>pass1.lnk # Name of SDCC z80 library @echo "-l myz80.lib" >>pass1.lnk # Name of SDCC z80 library
@@ -170,11 +170,11 @@ endif
@echo "pass1.hex" >>pass1.lnk # Path to head object @echo "pass1.hex" >>pass1.lnk # Path to head object
@echo "$(HEAD_OBJ)" >>pass1.lnk # Path to head object @echo "$(HEAD_OBJ)" >>pass1.lnk # Path to head object
@echo "-e" >>pass1.lnk # End of script @echo "-e" >>pass1.lnk # End of script
@$(LD) -f pass1.lnk $(Q) $(LD) -f pass1.lnk
@rm -f up_mem.h asm_mem.h $(Q) rm -f up_mem.h asm_mem.h
@rm -f up_allocateheap$(OBJEXT) $(HEAD_OBJ) libarch$(LIBEXT) $(Q) rm -f up_allocateheap$(OBJEXT) $(HEAD_OBJ) libarch$(LIBEXT)
@$(MAKE) TOPDIR="$(TOPDIR)" libarch$(LIBEXT) $(Q) $(MAKE) TOPDIR="$(TOPDIR)" libarch$(LIBEXT)
@$(MAKE) TOPDIR="$(TOPDIR)" $(HEAD_OBJ) $(Q) $(MAKE) TOPDIR="$(TOPDIR)" $(HEAD_OBJ)
nuttx.hex: up_mem.h asm_mem.h $(SDCCLIBDIR)/myz80.lib $(HEAD_OBJ) board/libboard$(LIBEXT) nuttx.hex: up_mem.h asm_mem.h $(SDCCLIBDIR)/myz80.lib $(HEAD_OBJ) board/libboard$(LIBEXT)
@echo "LD: nuttx.hex" @echo "LD: nuttx.hex"
@@ -182,7 +182,7 @@ nuttx.hex: up_mem.h asm_mem.h $(SDCCLIBDIR)/myz80.lib $(HEAD_OBJ) board/libboard
@echo "-k $(BOARDDIR)" >>nuttx.lnk # Path to board library @echo "-k $(BOARDDIR)" >>nuttx.lnk # Path to board library
@echo "-k $(SDCCLIBDIR)" >>nuttx.lnk # Path to SDCC z80 library @echo "-k $(SDCCLIBDIR)" >>nuttx.lnk # Path to SDCC z80 library
@echo "-l libboard$(LIBEXT)" >>nuttx.lnk # Name of board library @echo "-l libboard$(LIBEXT)" >>nuttx.lnk # Name of board library
@for LIB in $(LINKLIBS); do \ $(Q) for LIB in $(LINKLIBS); do \
echo "-l $(TOPDIR)/lib/$$LIB" >> nuttx.lnk ;\ echo "-l $(TOPDIR)/lib/$$LIB" >> nuttx.lnk ;\
done done
@echo "-l myz80.lib" >>nuttx.lnk # Name of SDCC z80 library @echo "-l myz80.lib" >>nuttx.lnk # Name of SDCC z80 library
@@ -203,22 +203,22 @@ endif
@echo "nuttx.hex" >>nuttx.lnk # Path to head object @echo "nuttx.hex" >>nuttx.lnk # Path to head object
@echo "$(HEAD_OBJ)" >>nuttx.lnk # Path to head object @echo "$(HEAD_OBJ)" >>nuttx.lnk # Path to head object
@echo "-e" >>nuttx.lnk # End of script @echo "-e" >>nuttx.lnk # End of script
@$(LD) -f nuttx.lnk $(Q) $(LD) -f nuttx.lnk
nuttx$(EXEEXT): pass1.hex nuttx.hex nuttx$(EXEEXT): pass1.hex nuttx.hex
@rm -f pass1.* $(Q) rm -f pass1.*
@cp -f nuttx.map $(TOPDIR)/. $(Q) cp -f nuttx.map $(TOPDIR)/.
ifeq ($(EXEEXT),.cmd) ifeq ($(EXEEXT),.cmd)
sed s/:00000001FF/:00520001AD/ nuttx.hex | \ sed s/:00000001FF/:00520001AD/ nuttx.hex | \
hex2cmd > $(TOPDIR)/nuttx.cmd hex2cmd > $(TOPDIR)/nuttx.cmd
else else
@packihx nuttx.hex > $(TOPDIR)/nuttx$(EXEEXT) $(Q) packihx nuttx.hex > $(TOPDIR)/nuttx$(EXEEXT)
endif endif
# This is part of the top-level export target # This is part of the top-level export target
export_head: board/libboard$(LIBEXT) $(HEAD_OBJ) export_head: board/libboard$(LIBEXT) $(HEAD_OBJ)
@if [ -d "$(EXPORT_DIR)/startup" ]; then \ $(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \
cp -f $(HEAD_OBJ) "$(EXPORT_DIR)/startup"; \ cp -f $(HEAD_OBJ) "$(EXPORT_DIR)/startup"; \
else \ else \
echo "$(EXPORT_DIR)/startup does not exist"; \ echo "$(EXPORT_DIR)/startup does not exist"; \
@@ -228,25 +228,25 @@ export_head: board/libboard$(LIBEXT) $(HEAD_OBJ)
# Build dependencies # Build dependencies
.depend: Makefile up_mem.h asm_mem.h chip/Make.defs $(DEPSRCS) .depend: Makefile up_mem.h asm_mem.h chip/Make.defs $(DEPSRCS)
@if [ -e board/Makefile ]; then \ $(Q) if [ -e board/Makefile ]; then \
$(MAKE) -C board TOPDIR="$(TOPDIR)" depend ; \ $(MAKE) -C board TOPDIR="$(TOPDIR)" depend ; \
fi fi
@$(MKDEP) --dep-path chip --dep-path common $(CC) -- $(CFLAGS) -- $(DEPSRCS) >Make.dep $(Q) $(MKDEP) --dep-path chip --dep-path common "$(CC)" -- $(CFLAGS) -- $(DEPSRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@if [ -e board/Makefile ]; then \ $(Q) if [ -e board/Makefile ]; then \
$(MAKE) -C board TOPDIR="$(TOPDIR)" clean ; \ $(MAKE) -C board TOPDIR="$(TOPDIR)" clean ; \
fi fi
@rm -f libarch$(LIBEXT) up_mem.h asm_mem.h pass1.* nuttx.* *~ .*.swp $(Q) rm -f libarch$(LIBEXT) up_mem.h asm_mem.h pass1.* nuttx.* *~ .*.swp
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@if [ -e board/Makefile ]; then \ $(Q) if [ -e board/Makefile ]; then \
$(MAKE) -C board TOPDIR="$(TOPDIR)" distclean ; \ $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean ; \
fi fi
@rm -f Make.dep .depend $(Q) rm -f Make.dep .depend
-include Make.dep -include Make.dep
arch/z80/src/Makefile.zdsii
+17 -17
View File
@@ -41,7 +41,7 @@ USRINCLUDES = -usrinc:'.;$(WTOPDIR)\sched;$(WARCHSRCDIR);$(WARCHSRCDIR)\common'
INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES) INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES)
CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
CPPFLAGS += -I$(ARCHSRCDIR) -I$(ZDSSTDINCDIR) -I$(ZDSZILOGINCDIR) CPPFLAGS += -I$(ARCHSRCDIR) -I$(ZDSSTDINCDIR) -I$(ZDSZILOGINCDIR)
LDFLAGS += @"${shell cygpath -w $(ARCHSRCDIR)/nuttx.linkcmd}" LDFLAGS += "${shell cygpath -w $(ARCHSRCDIR)/nuttx.linkcmd}"
############################################################################ ############################################################################
# Files and directories # Files and directories
@@ -75,9 +75,9 @@ all: $(HEAD_OBJ) libarch$(LIBEXT)
.PHONY: board/libboard$(LIBEXT) .PHONY: board/libboard$(LIBEXT)
$(HEAD_GENSRC) $(GENSRCS) : %$(ASMEXT): %.S $(HEAD_GENSRC) $(GENSRCS) : %$(ASMEXT): %.S
@$(CPP) $(CPPFLAGS) $< -o $@.tmp $(Q) $(CPP) $(CPPFLAGS) $< -o $@.tmp
@cat $@.tmp | sed -e "s/^#/;/g" > $@ $(Q) cat $@.tmp | sed -e "s/^#/;/g" > $@
@rm $@.tmp $(Q) rm $@.tmp
$(AOBJS) $(HEAD_OBJ): %$(OBJEXT): %$(ASMEXT) $(AOBJS) $(HEAD_OBJ): %$(OBJEXT): %$(ASMEXT)
$(call ASSEMBLE, $<, $@) $(call ASSEMBLE, $<, $@)
@@ -89,13 +89,13 @@ libarch$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, "$(OBJS)") $(call ARCHIVE, $@, "$(OBJS)")
board/libboard$(LIBEXT): board/libboard$(LIBEXT):
@$(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES) $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES)
nuttx.linkcmd: $(LINKCMDTEMPLATE) nuttx.linkcmd: $(LINKCMDTEMPLATE)
@cp -f $(LINKCMDTEMPLATE) nuttx.linkcmd $(Q) cp -f $(LINKCMDTEMPLATE) nuttx.linkcmd
@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
@( for lib in $(LINKLIBS); do \ $(Q) ( for lib in $(LINKLIBS); do \
echo " \"`cygpath -w $(TOPDIR)/$${lib}`\", \\" >>nuttx.linkcmd; \ echo " \"`cygpath -w $(TOPDIR)/$${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
@@ -123,19 +123,19 @@ endif
nuttx$(EXEEXT): $(HEAD_OBJ) board/libboard$(LIBEXT) nuttx.linkcmd nuttx$(EXEEXT): $(HEAD_OBJ) board/libboard$(LIBEXT) nuttx.linkcmd
@echo "LD: nuttx.hex" @echo "LD: nuttx.hex"
@$(LD) $(LDFLAGS) $(Q) $(LD) $(LDFLAGS)
.depend: Makefile chip/Make.defs $(DEPSRCS) .depend: Makefile chip/Make.defs $(DEPSRCS)
@if [ -e board/Makefile ]; then \ $(Q) if [ -e board/Makefile ]; then \
$(MAKE) -C board TOPDIR="$(TOPDIR)" depend ; \ $(MAKE) -C board TOPDIR="$(TOPDIR)" depend ; \
fi fi
@$(MKDEP) --dep-path chip --dep-path common $(CC) -- $(CFLAGS) -- $(DEPSRCS) >Make.dep $(Q) $(MKDEP) --dep-path chip --dep-path common "$(CC)" -- $(CFLAGS) -- $(DEPSRCS) >Make.dep
@touch $@ $(Q) touch $@
# This is part of the top-level export target # This is part of the top-level export target
export_head: board/libboard$(LIBEXT) $(HEAD_OBJ) export_head: board/libboard$(LIBEXT) $(HEAD_OBJ)
@if [ -d "$(EXPORT_DIR)/startup" ]; then \ $(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \
cp -f $(HEAD_OBJ) "$(EXPORT_DIR)/startup"; \ cp -f $(HEAD_OBJ) "$(EXPORT_DIR)/startup"; \
else \ else \
echo "$(EXPORT_DIR)/startup does not exist"; \ echo "$(EXPORT_DIR)/startup does not exist"; \
@@ -147,17 +147,17 @@ export_head: board/libboard$(LIBEXT) $(HEAD_OBJ)
depend: .depend depend: .depend
clean: clean:
@if [ -e board/Makefile ]; then \ $(Q) if [ -e board/Makefile ]; then \
$(MAKE) -C board TOPDIR="$(TOPDIR)" clean ; \ $(MAKE) -C board TOPDIR="$(TOPDIR)" clean ; \
fi fi
@rm -f libarch$(LIBEXT) *~ .*.swp $(Q) rm -f libarch$(LIBEXT) *~ .*.swp
@rm -f nuttx.linkcmd *.asm *.tmp *.map $(Q) rm -f nuttx.linkcmd *.asm *.tmp *.map
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@if [ -e board/Makefile ]; then \ $(Q) if [ -e board/Makefile ]; then \
$(MAKE) -C board TOPDIR="$(TOPDIR)" distclean ; \ $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean ; \
fi fi
@rm -f Make.dep .depend $(Q) rm -f Make.dep .depend
-include Make.dep -include Make.dep
binfmt/Makefile
+1 -1
View File
@@ -81,7 +81,7 @@ $(BIN): $(BINFMT_OBJS)
$(call ARCHIVE, $@, "$(BINFMT_OBJS)") $(call ARCHIVE, $@, "$(BINFMT_OBJS)")
.depend: Makefile $(BINFMT_SRCS) .depend: Makefile $(BINFMT_SRCS)
$(Q) $(MKDEP) $(DEPPATH) $(CC) -- $(CFLAGS) -- $(BINFMT_SRCS) >Make.dep $(Q) $(MKDEP) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(BINFMT_SRCS) >Make.dep
$(Q) touch $@ $(Q) touch $@
depend: .depend depend: .depend
configs/ez80f910200kitg/ostest/Make.defs
+31 -21
View File
@@ -38,23 +38,33 @@ 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
ZDSVERSION := 4.11.1 ZDSVERSION := 5.1.1
ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION) ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
ZDSBINDIR := $(ZDSINSTALLDIR)/bin
ZDSSTDINCDIR := $(ZDSINSTALLDIR)/include/std ifeq ($(CONFIG_WINDOWS_NATIVE),y)
ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog ZDSBINDIR := $(ZDSINSTALLDIR)\bin
ZDSSTDLIBDIR := $(ZDSINSTALLDIR)/lib/std ZDSSTDINCDIR := $(ZDSINSTALLDIR)\include\std
ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog ZDSZILOGINCDIR := $(ZDSINSTALLDIR)\include\zilog
ZDSSTDLIBDIR := $(ZDSINSTALLDIR)\lib\std
ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)\lib\zilog
else
WINTOOL := y
INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"}
ZDSBINDIR := $(INSTALLDIR)/bin
ZDSSTDINCDIR := $(INSTALLDIR)/include/std
ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog
ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std
ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog
endif
# These are the same directories but with the directory separator # These are the same directories but with the directory separator
# character swapped as needed by the ZDS-II compiler # character swapped as needed by the ZDS-II compiler
WINTOOL := y WTOPDIR := ${shell cygpath -w "$(TOPDIR)"}
WTOPDIR := ${shell cygpath -w $(TOPDIR)} WZDSSTDINCDIR := ${shell cygpath -w "$(ZDSSTDINCDIR)"}
WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)} WZDSZILOGINCDIR := ${shell cygpath -w "$(ZDSZILOGINCDIR)"}
WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)} WZDSSTDLIBDIR := ${shell cygpath -w "$(ZDSSTDLIBDIR)"}
WZDSSTDLIBDIR := ${shell cygpath -w $(ZDSSTDLIBDIR)} WZDSZILOGLIBDIR := ${shell cygpath -w "$(ZDSZILOGLIBDIR)"}
WZDSZILOGLIBDIR := ${shell cygpath -w $(ZDSZILOGLIBDIR)}
# Escaped versions # Escaped versions
@@ -140,35 +150,35 @@ HEXEXT = .hex
define PREPROCESS define PREPROCESS
@echo "CPP: $1->$2" @echo "CPP: $1->$2"
@$(CPP) $(CPPFLAGS) $1 -o $2 $(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2
endef endef
define COMPILE define COMPILE
@#echo "CC: $1" @#echo "CC: $1"
@(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile) $(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile)
endef endef
define ASSEMBLE define ASSEMBLE
@#echo "AS: $1" @#echo "AS: $1"
@(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) $(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile)
endef endef
ifeq ($(CONFIG_WINDOWS_NATIVE),y) ifeq ($(CONFIG_WINDOWS_NATIVE),y)
define ARCHIVE define ARCHIVE
echo "AR: $2"; echo "AR: $2";
$(Q) for %%G in ($(subst ",,$(2))) do ( $(AR) $(ARFLAGS) $1=-+%%G ) $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
endef endef
else else
define ARCHIVE define ARCHIVE
$(Q) for __obj in $(2); do \ $(Q) for __obj in $(subst ",,$(2)) ; do \
echo "AR: $(__obj)"; \ echo "AR: $$__obj"; \
$(AR) $(ARFLAGS) $1=-+$(__obj) || { echo "$(AR) $1=-+$(__obj) FAILED!" ; exit 1 ; } \ "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
done done
endef endef
endif endif
define CLEAN define CLEAN
@rm -f *.obj *.src *.lib *.hex *.lod *.lst $(Q) rm -f *.obj *.src *.lib *.hex *.lod *.lst
endef endef
# This is the tool to use for dependencies (i.e., none) # This is the tool to use for dependencies (i.e., none)
configs/ez80f910200kitg/src/Makefile
+1 -1
View File
@@ -67,7 +67,7 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, "$(OBJS)") $(call ARCHIVE, $@, "$(OBJS)")
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep @$(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ @touch $@
depend: .depend depend: .depend
configs/ez80f910200zco/dhcpd/Make.defs
+32 -22
View File
@@ -1,7 +1,7 @@
############################################################################ ############################################################################
# configs/ez80f910200zco/dhcpd/Make.defs # configs/ez80f910200zco/dhcpd/Make.defs
# #
# Copyright (C) 2009 Gregory Nutt. All rights reserved. # Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@@ -38,23 +38,33 @@ 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
ZDSVERSION := 4.11.1 ZDSVERSION := 5.1.1
ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION) ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
ZDSBINDIR := $(ZDSINSTALLDIR)/bin
ZDSSTDINCDIR := $(ZDSINSTALLDIR)/include/std ifeq ($(CONFIG_WINDOWS_NATIVE),y)
ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog ZDSBINDIR := $(ZDSINSTALLDIR)\bin
ZDSSTDLIBDIR := $(ZDSINSTALLDIR)/lib/std ZDSSTDINCDIR := $(ZDSINSTALLDIR)\include\std
ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog ZDSZILOGINCDIR := $(ZDSINSTALLDIR)\include\zilog
ZDSSTDLIBDIR := $(ZDSINSTALLDIR)\lib\std
ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)\lib\zilog
else
WINTOOL := y
INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"}
ZDSBINDIR := $(INSTALLDIR)/bin
ZDSSTDINCDIR := $(INSTALLDIR)/include/std
ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog
ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std
ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog
endif
# These are the same directories but with the directory separator # These are the same directories but with the directory separator
# character swapped as needed by the ZDS-II compiler # character swapped as needed by the ZDS-II compiler
WINTOOL := y WTOPDIR := ${shell cygpath -w "$(TOPDIR)"}
WTOPDIR := ${shell cygpath -w $(TOPDIR)} WZDSSTDINCDIR := ${shell cygpath -w "$(ZDSSTDINCDIR)"}
WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)} WZDSZILOGINCDIR := ${shell cygpath -w "$(ZDSZILOGINCDIR)"}
WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)} WZDSSTDLIBDIR := ${shell cygpath -w "$(ZDSSTDLIBDIR)"}
WZDSSTDLIBDIR := ${shell cygpath -w $(ZDSSTDLIBDIR)} WZDSZILOGLIBDIR := ${shell cygpath -w "$(ZDSZILOGLIBDIR)"}
WZDSZILOGLIBDIR := ${shell cygpath -w $(ZDSZILOGLIBDIR)}
# Escaped versions # Escaped versions
@@ -140,35 +150,35 @@ HEXEXT = .hex
define PREPROCESS define PREPROCESS
@echo "CPP: $1->$2" @echo "CPP: $1->$2"
@$(CPP) $(CPPFLAGS) $1 -o $2 $(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2
endef endef
define COMPILE define COMPILE
@#echo "CC: $1" @#echo "CC: $1"
@(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile) $(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile)
endef endef
define ASSEMBLE define ASSEMBLE
@#echo "AS: $1" @#echo "AS: $1"
@(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) $(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile)
endef endef
ifeq ($(CONFIG_WINDOWS_NATIVE),y) ifeq ($(CONFIG_WINDOWS_NATIVE),y)
define ARCHIVE define ARCHIVE
echo "AR: $2"; echo "AR: $2";
$(Q) for %%G in ($(subst ",,$(2))) do ( $(AR) $(ARFLAGS) $1=-+%%G ) $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
endef endef
else else
define ARCHIVE define ARCHIVE
$(Q) for __obj in $(2); do \ $(Q) for __obj in $(subst ",,$(2)) ; do \
echo "AR: $(__obj)"; \ echo "AR: $$__obj"; \
$(AR) $(ARFLAGS) $1=-+$(__obj) || { echo "$(AR) $1=-+$(__obj) FAILED!" ; exit 1 ; } \ "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
done done
endef endef
endif endif
define CLEAN define CLEAN
@rm -f *.obj *.src *.lib *.hex *.lod *.lst $(Q) rm -f *.obj *.src *.lib *.hex *.lod *.lst
endef endef
# This is the tool to use for dependencies (i.e., none) # This is the tool to use for dependencies (i.e., none)
configs/ez80f910200zco/dhcpd/setenv.sh
+7 -7
View File
@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# configs/ez80f910200zco/dhcpd/setenv.sh # configs/ez80f910200zco/dhcpd/setenv.sh
# #
# Copyright (C) 2009 Gregory Nutt. All rights reserved. # Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@@ -42,11 +42,11 @@ fi
# The ZDS-II toolchain lies outside of the Cygwin "sandbox" and # The ZDS-II toolchain lies outside of the Cygwin "sandbox" and
# attempts to set the PATH variable do not have the desired effect. # attempts to set the PATH variable do not have the desired effect.
# Instead, alias are provided for all of the ZDS-II command line tools. # Instead, alias are provided for all of the ZDS-II command line tools.
# Version 4.10.1 installed in the default location is assumed here. # Version 5.1.1 installed in the default location is assumed here.
# #
ZDSBINDIR="C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_4.11.1/bin" ZDSBINDIR="C:/Program\ Files\ \(x86\)/ZiLOG/ZDSII_eZ80Acclaim!_5.1.1/bin"
alias ez8asm="${ZDSBINDIR}/ez8asm.exe" alias ez80asm="${ZDSBINDIR}/ez80asm.exe"
alias ez8cc="${ZDSBINDIR}/ez8cc.exe" alias ez80cc="${ZDSBINDIR}/ez80cc.exe"
alias ez8lib="${ZDSBINDIR}/ez8lib.exe" alias ez80lib="${ZDSBINDIR}/ez80lib.exe"
alias ez8link="${ZDSBINDIR}/ez8link.exe" alias ez80link="${ZDSBINDIR}/ez80link.exe"
configs/ez80f910200zco/httpd/Make.defs
+32 -22
View File
@@ -1,7 +1,7 @@
############################################################################ ############################################################################
# configs/ez80f910200zco/httpd/Make.defs # configs/ez80f910200zco/httpd/Make.defs
# #
# Copyright (C) 2009 Gregory Nutt. All rights reserved. # Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@@ -38,23 +38,33 @@ 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
ZDSVERSION := 4.11.1 ZDSVERSION := 5.1.1
ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION) ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
ZDSBINDIR := $(ZDSINSTALLDIR)/bin
ZDSSTDINCDIR := $(ZDSINSTALLDIR)/include/std ifeq ($(CONFIG_WINDOWS_NATIVE),y)
ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog ZDSBINDIR := $(ZDSINSTALLDIR)\bin
ZDSSTDLIBDIR := $(ZDSINSTALLDIR)/lib/std ZDSSTDINCDIR := $(ZDSINSTALLDIR)\include\std
ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog ZDSZILOGINCDIR := $(ZDSINSTALLDIR)\include\zilog
ZDSSTDLIBDIR := $(ZDSINSTALLDIR)\lib\std
ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)\lib\zilog
else
WINTOOL := y
INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"}
ZDSBINDIR := $(INSTALLDIR)/bin
ZDSSTDINCDIR := $(INSTALLDIR)/include/std
ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog
ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std
ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog
endif
# These are the same directories but with the directory separator # These are the same directories but with the directory separator
# character swapped as needed by the ZDS-II compiler # character swapped as needed by the ZDS-II compiler
WINTOOL := y WTOPDIR := ${shell cygpath -w "$(TOPDIR)"}
WTOPDIR := ${shell cygpath -w $(TOPDIR)} WZDSSTDINCDIR := ${shell cygpath -w "$(ZDSSTDINCDIR)"}
WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)} WZDSZILOGINCDIR := ${shell cygpath -w "$(ZDSZILOGINCDIR)"}
WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)} WZDSSTDLIBDIR := ${shell cygpath -w "$(ZDSSTDLIBDIR)"}
WZDSSTDLIBDIR := ${shell cygpath -w $(ZDSSTDLIBDIR)} WZDSZILOGLIBDIR := ${shell cygpath -w "$(ZDSZILOGLIBDIR)"}
WZDSZILOGLIBDIR := ${shell cygpath -w $(ZDSZILOGLIBDIR)}
# Escaped versions # Escaped versions
@@ -140,35 +150,35 @@ HEXEXT = .hex
define PREPROCESS define PREPROCESS
@echo "CPP: $1->$2" @echo "CPP: $1->$2"
@$(CPP) $(CPPFLAGS) $1 -o $2 $(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2
endef endef
define COMPILE define COMPILE
@#echo "CC: $1" @#echo "CC: $1"
@(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile) $(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile)
endef endef
define ASSEMBLE define ASSEMBLE
@#echo "AS: $1" @#echo "AS: $1"
@(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) $(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile)
endef endef
ifeq ($(CONFIG_WINDOWS_NATIVE),y) ifeq ($(CONFIG_WINDOWS_NATIVE),y)
define ARCHIVE define ARCHIVE
echo "AR: $2"; echo "AR: $2";
$(Q) for %%G in ($(subst ",,$(2))) do ( $(AR) $(ARFLAGS) $1=-+%%G ) $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
endef endef
else else
define ARCHIVE define ARCHIVE
$(Q) for __obj in $(2); do \ $(Q) for __obj in $(subst ",,$(2)) ; do \
echo "AR: $(__obj)"; \ echo "AR: $$__obj"; \
$(AR) $(ARFLAGS) $1=-+$(__obj) || { echo "$(AR) $1=-+$(__obj) FAILED!" ; exit 1 ; } \ "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
done done
endef endef
endif endif
define CLEAN define CLEAN
@rm -f *.obj *.src *.lib *.hex *.lod *.lst $(Q) rm -f *.obj *.src *.lib *.hex *.lod *.lst
endef endef
# This is the tool to use for dependencies (i.e., none) # This is the tool to use for dependencies (i.e., none)
configs/ez80f910200zco/httpd/setenv.sh
+7 -7
View File
@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# configs/ez80f910200zco/dhcpd/setenv.sh # configs/ez80f910200zco/dhcpd/setenv.sh
# #
# Copyright (C) 2009 Gregory Nutt. All rights reserved. # Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@@ -42,11 +42,11 @@ fi
# The ZDS-II toolchain lies outside of the Cygwin "sandbox" and # The ZDS-II toolchain lies outside of the Cygwin "sandbox" and
# attempts to set the PATH variable do not have the desired effect. # attempts to set the PATH variable do not have the desired effect.
# Instead, alias are provided for all of the ZDS-II command line tools. # Instead, alias are provided for all of the ZDS-II command line tools.
# Version 4.10.1 installed in the default location is assumed here. # Version 5.1.1 installed in the default location is assumed here.
# #
ZDSBINDIR="C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_4.11.1/bin" ZDSBINDIR="C:/Program\ Files\ \(x86\)/ZiLOG/ZDSII_eZ80Acclaim!_5.1.1/bin"
alias ez8asm="${ZDSBINDIR}/ez8asm.exe" alias ez80asm="${ZDSBINDIR}/ez80asm.exe"
alias ez8cc="${ZDSBINDIR}/ez8cc.exe" alias ez80cc="${ZDSBINDIR}/ez80cc.exe"
alias ez8lib="${ZDSBINDIR}/ez8lib.exe" alias ez80lib="${ZDSBINDIR}/ez80lib.exe"
alias ez8link="${ZDSBINDIR}/ez8link.exe" alias ez80link="${ZDSBINDIR}/ez80link.exe"
configs/ez80f910200zco/nettest/Make.defs
+32 -22
View File
@@ -1,7 +1,7 @@
############################################################################ ############################################################################
# configs/ez80f910200zco/nettest/Make.defs # configs/ez80f910200zco/nettest/Make.defs
# #
# Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved. # Copyright (C) 2008, 2009, 2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@@ -38,23 +38,33 @@ 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
ZDSVERSION := 4.11.1 ZDSVERSION := 5.1.1
ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION) ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
ZDSBINDIR := $(ZDSINSTALLDIR)/bin
ZDSSTDINCDIR := $(ZDSINSTALLDIR)/include/std ifeq ($(CONFIG_WINDOWS_NATIVE),y)
ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog ZDSBINDIR := $(ZDSINSTALLDIR)\bin
ZDSSTDLIBDIR := $(ZDSINSTALLDIR)/lib/std ZDSSTDINCDIR := $(ZDSINSTALLDIR)\include\std
ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog ZDSZILOGINCDIR := $(ZDSINSTALLDIR)\include\zilog
ZDSSTDLIBDIR := $(ZDSINSTALLDIR)\lib\std
ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)\lib\zilog
else
WINTOOL := y
INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"}
ZDSBINDIR := $(INSTALLDIR)/bin
ZDSSTDINCDIR := $(INSTALLDIR)/include/std
ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog
ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std
ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog
endif
# These are the same directories but with the directory separator # These are the same directories but with the directory separator
# character swapped as needed by the ZDS-II compiler # character swapped as needed by the ZDS-II compiler
WINTOOL := y WTOPDIR := ${shell cygpath -w "$(TOPDIR)"}
WTOPDIR := ${shell cygpath -w $(TOPDIR)} WZDSSTDINCDIR := ${shell cygpath -w "$(ZDSSTDINCDIR)"}
WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)} WZDSZILOGINCDIR := ${shell cygpath -w "$(ZDSZILOGINCDIR)"}
WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)} WZDSSTDLIBDIR := ${shell cygpath -w "$(ZDSSTDLIBDIR)"}
WZDSSTDLIBDIR := ${shell cygpath -w $(ZDSSTDLIBDIR)} WZDSZILOGLIBDIR := ${shell cygpath -w "$(ZDSZILOGLIBDIR)"}
WZDSZILOGLIBDIR := ${shell cygpath -w $(ZDSZILOGLIBDIR)}
# Escaped versions # Escaped versions
@@ -140,35 +150,35 @@ HEXEXT = .hex
define PREPROCESS define PREPROCESS
@echo "CPP: $1->$2" @echo "CPP: $1->$2"
@$(CPP) $(CPPFLAGS) $1 -o $2 $(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2
endef endef
define COMPILE define COMPILE
@#echo "CC: $1" @#echo "CC: $1"
@(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile) $(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile)
endef endef
define ASSEMBLE define ASSEMBLE
@#echo "AS: $1" @#echo "AS: $1"
@(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) $(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile)
endef endef
ifeq ($(CONFIG_WINDOWS_NATIVE),y) ifeq ($(CONFIG_WINDOWS_NATIVE),y)
define ARCHIVE define ARCHIVE
echo "AR: $2"; echo "AR: $2";
$(Q) for %%G in ($(subst ",,$(2))) do ( $(AR) $(ARFLAGS) $1=-+%%G ) $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
endef endef
else else
define ARCHIVE define ARCHIVE
$(Q) for __obj in $(2); do \ $(Q) for __obj in $(subst ",,$(2)) ; do \
echo "AR: $(__obj)"; \ echo "AR: $$__obj"; \
$(AR) $(ARFLAGS) $1=-+$(__obj) || { echo "$(AR) $1=-+$(__obj) FAILED!" ; exit 1 ; } \ "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
done done
endef endef
endif endif
define CLEAN define CLEAN
@rm -f *.obj *.src *.lib *.hex *.lod *.lst $(Q) rm -f *.obj *.src *.lib *.hex *.lod *.lst
endef endef
# This is the tool to use for dependencies (i.e., none) # This is the tool to use for dependencies (i.e., none)
configs/ez80f910200zco/nettest/setenv.sh
+7 -7
View File
@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# configs/ez80f910200zco/nettest/setenv.sh # configs/ez80f910200zco/nettest/setenv.sh
# #
# Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved. # Copyright (C) 2008, 2009, 2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@@ -42,11 +42,11 @@ fi
# The ZDS-II toolchain lies outside of the Cygwin "sandbox" and # The ZDS-II toolchain lies outside of the Cygwin "sandbox" and
# attempts to set the PATH variable do not have the desired effect. # attempts to set the PATH variable do not have the desired effect.
# Instead, alias are provided for all of the ZDS-II command line tools. # Instead, alias are provided for all of the ZDS-II command line tools.
# Version 4.10.1 installed in the default location is assumed here. # Version 5.1.1 installed in the default location is assumed here.
# #
ZDSBINDIR="C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_4.11.1/bin" ZDSBINDIR="C:/Program\ Files\ \(x86\)/ZiLOG/ZDSII_eZ80Acclaim!_5.1.1/bin"
alias ez8asm="${ZDSBINDIR}/ez8asm.exe" alias ez80asm="${ZDSBINDIR}/ez80asm.exe"
alias ez8cc="${ZDSBINDIR}/ez8cc.exe" alias ez80cc="${ZDSBINDIR}/ez80cc.exe"
alias ez8lib="${ZDSBINDIR}/ez8lib.exe" alias ez80lib="${ZDSBINDIR}/ez80lib.exe"
alias ez8link="${ZDSBINDIR}/ez8link.exe" alias ez80link="${ZDSBINDIR}/ez80link.exe"
configs/ez80f910200zco/nsh/Make.defs
+32 -22
View File
@@ -1,7 +1,7 @@
############################################################################ ############################################################################
# configs/ez80f910200zco/nst/Make.defs # configs/ez80f910200zco/nst/Make.defs
# #
# Copyright (C) 2009 Gregory Nutt. All rights reserved. # Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@@ -38,23 +38,33 @@ 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
ZDSVERSION := 4.11.1 ZDSVERSION := 5.1.1
ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION) ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
ZDSBINDIR := $(ZDSINSTALLDIR)/bin
ZDSSTDINCDIR := $(ZDSINSTALLDIR)/include/std ifeq ($(CONFIG_WINDOWS_NATIVE),y)
ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog ZDSBINDIR := $(ZDSINSTALLDIR)\bin
ZDSSTDLIBDIR := $(ZDSINSTALLDIR)/lib/std ZDSSTDINCDIR := $(ZDSINSTALLDIR)\include\std
ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog ZDSZILOGINCDIR := $(ZDSINSTALLDIR)\include\zilog
ZDSSTDLIBDIR := $(ZDSINSTALLDIR)\lib\std
ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)\lib\zilog
else
WINTOOL := y
INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"}
ZDSBINDIR := $(INSTALLDIR)/bin
ZDSSTDINCDIR := $(INSTALLDIR)/include/std
ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog
ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std
ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog
endif
# These are the same directories but with the directory separator # These are the same directories but with the directory separator
# character swapped as needed by the ZDS-II compiler # character swapped as needed by the ZDS-II compiler
WINTOOL := y WTOPDIR := ${shell cygpath -w "$(TOPDIR)"}
WTOPDIR := ${shell cygpath -w $(TOPDIR)} WZDSSTDINCDIR := ${shell cygpath -w "$(ZDSSTDINCDIR)"}
WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)} WZDSZILOGINCDIR := ${shell cygpath -w "$(ZDSZILOGINCDIR)"}
WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)} WZDSSTDLIBDIR := ${shell cygpath -w "$(ZDSSTDLIBDIR)"}
WZDSSTDLIBDIR := ${shell cygpath -w $(ZDSSTDLIBDIR)} WZDSZILOGLIBDIR := ${shell cygpath -w "$(ZDSZILOGLIBDIR)"}
WZDSZILOGLIBDIR := ${shell cygpath -w $(ZDSZILOGLIBDIR)}
# Escaped versions # Escaped versions
@@ -140,35 +150,35 @@ HEXEXT = .hex
define PREPROCESS define PREPROCESS
@echo "CPP: $1->$2" @echo "CPP: $1->$2"
@$(CPP) $(CPPFLAGS) $1 -o $2 $(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2
endef endef
define COMPILE define COMPILE
@#echo "CC: $1" @#echo "CC: $1"
@(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile) $(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile)
endef endef
define ASSEMBLE define ASSEMBLE
@#echo "AS: $1" @#echo "AS: $1"
@(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) $(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile)
endef endef
ifeq ($(CONFIG_WINDOWS_NATIVE),y) ifeq ($(CONFIG_WINDOWS_NATIVE),y)
define ARCHIVE define ARCHIVE
echo "AR: $2"; echo "AR: $2";
$(Q) for %%G in ($(subst ",,$(2))) do ( $(AR) $(ARFLAGS) $1=-+%%G ) $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
endef endef
else else
define ARCHIVE define ARCHIVE
$(Q) for __obj in $(2); do \ $(Q) for __obj in $(subst ",,$(2)) ; do \
echo "AR: $(__obj)"; \ echo "AR: $$__obj"; \
$(AR) $(ARFLAGS) $1=-+$(__obj) || { echo "$(AR) $1=-+$(__obj) FAILED!" ; exit 1 ; } \ "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
done done
endef endef
endif endif
define CLEAN define CLEAN
@rm -f *.obj *.src *.lib *.hex *.lod *.lst $(Q) rm -f *.obj *.src *.lib *.hex *.lod *.lst
endef endef
# This is the tool to use for dependencies (i.e., none) # This is the tool to use for dependencies (i.e., none)
configs/ez80f910200zco/nsh/setenv.sh
+7 -7
View File
@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# configs/ez80f910200zco/nst/setenv.sh # configs/ez80f910200zco/nst/setenv.sh
# #
# Copyright (C) 2009 Gregory Nutt. All rights reserved. # Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@@ -42,11 +42,11 @@ fi
# The ZDS-II toolchain lies outside of the Cygwin "sandbox" and # The ZDS-II toolchain lies outside of the Cygwin "sandbox" and
# attempts to set the PATH variable do not have the desired effect. # attempts to set the PATH variable do not have the desired effect.
# Instead, alias are provided for all of the ZDS-II command line tools. # Instead, alias are provided for all of the ZDS-II command line tools.
# Version 4.10.1 installed in the default location is assumed here. # Version 5.1.1 installed in the default location is assumed here.
# #
ZDSBINDIR="C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_4.11.1/bin" ZDSBINDIR="C:/Program\ Files\ \(x86\)/ZiLOG/ZDSII_eZ80Acclaim!_5.1.1/bin"
alias ez8asm="${ZDSBINDIR}/ez8asm.exe" alias ez80asm="${ZDSBINDIR}/ez80asm.exe"
alias ez8cc="${ZDSBINDIR}/ez8cc.exe" alias ez80cc="${ZDSBINDIR}/ez80cc.exe"
alias ez8lib="${ZDSBINDIR}/ez8lib.exe" alias ez80lib="${ZDSBINDIR}/ez80lib.exe"
alias ez8link="${ZDSBINDIR}/ez8link.exe" alias ez80link="${ZDSBINDIR}/ez80link.exe"
configs/ez80f910200zco/ostest/Make.defs
+84 -74
View File
@@ -1,7 +1,7 @@
############################################################################ ############################################################################
# configs/ez80f910200zco/ostest/Make.defs # configs/ez80f910200zco/ostest/Make.defs
# #
# Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved. # Copyright (C) 2008, 2009, 2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@@ -38,101 +38,111 @@ 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
ZDSVERSION := 4.11.1 ZDSVERSION := 5.1.1
ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION) ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
ZDSBINDIR := $(ZDSINSTALLDIR)/bin
ZDSSTDINCDIR := $(ZDSINSTALLDIR)/include/std ifeq ($(CONFIG_WINDOWS_NATIVE),y)
ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog ZDSBINDIR := $(ZDSINSTALLDIR)\bin
ZDSSTDLIBDIR := $(ZDSINSTALLDIR)/lib/std ZDSSTDINCDIR := $(ZDSINSTALLDIR)\include\std
ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog ZDSZILOGINCDIR := $(ZDSINSTALLDIR)\include\zilog
ZDSSTDLIBDIR := $(ZDSINSTALLDIR)\lib\std
ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)\lib\zilog
else
WINTOOL := y
INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"}
ZDSBINDIR := $(INSTALLDIR)/bin
ZDSSTDINCDIR := $(INSTALLDIR)/include/std
ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog
ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std
ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog
endif
# These are the same directories but with the directory separator # These are the same directories but with the directory separator
# character swapped as needed by the ZDS-II compiler # character swapped as needed by the ZDS-II compiler
WINTOOL := y WTOPDIR := ${shell cygpath -w "$(TOPDIR)"}
WTOPDIR := ${shell cygpath -w $(TOPDIR)} WZDSSTDINCDIR := ${shell cygpath -w "$(ZDSSTDINCDIR)"}
WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)} WZDSZILOGINCDIR := ${shell cygpath -w "$(ZDSZILOGINCDIR)"}
WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)} WZDSSTDLIBDIR := ${shell cygpath -w "$(ZDSSTDLIBDIR)"}
WZDSSTDLIBDIR := ${shell cygpath -w $(ZDSSTDLIBDIR)} WZDSZILOGLIBDIR := ${shell cygpath -w "$(ZDSZILOGLIBDIR)"}
WZDSZILOGLIBDIR := ${shell cygpath -w $(ZDSZILOGLIBDIR)}
# Escaped versions # Escaped versions
ETOPDIR := ${shell echo "$(WTOPDIR)" | sed -e "s/ /%20/g"} ETOPDIR := ${shell echo "$(WTOPDIR)" | sed -e "s/ /%20/g"}
EZDSSTDINCDIR := ${shell echo "$(WZDSSTDINCDIR)" | sed -e "s/ /%20/g"} EZDSSTDINCDIR := ${shell echo "$(WZDSSTDINCDIR)" | sed -e "s/ /%20/g"}
EZDSZILOGINCDIR := ${shell echo "$(WZDSZILOGINCDIR)" | sed -e "s/ /%20/g"} EZDSZILOGINCDIR := ${shell echo "$(WZDSZILOGINCDIR)" | sed -e "s/ /%20/g"}
# Assembler definitions # Assembler definitions
ifeq ($(CONFIG_ARCH_CHIP_EZ80F91),y) ifeq ($(CONFIG_ARCH_CHIP_EZ80F91),y)
ARCHCPU = eZ80F91 ARCHCPU = eZ80F91
ARCHCPUDEF = _EZ80F91 ARCHCPUDEF = _EZ80F91
ARCHFAMILY = _EZ80ACCLAIM! ARCHFAMILY = _EZ80ACCLAIM!
endif endif
ifeq ("${CONFIG_DEBUG_SYMBOLS}","y") ifeq ("${CONFIG_DEBUG_SYMBOLS}","y")
ARCHASMOPTIMIZATION = -debug -NOsdiopt ARCHASMOPTIMIZATION = -debug -NOsdiopt
else else
ARCHASMOPTIMIZATION = -nodebug -NOsdiopt ARCHASMOPTIMIZATION = -nodebug -NOsdiopt
endif endif
ARCHASMCPUFLAGS = -cpu:$(ARCHCPU) -NOigcase ARCHASMCPUFLAGS = -cpu:$(ARCHCPU) -NOigcase
ARCHASMLIST = -list -NOlistmac -name -pagelen:56 -pagewidth:80 -quiet ARCHASMLIST = -list -NOlistmac -name -pagelen:56 -pagewidth:80 -quiet
ARCHASMWARNINGS = -warn ARCHASMWARNINGS = -warn
ARCHASMDEFINES = -define:$(ARCHCPUDEF)=1 -define:$(ARCHFAMILYDEF)=1 -define:__ASSEMBLY__ ARCHASMDEFINES = -define:$(ARCHCPUDEF)=1 -define:$(ARCHFAMILYDEF)=1 -define:__ASSEMBLY__
ARCHASMINCLUDES = -include:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)' ARCHASMINCLUDES = -include:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
EARCHASMINCLUDES = -include:'$(ETOPDIR)\include;$(EZDSSTDINCDIR);$(EZDSZILOGINCDIR)' EARCHASMINCLUDES = -include:'$(ETOPDIR)\include;$(EZDSSTDINCDIR);$(EZDSZILOGINCDIR)'
AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) \ AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) \
$(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION) $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)
# Compiler definitions # Compiler definitions
ifeq ("${CONFIG_DEBUG_SYMBOLS}","y") ifeq ("${CONFIG_DEBUG_SYMBOLS}","y")
ARCHOPTIMIZATION = -debug -reduceopt ARCHOPTIMIZATION = -debug -reduceopt
else else
ARCHOPTIMIZATION = -nodebug -optsize ARCHOPTIMIZATION = -nodebug -optsize
endif endif
ARCHCPUFLAGS = -chartype:S -promote -cpu:$(ARCHCPU) -NOgenprintf -NOmodsect \ ARCHCPUFLAGS = -chartype:S -promote -cpu:$(ARCHCPU) -NOgenprintf -NOmodsect \
-asmsw:" $(ARCHASMCPUFLAGS) $(EARCHASMINCLUDES) $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)" -asmsw:" $(ARCHASMCPUFLAGS) $(EARCHASMINCLUDES) $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)"
ARCHLIST = -keeplst -NOlist -NOlistinc -keepasm ARCHLIST = -keeplst -NOlist -NOlistinc -keepasm
ARCHPICFLAGS = ARCHPICFLAGS =
ARCHWARNINGS = -warn ARCHWARNINGS = -warn
ARCHDEFINES = -define:$(ARCHCPUDEF) -define:$(ARCHFAMILYDEF) ARCHDEFINES = -define:$(ARCHCPUDEF) -define:$(ARCHFAMILYDEF)
ARCHSTDINCLUDES = -stdinc:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)' ARCHSTDINCLUDES = -stdinc:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
ARCHUSRINCLUDES = -usrinc:'.' ARCHUSRINCLUDES = -usrinc:'.'
ARCHINCLUDES = $(ARCHSTDINCLUDES) $(ARCHUSRINCLUDES) ARCHINCLUDES = $(ARCHSTDINCLUDES) $(ARCHUSRINCLUDES)
CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) \ CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) \
$(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
CPPDEFINES = -D$(ARCHFAMILYDEF) -D$(ARCHCPUDEF) -D__ASSEMBLY__ CPPDEFINES = -D$(ARCHFAMILYDEF) -D$(ARCHCPUDEF) -D__ASSEMBLY__
CPPINCLUDES = -I$(TOPDIR)/include CPPINCLUDES = -I$(TOPDIR)/include
CPPFLAGS = $(CPPDEFINES) $(CPPINCLUDES) CPPFLAGS = $(CPPDEFINES) $(CPPINCLUDES)
# Librarian definitions # Librarian definitions
ARFLAGS = -quiet -warn ARFLAGS = -quiet -warn
# Linker definitions # Linker definitions
LINKCMDTEMPLATE = $(TOPDIR)/configs/ez80f910200zco/ostest/ostest.linkcmd LINKCMDTEMPLATE = $(TOPDIR)/configs/ez80f910200zco/ostest/ostest.linkcmd
# Tool names/pathes # Tool names/pathes
CROSSDEV = CROSSDEV =
CC = $(ZDSBINDIR)/ez80cc.exe CC = $(ZDSBINDIR)/ez80cc.exe
CPP = gcc -E CPP = gcc -E
LD = $(ZDSBINDIR)/ez80link.exe LD = $(ZDSBINDIR)/ez80link.exe
AS = $(ZDSBINDIR)/ez80asm.exe AS = $(ZDSBINDIR)/ez80asm.exe
AR = $(ZDSBINDIR)/ez80lib.exe AR = $(ZDSBINDIR)/ez80lib.exe
# File extensions # File extensions
ASMEXT = .asm ASMEXT = .asm
OBJEXT = .obj OBJEXT = .obj
LIBEXT = .lib LIBEXT = .lib
EXEEXT = .lod EXEEXT = .lod
HEXEXT = .hex HEXEXT = .hex
# These are the macros that will be used in the NuttX make system # These are the macros that will be used in the NuttX make system
# to compile and assembly source files and to insert the resulting # to compile and assembly source files and to insert the resulting
@@ -140,49 +150,49 @@ HEXEXT = .hex
define PREPROCESS define PREPROCESS
@echo "CPP: $1->$2" @echo "CPP: $1->$2"
@$(CPP) $(CPPFLAGS) $1 -o $2 $(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2
endef endef
define COMPILE define COMPILE
@#echo "CC: $1" @#echo "CC: $1"
@(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile) $(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile)
endef endef
define ASSEMBLE define ASSEMBLE
@#echo "AS: $1" @#echo "AS: $1"
@(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) $(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile)
endef endef
ifeq ($(CONFIG_WINDOWS_NATIVE),y) ifeq ($(CONFIG_WINDOWS_NATIVE),y)
define ARCHIVE define ARCHIVE
echo "AR: $2"; echo "AR: $2";
$(Q) for %%G in ($(subst ",,$(2))) do ( $(AR) $(ARFLAGS) $1=-+%%G ) $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
endef endef
else else
define ARCHIVE define ARCHIVE
$(Q) for __obj in $(2); do \ $(Q) for __obj in $(subst ",,$(2)) ; do \
echo "AR: $(__obj)"; \ echo "AR: $$__obj"; \
$(AR) $(ARFLAGS) $1=-+$(__obj) || { echo "$(AR) $1=-+$(__obj) FAILED!" ; exit 1 ; } \ "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
done done
endef endef
endif endif
define CLEAN define CLEAN
@rm -f *.obj *.src *.lib *.hex *.lod *.lst $(Q) rm -f *.obj *.src *.lib *.hex *.lod *.lst
endef endef
# This is the tool to use for dependencies (i.e., none) # This is the tool to use for dependencies (i.e., none)
MKDEP = $(TOPDIR)/tools/mknulldeps.sh MKDEP = $(TOPDIR)/tools/mknulldeps.sh
# ZDS-II cannot follow Cygwin soft links, so we will have to use directory copies # ZDS-II cannot follow Cygwin soft links, so we will have to use directory copies
DIRLINK = $(TOPDIR)/tools/winlink.sh DIRLINK = $(TOPDIR)/tools/winlink.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh DIRUNLINK = $(TOPDIR)/tools/unlink.sh
# Linux/Cygwin host tool definitions # Linux/Cygwin host tool definitions
HOSTCC = gcc HOSTCC = gcc
HOSTINCLUDES = -I. HOSTINCLUDES = -I.
HOSTCFLAGS = -Wall -wstrict-prototypes -Wshadow -g -pipe HOSTCFLAGS = -Wall -wstrict-prototypes -Wshadow -g -pipe
HOSTLDFLAGS = HOSTLDFLAGS =
configs/ez80f910200zco/ostest/setenv.sh
+7 -7
View File
@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# configs/ez80f910200zco/ostest/setenv.sh # configs/ez80f910200zco/ostest/setenv.sh
# #
# Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved. # Copyright (C) 2008, 2009, 2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@@ -42,11 +42,11 @@ fi
# The ZDS-II toolchain lies outside of the Cygwin "sandbox" and # The ZDS-II toolchain lies outside of the Cygwin "sandbox" and
# attempts to set the PATH variable do not have the desired effect. # attempts to set the PATH variable do not have the desired effect.
# Instead, alias are provided for all of the ZDS-II command line tools. # Instead, alias are provided for all of the ZDS-II command line tools.
# Version 4.10.1 installed in the default location is assumed here. # Version 5.1.1 installed in the default location is assumed here.
# #
ZDSBINDIR="C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_4.11.1/bin" ZDSBINDIR="C:/Program\ Files\ \(x86\)/ZiLOG/ZDSII_eZ80Acclaim!_5.1.1/bin"
alias ez8asm="${ZDSBINDIR}/ez8asm.exe" alias ez80asm="${ZDSBINDIR}/ez80asm.exe"
alias ez8cc="${ZDSBINDIR}/ez8cc.exe" alias ez80cc="${ZDSBINDIR}/ez80cc.exe"
alias ez8lib="${ZDSBINDIR}/ez8lib.exe" alias ez80lib="${ZDSBINDIR}/ez80lib.exe"
alias ez8link="${ZDSBINDIR}/ez8link.exe" alias ez80link="${ZDSBINDIR}/ez80link.exe"
configs/ez80f910200zco/poll/Make.defs
+32 -22
View File
@@ -1,7 +1,7 @@
############################################################################ ############################################################################
# configs/ez80f910200zco/poll/Make.defs # configs/ez80f910200zco/poll/Make.defs
# #
# Copyright (C) 2009 Gregory Nutt. All rights reserved. # Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@@ -38,23 +38,33 @@ 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
ZDSVERSION := 4.11.1 ZDSVERSION := 5.1.1
ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION) ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
ZDSBINDIR := $(ZDSINSTALLDIR)/bin
ZDSSTDINCDIR := $(ZDSINSTALLDIR)/include/std ifeq ($(CONFIG_WINDOWS_NATIVE),y)
ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog ZDSBINDIR := $(ZDSINSTALLDIR)\bin
ZDSSTDLIBDIR := $(ZDSINSTALLDIR)/lib/std ZDSSTDINCDIR := $(ZDSINSTALLDIR)\include\std
ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog ZDSZILOGINCDIR := $(ZDSINSTALLDIR)\include\zilog
ZDSSTDLIBDIR := $(ZDSINSTALLDIR)\lib\std
ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)\lib\zilog
else
WINTOOL := y
INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"}
ZDSBINDIR := $(INSTALLDIR)/bin
ZDSSTDINCDIR := $(INSTALLDIR)/include/std
ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog
ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std
ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog
endif
# These are the same directories but with the directory separator # These are the same directories but with the directory separator
# character swapped as needed by the ZDS-II compiler # character swapped as needed by the ZDS-II compiler
WINTOOL := y WTOPDIR := ${shell cygpath -w "$(TOPDIR)"}
WTOPDIR := ${shell cygpath -w $(TOPDIR)} WZDSSTDINCDIR := ${shell cygpath -w "$(ZDSSTDINCDIR)"}
WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)} WZDSZILOGINCDIR := ${shell cygpath -w "$(ZDSZILOGINCDIR)"}
WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)} WZDSSTDLIBDIR := ${shell cygpath -w "$(ZDSSTDLIBDIR)"}
WZDSSTDLIBDIR := ${shell cygpath -w $(ZDSSTDLIBDIR)} WZDSZILOGLIBDIR := ${shell cygpath -w "$(ZDSZILOGLIBDIR)"}
WZDSZILOGLIBDIR := ${shell cygpath -w $(ZDSZILOGLIBDIR)}
# Escaped versions # Escaped versions
@@ -140,35 +150,35 @@ HEXEXT = .hex
define PREPROCESS define PREPROCESS
@echo "CPP: $1->$2" @echo "CPP: $1->$2"
@$(CPP) $(CPPFLAGS) $1 -o $2 $(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2
endef endef
define COMPILE define COMPILE
@#echo "CC: $1" @#echo "CC: $1"
@(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile) $(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile)
endef endef
define ASSEMBLE define ASSEMBLE
@#echo "AS: $1" @#echo "AS: $1"
@(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) $(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile)
endef endef
ifeq ($(CONFIG_WINDOWS_NATIVE),y) ifeq ($(CONFIG_WINDOWS_NATIVE),y)
define ARCHIVE define ARCHIVE
echo "AR: $2"; echo "AR: $2";
$(Q) for %%G in ($(subst ",,$(2))) do ( $(AR) $(ARFLAGS) $1=-+%%G ) $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
endef endef
else else
define ARCHIVE define ARCHIVE
$(Q) for __obj in $(2); do \ $(Q) for __obj in $(subst ",,$(2)) ; do \
echo "AR: $(__obj)"; \ echo "AR: $$__obj"; \
$(AR) $(ARFLAGS) $1=-+$(__obj) || { echo "$(AR) $1=-+$(__obj) FAILED!" ; exit 1 ; } \ "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
done done
endef endef
endif endif
define CLEAN define CLEAN
@rm -f *.obj *.src *.lib *.hex *.lod *.lst $(Q) rm -f *.obj *.src *.lib *.hex *.lod *.lst
endef endef
# This is the tool to use for dependencies (i.e., none) # This is the tool to use for dependencies (i.e., none)
configs/ez80f910200zco/poll/setenv.sh
+7 -7
View File
@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# configs/ez80f910200zco/poll/setenv.sh # configs/ez80f910200zco/poll/setenv.sh
# #
# Copyright (C) 2009 Gregory Nutt. All rights reserved. # Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@@ -42,11 +42,11 @@ fi
# The ZDS-II toolchain lies outside of the Cygwin "sandbox" and # The ZDS-II toolchain lies outside of the Cygwin "sandbox" and
# attempts to set the PATH variable do not have the desired effect. # attempts to set the PATH variable do not have the desired effect.
# Instead, alias are provided for all of the ZDS-II command line tools. # Instead, alias are provided for all of the ZDS-II command line tools.
# Version 4.10.1 installed in the default location is assumed here. # Version 5.1.1 installed in the default location is assumed here.
# #
ZDSBINDIR="C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_4.11.1/bin" ZDSBINDIR="C:/Program\ Files\ \(x86\)/ZiLOG/ZDSII_eZ80Acclaim!_5.1.1/bin"
alias ez8asm="${ZDSBINDIR}/ez8asm.exe" alias ez80asm="${ZDSBINDIR}/ez80asm.exe"
alias ez8cc="${ZDSBINDIR}/ez8cc.exe" alias ez80cc="${ZDSBINDIR}/ez80cc.exe"
alias ez8lib="${ZDSBINDIR}/ez8lib.exe" alias ez80lib="${ZDSBINDIR}/ez80lib.exe"
alias ez8link="${ZDSBINDIR}/ez8link.exe" alias ez80link="${ZDSBINDIR}/ez80link.exe"
configs/ez80f910200zco/src/Makefile
+1 -1
View File
@@ -74,7 +74,7 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, "$(OBJS)") $(call ARCHIVE, $@, "$(OBJS)")
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep @$(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ @touch $@
depend: .depend depend: .depend
configs/z16f2800100zcog/ostest/Make.defs
+29 -20
View File
@@ -38,23 +38,32 @@ include ${TOPDIR}/tools/Config.mk
# These are the directories where the ZNeo-II toolchain is installed # These are the directories where the ZNeo-II toolchain is installed
ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_ZNEO_4.11.1 ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_ZNEO_4.11.1
ZDSBINDIR := $(ZDSINSTALLDIR)/bin
ZDSSTDINCDIR := $(ZDSINSTALLDIR)/include/std
ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog
ZDSSTDLIBDIR := $(ZDSINSTALLDIR)/lib/std
ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
ZDSBINDIR := $(ZDSINSTALLDIR)\bin
ZDSSTDINCDIR := $(ZDSINSTALLDIR)\include\std
ZDSZILOGINCDIR := $(ZDSINSTALLDIR)\include\zilog
ZDSSTDLIBDIR := $(ZDSINSTALLDIR)\lib\std
ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)\lib\zilog
else
WINTOOL := y
INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"}
ZDSBINDIR := $(INSTALLDIR)/bin
ZDSSTDINCDIR := $(INSTALLDIR)/include/std
ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog
ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std
ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog
endif
# These are the same directories but with the directory separator # These are the same directories but with the directory separator
# character swapped as needed by the ZNeo-II compiler # character swapped as needed by the ZNeo-II compiler
WINTOOL := y WTOPDIR := ${shell cygpath -w "$(TOPDIR)"}
WTOPDIR := ${shell cygpath -w $(TOPDIR)} WZDSSTDINCDIR := ${shell cygpath -w "$(ZDSSTDINCDIR)"}
WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)} WZDSZILOGINCDIR := ${shell cygpath -w "$(ZDSZILOGINCDIR)"}
WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)} WZDSSTDLIBDIR := ${shell cygpath -w "$(ZDSSTDLIBDIR)"}
WZDSSTDLIBDIR := ${shell cygpath -w $(ZDSSTDLIBDIR)} WZDSZILOGLIBDIR := ${shell cygpath -w "$(ZDSZILOGLIBDIR)"}
WZDSZILOGLIBDIR := ${shell cygpath -w $(ZDSZILOGLIBDIR)}
# Escaped versions # Escaped versions
@@ -133,35 +142,35 @@ EXEEXT = .hex
define PREPROCESS define PREPROCESS
@echo "CPP: $1->$2" @echo "CPP: $1->$2"
@$(CPP) $(CPPFLAGS) $1 -o $2 $(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2
endef endef
define COMPILE define COMPILE
@#echo "CC: $1" @#echo "CC: $1"
@(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile) $(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile)
endef endef
define ASSEMBLE define ASSEMBLE
@#echo "AS: $1" @#echo "AS: $1"
@(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) $(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile)
endef endef
ifeq ($(CONFIG_WINDOWS_NATIVE),y) ifeq ($(CONFIG_WINDOWS_NATIVE),y)
define ARCHIVE define ARCHIVE
echo "AR: $2"; echo "AR: $2";
$(Q) for %%G in ($(subst ",,$(2))) do ( $(AR) $(ARFLAGS) $1=-+%%G ) $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
endef endef
else else
define ARCHIVE define ARCHIVE
$(Q) for __obj in $(2); do \ $(Q) for __obj in $(subst ",,$(2)) ; do \
echo "AR: $(__obj)"; \ echo "AR: $$__obj"; \
$(AR) $(ARFLAGS) $1=-+$(__obj) || { echo "$(AR) $1=-+$(__obj) FAILED!" ; exit 1 ; } \ "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
done done
endef endef
endif endif
define CLEAN define CLEAN
@rm -f *.obj *.src *.lib *.hex *.lst $(Q) rm -f *.obj *.src *.lib *.hex *.lst
endef endef
# This is the tool to use for dependencies (i.e., none) # This is the tool to use for dependencies (i.e., none)
configs/z16f2800100zcog/pashello/Make.defs
+20 -11
View File
@@ -38,18 +38,27 @@ include ${TOPDIR}/tools/Config.mk
# These are the directories where the ZNeo-II toolchain is installed # These are the directories where the ZNeo-II toolchain is installed
ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_ZNEO_4.11.1 ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_ZNEO_4.11.1
ZDSBINDIR := $(ZDSINSTALLDIR)/bin
ZDSSTDINCDIR := $(ZDSINSTALLDIR)/include/std
ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog
ZDSSTDLIBDIR := $(ZDSINSTALLDIR)/lib/std
ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
ZDSBINDIR := $(ZDSINSTALLDIR)\bin
ZDSSTDINCDIR := $(ZDSINSTALLDIR)\include\std
ZDSZILOGINCDIR := $(ZDSINSTALLDIR)\include\zilog
ZDSSTDLIBDIR := $(ZDSINSTALLDIR)\lib\std
ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)\lib\zilog
else
WINTOOL := y
INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"}
ZDSBINDIR := $(INSTALLDIR)/bin
ZDSSTDINCDIR := $(INSTALLDIR)/include/std
ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog
ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std
ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog
endif
# These are the same directories but with the directory separator # These are the same directories but with the directory separator
# character swapped as needed by the ZNeo-II compiler # character swapped as needed by the ZNeo-II compiler
WINTOOL := y
WTOPDIR := ${shell cygpath -w $(TOPDIR)} WTOPDIR := ${shell cygpath -w $(TOPDIR)}
WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)} WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)}
WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)} WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)}
@@ -149,13 +158,13 @@ endef
ifeq ($(CONFIG_WINDOWS_NATIVE),y) ifeq ($(CONFIG_WINDOWS_NATIVE),y)
define ARCHIVE define ARCHIVE
echo "AR: $2"; echo "AR: $2";
$(Q) for %%G in ($(subst ",,$(2))) do ( $(AR) $(ARFLAGS) $1=-+%%G ) $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
endef endef
else else
define ARCHIVE define ARCHIVE
$(Q) for __obj in $(2); do \ $(Q) for __obj in $(subst ",,$(2)) ; do \
echo "AR: $(__obj)"; \ echo "AR: $$__obj"; \
$(AR) $(ARFLAGS) $1=-+$(__obj) || { echo "$(AR) $1=-+$(__obj) FAILED!" ; exit 1 ; } \ "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
done done
endef endef
endif endif
configs/z16f2800100zcog/src/Makefile
+1 -1
View File
@@ -67,7 +67,7 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, "$(OBJS)") $(call ARCHIVE, $@, "$(OBJS)")
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep @$(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ @touch $@
depend: .depend depend: .depend
configs/z8encore000zco/ostest/Make.defs
+39 -23
View File
@@ -38,29 +38,45 @@ 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
ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_Z8Encore!_4.10.1 ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_Z8Encore!_4.10.1
ZDSBINDIR := $(ZDSINSTALLDIR)/bin
ZDSSTDINCDIR := $(ZDSINSTALLDIR)/include/std ifeq ($(CONFIG_WINDOWS_NATIVE),y)
ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog ZDSBINDIR := $(ZDSINSTALLDIR)\bin
ZDSSTDINCDIR := $(ZDSINSTALLDIR)\include\std
ZDSZILOGINCDIR := $(ZDSINSTALLDIR)\include\zilog
ifeq ($(CONFIG_ARCH_CHIP_Z8F642X),y) ifeq ($(CONFIG_ARCH_CHIP_Z8F642X),y)
ZDSDEVINCDIR := $(ZDSZILOGINCDIR)/Z8Encore_F642X ZDSDEVINCDIR := $(ZDSZILOGINCDIR)\Z8Encore_F642X
endif endif
ifeq ($(CONFIG_ARCH_CHIP_Z8F640X),y) ifeq ($(CONFIG_ARCH_CHIP_Z8F640X),y)
ZDSDEVINCDIR := $(ZDSZILOGINCDIR)/Z8Encore_F640X ZDSDEVINCDIR := $(ZDSZILOGINCDIR)\Z8Encore_F640X
endif
ZDSSTDLIBDIR := $(ZDSINSTALLDIR)\lib\std
ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)\lib\zilog
else
WINTOOL := y
INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"}
ZDSBINDIR := $(INSTALLDIR)/bin
ZDSSTDINCDIR := $(INSTALLDIR)/include/std
ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog
ifeq ($(CONFIG_ARCH_CHIP_Z8F642X),y)
ZDSDEVINCDIR := $(ZDSZILOGINCDIR)/Z8Encore_F642X
endif
ifeq ($(CONFIG_ARCH_CHIP_Z8F640X),y)
ZDSDEVINCDIR := $(ZDSZILOGINCDIR)/Z8Encore_F640X
endif
ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std
ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog
endif endif
ZDSSTDLIBDIR := $(ZDSINSTALLDIR)/lib/std
ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog
# These are the same directories but with the directory separator # These are the same directories but with the directory separator
# character swapped as needed by the ZDS-II compiler # character swapped as needed by the ZDS-II compiler
WINTOOL := y WTOPDIR := ${shell cygpath -w "$(TOPDIR)"}
WTOPDIR := ${shell cygpath -w $(TOPDIR)} WZDSSTDINCDIR := ${shell cygpath -w "$(ZDSSTDINCDIR)"}
WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)} WZDSZILOGINCDIR := ${shell cygpath -w "$(ZDSZILOGINCDIR)"}
WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)} WZDSDEVINCDIR := ${shell cygpath -w "$(ZDSDEVINCDIR)"}
WZDSDEVINCDIR := ${shell cygpath -w $(ZDSDEVINCDIR)} WZDSSTDLIBDIR := ${shell cygpath -w "$(ZDSSTDLIBDIR)"}
WZDSSTDLIBDIR := ${shell cygpath -w $(ZDSSTDLIBDIR)} WZDSZILOGLIBDIR := ${shell cygpath -w "$(ZDSZILOGLIBDIR)"}
WZDSZILOGLIBDIR := ${shell cygpath -w $(ZDSZILOGLIBDIR)}
# Escaped versions # Escaped versions
@@ -159,35 +175,35 @@ EXEEXT = .hex
define PREPROCESS define PREPROCESS
@echo "CPP: $1->$2" @echo "CPP: $1->$2"
@$(CPP) $(CPPFLAGS) $1 -o $2 $(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2
endef endef
define COMPILE define COMPILE
@#echo "CC: $1" @#echo "CC: $1"
@(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile) $(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile)
endef endef
define ASSEMBLE define ASSEMBLE
@#echo "AS: $1" @#echo "AS: $1"
@(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) $(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile)
endef endef
ifeq ($(CONFIG_WINDOWS_NATIVE),y) ifeq ($(CONFIG_WINDOWS_NATIVE),y)
define ARCHIVE define ARCHIVE
echo "AR: $2"; echo "AR: $2";
$(Q) for %%G in ($(subst ",,$(2))) do ( $(AR) $(ARFLAGS) $1=-+%%G ) $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
endef endef
else else
define ARCHIVE define ARCHIVE
$(Q) for __obj in $(2); do \ $(Q) for __obj in $(subst ",,$(2)) ; do \
echo "AR: $(__obj)"; \ echo "AR: $$__obj"; \
$(AR) $(ARFLAGS) $1=-+$(__obj) || { echo "$(AR) $1=-+$(__obj) FAILED!" ; exit 1 ; } \ "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
done done
endef endef
endif endif
define CLEAN define CLEAN
@rm -f *.obj *.src *.lib *.hex *.lst $(Q) rm -f *.obj *.src *.lib *.hex *.lst
endef endef
# This is the tool to use for dependencies (i.e., none) # This is the tool to use for dependencies (i.e., none)
configs/z8encore000zco/src/Makefile
+1 -1
View File
@@ -67,7 +67,7 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, "$(OBJS)") $(call ARCHIVE, $@, "$(OBJS)")
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep @$(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ @touch $@
depend: .depend depend: .depend
configs/z8f64200100kit/ostest/Make.defs
+39 -23
View File
@@ -38,29 +38,45 @@ 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
ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_Z8Encore!_4.10.1 ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_Z8Encore!_4.10.1
ZDSBINDIR := $(ZDSINSTALLDIR)/bin
ZDSSTDINCDIR := $(ZDSINSTALLDIR)/include/std ifeq ($(CONFIG_WINDOWS_NATIVE),y)
ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog ZDSBINDIR := $(ZDSINSTALLDIR)\bin
ZDSSTDINCDIR := $(ZDSINSTALLDIR)\include\std
ZDSZILOGINCDIR := $(ZDSINSTALLDIR)\include\zilog
ifeq ($(CONFIG_ARCH_CHIP_Z8F642X),y) ifeq ($(CONFIG_ARCH_CHIP_Z8F642X),y)
ZDSDEVINCDIR := $(ZDSZILOGINCDIR)/Z8Encore_F642X ZDSDEVINCDIR := $(ZDSZILOGINCDIR)\Z8Encore_F642X
endif endif
ifeq ($(CONFIG_ARCH_CHIP_Z8F640X),y) ifeq ($(CONFIG_ARCH_CHIP_Z8F640X),y)
ZDSDEVINCDIR := $(ZDSZILOGINCDIR)/Z8Encore_F640X ZDSDEVINCDIR := $(ZDSZILOGINCDIR)\Z8Encore_F640X
endif
ZDSSTDLIBDIR := $(ZDSINSTALLDIR)\lib\std
ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)\lib\zilog
else
WINTOOL := y
INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"}
ZDSBINDIR := $(INSTALLDIR)/bin
ZDSSTDINCDIR := $(INSTALLDIR)/include/std
ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog
ifeq ($(CONFIG_ARCH_CHIP_Z8F642X),y)
ZDSDEVINCDIR := $(ZDSZILOGINCDIR)/Z8Encore_F642X
endif
ifeq ($(CONFIG_ARCH_CHIP_Z8F640X),y)
ZDSDEVINCDIR := $(ZDSZILOGINCDIR)/Z8Encore_F640X
endif
ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std
ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog
endif endif
ZDSSTDLIBDIR := $(ZDSINSTALLDIR)/lib/std
ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog
# These are the same directories but with the directory separator # These are the same directories but with the directory separator
# character swapped as needed by the ZDS-II compiler # character swapped as needed by the ZDS-II compiler
WINTOOL := y WTOPDIR := ${shell cygpath -w "$(TOPDIR)"}
WTOPDIR := ${shell cygpath -w $(TOPDIR)} WZDSSTDINCDIR := ${shell cygpath -w "$(ZDSSTDINCDIR)"}
WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)} WZDSZILOGINCDIR := ${shell cygpath -w "$(ZDSZILOGINCDIR)"}
WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)} WZDSDEVINCDIR := ${shell cygpath -w "$(ZDSDEVINCDIR)"}
WZDSDEVINCDIR := ${shell cygpath -w $(ZDSDEVINCDIR)} WZDSSTDLIBDIR := ${shell cygpath -w "$(ZDSSTDLIBDIR)"}
WZDSSTDLIBDIR := ${shell cygpath -w $(ZDSSTDLIBDIR)} WZDSZILOGLIBDIR := ${shell cygpath -w "$(ZDSZILOGLIBDIR)"}
WZDSZILOGLIBDIR := ${shell cygpath -w $(ZDSZILOGLIBDIR)}
# Escaped versions # Escaped versions
@@ -159,35 +175,35 @@ EXEEXT = .hex
define PREPROCESS define PREPROCESS
@echo "CPP: $1->$2" @echo "CPP: $1->$2"
@$(CPP) $(CPPFLAGS) $1 -o $2 $(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2
endef endef
define COMPILE define COMPILE
@#echo "CC: $1" @#echo "CC: $1"
@(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile) $(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile)
endef endef
define ASSEMBLE define ASSEMBLE
@#echo "AS: $1" @#echo "AS: $1"
@(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) $(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile)
endef endef
ifeq ($(CONFIG_WINDOWS_NATIVE),y) ifeq ($(CONFIG_WINDOWS_NATIVE),y)
define ARCHIVE define ARCHIVE
echo "AR: $2"; echo "AR: $2";
$(Q) for %%G in ($(subst ",,$(2))) do ( $(AR) $(ARFLAGS) $1=-+%%G ) $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
endef endef
else else
define ARCHIVE define ARCHIVE
$(Q) for __obj in $(2); do \ $(Q) for __obj in $(subst ",,$(2)) ; do \
echo "AR: $(__obj)"; \ echo "AR: $$__obj"; \
$(AR) $(ARFLAGS) $1=-+$(__obj) || { echo "$(AR) $1=-+$(__obj) FAILED!" ; exit 1 ; } \ "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
done done
endef endef
endif endif
define CLEAN define CLEAN
@rm -f *.obj *.src *.lib *.hex *.lst $(Q) rm -f *.obj *.src *.lib *.hex *.lst
endef endef
# This is the tool to use for dependencies (i.e., none) # This is the tool to use for dependencies (i.e., none)
configs/z8f64200100kit/src/Makefile
+1 -1
View File
@@ -67,7 +67,7 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, "$(OBJS)") $(call ARCHIVE, $@, "$(OBJS)")
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep @$(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ @touch $@
depend: .depend depend: .depend
drivers/Makefile
+1 -1
View File
@@ -105,7 +105,7 @@ $(BIN): $(OBJS)
$(call ARCHIVE, $@, "$(OBJS)") $(call ARCHIVE, $@, "$(OBJS)")
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
$(Q) $(MKDEP) $(DEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
$(Q) touch $@ $(Q) touch $@
depend: .depend depend: .depend
fs/Makefile
+1 -1
View File
@@ -124,7 +124,7 @@ $(BIN): $(OBJS)
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
$(Q) $(MKDEP) --dep-path . $(MMAPDEPPATH) $(FATDEPPATH) $(ROMFSDEPPATH) $(NXFFSDEPPATH) $(NFSDEPPATH) \ $(Q) $(MKDEP) --dep-path . $(MMAPDEPPATH) $(FATDEPPATH) $(ROMFSDEPPATH) $(NXFFSDEPPATH) $(NFSDEPPATH) \
$(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
$(Q) touch $@ $(Q) touch $@
depend: .depend depend: .depend
graphics/Makefile
+1 -1
View File
@@ -191,7 +191,7 @@ $(BIN): $(OBJS)
mklibgraphics: gensources $(BIN) mklibgraphics: gensources $(BIN)
.depend: gensources Makefile $(SRCS) .depend: gensources Makefile $(SRCS)
$(Q) $(MKDEP) $(DEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
$(Q) touch $@ $(Q) touch $@
depend: .depend depend: .depend
libc/Makefile
+1 -1
View File
@@ -98,7 +98,7 @@ $(KBIN): uclean .kernlib
endif endif
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
$(Q) $(MKDEP) $(DEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
$(Q) touch $@ $(Q) touch $@
depend: .depend depend: .depend
libxx/Makefile
+1 -1
View File
@@ -99,7 +99,7 @@ $(BIN): $(OBJS)
$(call ARCHIVE, $@, "$(OBJS)") $(call ARCHIVE, $@, "$(OBJS)")
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
$(Q) $(MKDEP) $(DEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(DEPPATH) "$(CXX)" -- $(CXXFLAGS) -- $(SRCS) >Make.dep
$(Q) touch $@ $(Q) touch $@
depend: .depend depend: .depend
mm/Makefile
+1 -1
View File
@@ -64,7 +64,7 @@ $(BIN): $(OBJS)
$(call ARCHIVE, $@, "$(OBJS)") $(call ARCHIVE, $@, "$(OBJS)")
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
$(Q) touch $@ $(Q) touch $@
depend: .depend depend: .depend
net/Makefile
+1 -1
View File
@@ -104,7 +104,7 @@ $(BIN): $(OBJS)
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
ifeq ($(CONFIG_NET),y) ifeq ($(CONFIG_NET),y)
$(Q) $(MKDEP) --dep-path . --dep-path uip $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) --dep-path . --dep-path uip "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
endif endif
$(Q) touch $@ $(Q) touch $@
sched/Makefile
+1 -1
View File
@@ -199,7 +199,7 @@ $(BIN): $(OBJS)
$(call ARCHIVE, $@, "$(OBJS)") $(call ARCHIVE, $@, "$(OBJS)")
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
$(Q) touch $@ $(Q) touch $@
depend: .depend depend: .depend
syscall/Makefile
+1 -1
View File
@@ -79,7 +79,7 @@ $(BIN2): $(STUB_OBJS)
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
$(Q) $(MKDEP) $(ROOTDEPPATH) $(PROXYDEPPATH) $(STUBDEPPATH) \ $(Q) $(MKDEP) $(ROOTDEPPATH) $(PROXYDEPPATH) $(STUBDEPPATH) \
$(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
$(Q) touch $@ $(Q) touch $@
depend: .depend depend: .depend
tools/Config.mk
+4 -4
View File
@@ -64,14 +64,14 @@ endef
ifeq ($(CONFIG_WINDOWS_NATIVE),y) ifeq ($(CONFIG_WINDOWS_NATIVE),y)
define ARCHIVE define ARCHIVE
echo "AR: $2" @echo "AR: $2"
$(AR) $1 $(AR) $1
$(AR) $1 $(subst ",,$(2)) $(Q) $(AR) $1 $(subst ",,$(2))
endef endef
else else
define ARCHIVE define ARCHIVE
echo "AR: $2" @echo "AR: $2"
$(AR) $1 $(subst ",,$(2)) || { echo "$(AR) $1 $2 FAILED!" ; exit 1 ; } $(Q) $(AR) $1 $(subst ",,$(2)) || { echo "$(AR) $1 $2 FAILED!" ; exit 1 ; }
endef endef
endif endif