More changes for a clean ez80 KITG build

2013-11-29 16:12:59 -06:00 · 2013-11-29 16:12:59 -06:00 · 9752335ed9
commit 9752335ed9
parent 0a11d8767f
12 changed files with 256 additions and 39 deletions
--- a/configs/ez80f910200kitg/ostest/Make.defs
+++ b/configs/ez80f910200kitg/ostest/Make.defs
@ -215,6 +215,12 @@ define ASSEMBLE
 	$(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile)
 endef

+define MOVEOBJ
+	$(call MOVEFILE, "$1.obj", "$2$(DELIM)$1.obj")
+	$(call MOVEFILE, "$1.lst", "$2$(DELIM)$1.lst")
+	$(call MOVEFILE, "$1.src", "$2$(DELIM)$1.src")
+endef
+
 define ARCHIVE
 	$(Q) for __obj in $(2) ; do \
 		echo "AR: $$__obj"; \
--- a/configs/ez80f910200kitg/ostest/defconfig
+++ b/configs/ez80f910200kitg/ostest/defconfig
@ -43,8 +43,9 @@ CONFIG_WINDOWS_CYGWIN=y
 # Debug Options
 #
 CONFIG_DEBUG=y
+# CONFIG_ARCH_HAVE_STACKCHECK is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_VERBOSE is not set
-# CONFIG_SYSLOG_ENABLE is not set

 #
 # Subsystem Debug Options
@ -55,12 +56,15 @@ CONFIG_DEBUG=y
 # CONFIG_DEBUG_LIB is not set
 # CONFIG_DEBUG_BINFMT is not set
 # CONFIG_DEBUG_GRAPHICS is not set
+# CONFIG_DEBUG_IRQ is not set

 #
 # Driver Debug Options
 #
+# CONFIG_DEBUG_LEDS is not set
 # CONFIG_DEBUG_ANALOG is not set
-# CONFIG_DEBUG_DMA is not set
+# CONFIG_DEBUG_GPIO is not set
+# CONFIG_DEBUG_AUDIO is not set
 # CONFIG_DEBUG_SYMBOLS is not set

 #
@ -79,18 +83,62 @@ CONFIG_DEBUG=y
 CONFIG_ARCH_Z80=y
 CONFIG_ARCH="z80"
 CONFIG_ARCH_CHIP="ez80"
-CONFIG_BOARD_LOOPSPERMSEC=1250
-# CONFIG_SDIO_DMA is not set
-# CONFIG_SDIO_WIDTH_D1_ONLY is not set
 # CONFIG_ARCH_CHIP_Z80 is not set
-# CONFIG_ARCH_CHIP_Z8F640X is not set
+# CONFIG_ARCH_CHIP_Z8018006VSG is not set
+# CONFIG_ARCH_CHIP_Z8018010VSG is not set
+# CONFIG_ARCH_CHIP_Z8018008VSG is not set
+# CONFIG_ARCH_CHIP_Z8018010FSG is not set
+# CONFIG_ARCH_CHIP_Z8018008VEG is not set
+# CONFIG_ARCH_CHIP_Z8018006VEG is not set
+# CONFIG_ARCH_CHIP_Z8018006PSG is not set
+# CONFIG_ARCH_CHIP_Z8018008FSG is not set
+# CONFIG_ARCH_CHIP_Z8018010PSG is not set
+# CONFIG_ARCH_CHIP_Z8018006PEG is not set
+# CONFIG_ARCH_CHIP_Z8018010VEG is not set
+# CONFIG_ARCH_CHIP_Z8018010PEG is not set
+# CONFIG_ARCH_CHIP_Z8018008PSG is not set
+# CONFIG_ARCH_CHIP_Z8018006FSG is not set
+# CONFIG_ARCH_CHIP_Z8018000XSO is not set
+# CONFIG_ARCH_CHIP_Z8018010FEG is not set
+# CONFIG_ARCH_CHIP_Z8018000WSO is not set
+# CONFIG_ARCH_CHIP_Z8018008PEG is not set
+# CONFIG_ARCH_CHIP_Z8018110FEG is not set
+# CONFIG_ARCH_CHIP_Z8018233FSG is not set
+# CONFIG_ARCH_CHIP_Z8018220AEG is not set
+# CONFIG_ARCH_CHIP_Z8018216FSG is not set
+# CONFIG_ARCH_CHIP_Z8018216ASG is not set
+# CONFIG_ARCH_CHIP_Z8018233ASG is not set
+# CONFIG_ARCH_CHIP_Z8019520FSG is not set
+# CONFIG_ARCH_CHIP_Z8019533FSG is not set
+# CONFIG_ARCH_CHIP_Z8L18020VSG is not set
+# CONFIG_ARCH_CHIP_Z8L18020FSG is not set
+# CONFIG_ARCH_CHIP_Z8L18020PSG is not set
+# CONFIG_ARCH_CHIP_Z8L18220ASG is not set
+# CONFIG_ARCH_CHIP_Z8L18220FSG is not set
+# CONFIG_ARCH_CHIP_Z8L18220AEG is not set
+# CONFIG_ARCH_CHIP_Z8S18020VSG is not set
+# CONFIG_ARCH_CHIP_Z8S18020VSG1960 is not set
+# CONFIG_ARCH_CHIP_Z8S18033VSG is not set
+# CONFIG_ARCH_CHIP_Z8S18010FSG is not set
+# CONFIG_ARCH_CHIP_Z8S18010VEG is not set
+# CONFIG_ARCH_CHIP_Z8S18020VEG is not set
+# CONFIG_ARCH_CHIP_Z8S18010VSG is not set
+# CONFIG_ARCH_CHIP_Z8S18020PSG is not set
+# CONFIG_ARCH_CHIP_Z8S18033FSG is not set
+# CONFIG_ARCH_CHIP_Z8S18033FEG is not set
+# CONFIG_ARCH_CHIP_Z8S18020FSG is not set
+# CONFIG_ARCH_CHIP_Z8S18033VEG is not set
+# CONFIG_ARCH_CHIP_Z8S18010PSG is not set
+# CONFIG_ARCH_CHIP_Z8S18020FEG is not set
+# CONFIG_ARCH_CHIP_Z8S18010PEG is not set
+# CONFIG_ARCH_CHIP_Z8S18010FEG is not set
 # CONFIG_ARCH_CHIP_Z8F6403 is not set
-# CONFIG_ARCH_CHIP_Z8F642X is not set
 # CONFIG_ARCH_CHIP_Z8F6423 is not set
 CONFIG_ARCH_CHIP_EZ80F91=y
 # CONFIG_ARCH_CHIP_EZ80F92 is not set
 # CONFIG_ARCH_CHIP_EZ80F93 is not set
 CONFIG_ARCH_CHIP_EZ80=y
+CONFIG_HAVE_LOWSERIALINIT=y

 #
 # ez80 Peripheral Support
@ -99,20 +147,29 @@ CONFIG_EZ80_UART0=y
 # CONFIG_EZ80_UART1 is not set
 # CONFIG_EZ80_UART2 is not set
 # CONFIG_EZ80_EMAC is not set
-CONFIG_HAVE_LOWSERIALINIT=y
+CONFIG_EZ80_TOOLCHAIN_ZDSII=y
+# CONFIG_ARCH_TIMERHOOK is not set

 #
 # Architecture Options
 #
 # CONFIG_ARCH_NOINTC is not set
+# CONFIG_ARCH_VECNOTIRQ is not set
 # CONFIG_ARCH_DMA is not set
+# CONFIG_ARCH_IRQPRIO is not set
+# CONFIG_CUSTOM_STACK is not set
+# CONFIG_ADDRENV is not set
+# CONFIG_ARCH_HAVE_VFORK is not set
 # CONFIG_ARCH_STACKDUMP is not set
+# CONFIG_ENDIAN_BIG is not set
+# CONFIG_ARCH_HAVE_RAMFUNCS is not set
+# CONFIG_ARCH_HAVE_RAMVECTORS is not set

 #
 # Board Settings
 #
-CONFIG_RAM_START=0
-CONFIG_RAM_SIZE=65536
+CONFIG_BOARD_LOOPSPERMSEC=1250
+# CONFIG_ARCH_CALIBRATION is not set

 #
 # Boot options
@ -123,6 +180,12 @@ CONFIG_BOOT_RUNFROMFLASH=y
 # CONFIG_BOOT_RUNFROMSDRAM is not set
 # CONFIG_BOOT_COPYTORAM is not set

+#
+# Boot Memory Configuration
+#
+CONFIG_RAM_START=0
+CONFIG_RAM_SIZE=65536
+
 #
 # Board Selection
 #
@ -144,10 +207,12 @@ CONFIG_ARCH_HAVE_LEDS=y
 #
 # RTOS Features
 #
+# CONFIG_BOARD_INITIALIZE is not set
 CONFIG_MSEC_PER_TICK=10
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
+# CONFIG_SCHED_HAVE_PARENT is not set
 # CONFIG_JULIAN_TIME is not set
 CONFIG_START_YEAR=2009
 CONFIG_START_MONTH=2
@ -158,20 +223,25 @@ CONFIG_DEV_CONSOLE=y
 # CONFIG_FDCLONE_DISABLE is not set
 # CONFIG_FDCLONE_STDIO is not set
 CONFIG_SDCLONE_DISABLE=y
-# CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_WAITPID is not set
+# CONFIG_SCHED_STARTHOOK is not set
 # CONFIG_SCHED_ATEXIT is not set
 # CONFIG_SCHED_ONEXIT is not set
 CONFIG_USER_ENTRYPOINT="ostest_main"
 CONFIG_DISABLE_OS_API=y
-CONFIG_DISABLE_CLOCK=y
+# CONFIG_DISABLE_CLOCK is not set
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_DISABLE_PTHREAD=y
-CONFIG_DISABLE_SIGNALS=y
+# CONFIG_DISABLE_SIGNALS is not set
 CONFIG_DISABLE_MQUEUE=y
-CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_DISABLE_ENVIRON=y
-CONFIG_DISABLE_POLL=y
+
+#
+# Signal Numbers
+#
+CONFIG_SIG_SIGUSR1=1
+CONFIG_SIG_SIGUSR2=2
+CONFIG_SIG_SIGALARM=3

 #
 # Sizes of configurable things (0 disables)
@ -191,7 +261,6 @@ CONFIG_PREALLOC_TIMERS=0
 #
 # Stack and heap information
 #
-# CONFIG_CUSTOM_STACK is not set
 CONFIG_IDLETHREAD_STACKSIZE=1024
 CONFIG_USERMAIN_STACKSIZE=1024
 CONFIG_PTHREAD_STACK_MIN=256
@ -200,17 +269,21 @@ CONFIG_PTHREAD_STACK_DEFAULT=1024
 #
 # Device Drivers
 #
+CONFIG_DISABLE_POLL=y
 CONFIG_DEV_NULL=y
 # CONFIG_DEV_ZERO is not set
 # CONFIG_LOOP is not set
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
+# CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
 # CONFIG_PWM is not set
 # CONFIG_I2C is not set
 # CONFIG_SPI is not set
+# CONFIG_I2S is not set
 # CONFIG_RTC is not set
 # CONFIG_WATCHDOG is not set
 # CONFIG_ANALOG is not set
+# CONFIG_AUDIO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_LCD is not set
@ -220,21 +293,22 @@ CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_MULTIBLOCK_DISABLE is not set
 CONFIG_MMCSD_MMCSUPPORT=y
 CONFIG_MMCSD_HAVECARDDETECT=y
-CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SPICLOCK=20000000
-# CONFIG_MMCSD_SDIO is not set
-# CONFIG_SDIO_MUXBUS is not set
+# CONFIG_ARCH_HAVE_SDIO is not set
 # CONFIG_MTD is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
 # CONFIG_POWER is not set
 # CONFIG_SENSORS is not set
-# CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
 # CONFIG_16550_UART is not set
 CONFIG_ARCH_HAVE_UART0=y
+
+#
+# USART Configuration
+#
 CONFIG_MCU_SERIAL=y
+# CONFIG_SERIAL_TIOCSERGSTRUCT is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_NO_SERIAL_CONSOLE is not set

@ -247,6 +321,10 @@ CONFIG_UART0_BAUD=57600
 CONFIG_UART0_BITS=8
 CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
+# CONFIG_UART0_IFLOWCONTROL is not set
+# CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_SERIAL_IFLOWCONTROL is not set
+# CONFIG_SERIAL_OFLOWCONTROL is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_WIRELESS is not set
@ -263,6 +341,8 @@ CONFIG_UART0_2STOP=0
 #
 # Networking Support
 #
+# CONFIG_ARCH_HAVE_NET is not set
+# CONFIG_ARCH_HAVE_PHY is not set
 # CONFIG_NET is not set

 #
@ -272,11 +352,16 @@ CONFIG_UART0_2STOP=0
 #
 # File system configuration
 #
+CONFIG_DISABLE_MOUNTPOINT=y
+# CONFIG_FS_READABLE is not set
+# CONFIG_FS_WRITABLE is not set
 # CONFIG_FS_RAMMAP is not set
+# CONFIG_FS_PROCFS is not set

 #
 # System Logging
 #
+# CONFIG_SYSLOG_ENABLE is not set
 # CONFIG_SYSLOG is not set

 #
@ -287,6 +372,7 @@ CONFIG_UART0_2STOP=0
 #
 # Memory Management
 #
+# CONFIG_MM_MULTIHEAP is not set
 # CONFIG_MM_SMALL is not set
 CONFIG_MM_REGIONS=1
 CONFIG_ARCH_HAVE_HEAP2=y
@ -294,27 +380,42 @@ CONFIG_HEAP2_BASE=0x00000000
 CONFIG_HEAP2_SIZE=0
 # CONFIG_GRAN is not set

+#
+# Audio Support
+#
+# CONFIG_AUDIO is not set
+
 #
 # Binary Formats
 #
 # CONFIG_BINFMT_DISABLE is not set
 # CONFIG_NXFLAT is not set
 # CONFIG_ELF is not set
+# CONFIG_BUILTIN is not set
+# CONFIG_PIC is not set
 # CONFIG_SYMTAB_ORDEREDBYNAME is not set

 #
 # Library Routines
 #
+
+#
+# Standard C Library Options
+#
 CONFIG_STDIO_BUFFER_SIZE=0
 CONFIG_STDIO_LINEBUFFER=y
 CONFIG_NUNGET_CHARS=0
 # CONFIG_LIBM is not set
 # CONFIG_NOPRINTF_FIELDWIDTH is not set
 # CONFIG_LIBC_FLOATINGPOINT is not set
+CONFIG_LIB_RAND_ORDER=1
 # CONFIG_EOL_IS_CR is not set
 # CONFIG_EOL_IS_LF is not set
 # CONFIG_EOL_IS_BOTH_CRLF is not set
 CONFIG_EOL_IS_EITHER_CRLF=y
+# CONFIG_LIBC_EXECFUNCS is not set
+CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024
+CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
 # CONFIG_LIBC_STRERROR is not set
 # CONFIG_LIBC_PERROR_STDOUT is not set
 CONFIG_ARCH_LOWPUTC=y
@ -322,9 +423,17 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set

+#
+# Non-standard Library Support
+#
+# CONFIG_SCHED_WORKQUEUE is not set
+# CONFIG_LIB_KBDCODEC is not set
+# CONFIG_LIB_SLCDCODEC is not set
+
 #
 # Basic CXX Support
 #
+# CONFIG_C99_BOOL8 is not set
 # CONFIG_HAVE_CXX is not set

 #
@ -332,17 +441,15 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #

 #
-# Named Applications
+# Built-In Applications
 #
-# CONFIG_BUILTIN is not set

 #
 # Examples
 #
 # CONFIG_EXAMPLES_BUTTONS is not set
 # CONFIG_EXAMPLES_CAN is not set
-# CONFIG_SYSTEM_CDCACM is not set
-# CONFIG_SYSTEM_COMPOSITE is not set
+# CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
 # CONFIG_EXAMPLES_FTPC is not set
@ -351,12 +458,13 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_HELLOXX is not set
 # CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
 # CONFIG_EXAMPLES_LCDRW is not set
 # CONFIG_EXAMPLES_MM is not set
-# CONFIG_EXAMPLES_MOUNT is not set
 # CONFIG_EXAMPLES_MODBUS is not set
-# CONFIG_EXAMPLES_NETTEST is not set
+# CONFIG_EXAMPLES_MOUNT is not set
+# CONFIG_EXAMPLES_NRF24L01TERM is not set
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
@ -376,11 +484,15 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_PASHELLO is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
+# CONFIG_EXAMPLES_POSIXSPAWN is not set
 # CONFIG_EXAMPLES_QENCODER is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
+# CONFIG_EXAMPLES_SLCD is not set
+# CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
@ -388,14 +500,13 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
-# CONFIG_EXAMPLES_WLAN is not set

 #
-# Interpreters
+# Graphics Support
 #
+# CONFIG_TIFF is not set

 #
 # Interpreters
@ -425,11 +536,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_NETUTILS_WEBCLIENT is not set

 #
-# ModBus
-#
-
-#
-# FreeModbus
+# FreeModBus
 #
 # CONFIG_MODBUS is not set

@ -442,10 +549,23 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # NxWidgets/NxWM
 #

+#
+# Platform-specific Support
+#
+# CONFIG_PLATFORM_CONFIGDATA is not set
+
 #
 # System NSH Add-Ons
 #

+#
+# USB CDC/ACM Device Commands
+#
+
+#
+# USB Composite Device Commands
+#
+
 #
 # Custom Free Memory Command
 #
@ -460,6 +580,20 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 #
 # CONFIG_SYSTEM_INSTALL is not set

+#
+# FLASH Erase-all Command
+#
+
+#
+# NxPlayer media player library / command Line
+#
+# CONFIG_SYSTEM_NXPLAYER is not set
+
+#
+# RAM test
+#
+# CONFIG_SYSTEM_RAMTEST is not set
+
 #
 # readline()
 #
@ -484,3 +618,20 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # Sysinfo
 #
 # CONFIG_SYSTEM_SYSINFO is not set
+
+#
+# USB Monitor
+#
+
+#
+# Stack Monitor
+#
+
+#
+# USB Mass Storage Device Commands
+#
+
+#
+# Zmodem Commands
+#
+# CONFIG_SYSTEM_ZMODEM is not set
--- a/configs/ez80f910200zco/dhcpd/Make.defs
+++ b/configs/ez80f910200zco/dhcpd/Make.defs
@ -215,6 +215,12 @@ define ASSEMBLE
 	$(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile)
 endef

+define MOVEOBJ
+	$(call MOVEFILE, "$1.obj", "$2$(DELIM)$1.obj")
+	$(call MOVEFILE, "$1.lst", "$2$(DELIM)$1.lst")
+	$(call MOVEFILE, "$1.src", "$2$(DELIM)$1.src")
+endef
+
 define ARCHIVE
 	$(Q) for __obj in $(2) ; do \
 		echo "AR: $$__obj"; \
--- a/configs/ez80f910200zco/httpd/Make.defs
+++ b/configs/ez80f910200zco/httpd/Make.defs
@ -215,6 +215,12 @@ define ASSEMBLE
 	$(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile)
 endef

+define MOVEOBJ
+	$(call MOVEFILE, "$1.obj", "$2$(DELIM)$1.obj")
+	$(call MOVEFILE, "$1.lst", "$2$(DELIM)$1.lst")
+	$(call MOVEFILE, "$1.src", "$2$(DELIM)$1.src")
+endef
+
 define ARCHIVE
 	$(Q) for __obj in $(2) ; do \
 		echo "AR: $$__obj"; \
--- a/configs/ez80f910200zco/nettest/Make.defs
+++ b/configs/ez80f910200zco/nettest/Make.defs
@ -180,6 +180,12 @@ define ASSEMBLE
 	$(Q) "$(AS)" $(AFLAGS) ${shell echo $1 | sed -e "s/\//\\/g"}
 endef

+define MOVEOBJ
+	$(call MOVEFILE, "$1.obj", "$2$(DELIM)$1.obj")
+	$(call MOVEFILE, "$1.lst", "$2$(DELIM)$1.lst")
+	$(call MOVEFILE, "$1.src", "$2$(DELIM)$1.src")
+endef
+
 define ARCHIVE
 	@echo AR: $2
 	$(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
@ -205,16 +211,16 @@ define COMPILE
 	$(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile)
 endef

+define ASSEMBLE
+	$(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile)
+endef
+
 define MOVEOBJ
 	$(call MOVEFILE, "$1.obj", "$2$(DELIM)$1.obj")
 	$(call MOVEFILE, "$1.lst", "$2$(DELIM)$1.lst")
 	$(call MOVEFILE, "$1.src", "$2$(DELIM)$1.src")
 endef

-define ASSEMBLE
-	$(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile)
-endef
-
 define ARCHIVE
 	$(Q) for __obj in $(2) ; do \
 		echo "AR: $$__obj"; \
--- a/configs/ez80f910200zco/nsh/Make.defs
+++ b/configs/ez80f910200zco/nsh/Make.defs
@ -180,6 +180,12 @@ define ASSEMBLE
 	$(Q) "$(AS)" $(AFLAGS) ${shell echo $1 | sed -e "s/\//\\/g"}
 endef

+define MOVEOBJ
+	$(call MOVEFILE, "$1.obj", "$2$(DELIM)$1.obj")
+	$(call MOVEFILE, "$1.lst", "$2$(DELIM)$1.lst")
+	$(call MOVEFILE, "$1.src", "$2$(DELIM)$1.src")
+endef
+
 define ARCHIVE
 	@echo AR: $2
 	$(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
--- a/configs/ez80f910200zco/ostest/Make.defs
+++ b/configs/ez80f910200zco/ostest/Make.defs
@ -215,6 +215,12 @@ define ASSEMBLE
 	$(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile)
 endef

+define MOVEOBJ
+	$(call MOVEFILE, "$1.obj", "$2$(DELIM)$1.obj")
+	$(call MOVEFILE, "$1.lst", "$2$(DELIM)$1.lst")
+	$(call MOVEFILE, "$1.src", "$2$(DELIM)$1.src")
+endef
+
 define ARCHIVE
 	$(Q) for __obj in $(2) ; do \
 		echo "AR: $$__obj"; \
--- a/configs/ez80f910200zco/poll/Make.defs
+++ b/configs/ez80f910200zco/poll/Make.defs
@ -215,6 +215,12 @@ define ASSEMBLE
 	$(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile)
 endef

+define MOVEOBJ
+	$(call MOVEFILE, "$1.obj", "$2$(DELIM)$1.obj")
+	$(call MOVEFILE, "$1.lst", "$2$(DELIM)$1.lst")
+	$(call MOVEFILE, "$1.src", "$2$(DELIM)$1.src")
+endef
+
 define ARCHIVE
 	$(Q) for __obj in $(2) ; do \
 		echo "AR: $$__obj"; \
--- a/configs/z16f2800100zcog/ostest/Make.defs
+++ b/configs/z16f2800100zcog/ostest/Make.defs
@ -208,6 +208,12 @@ define ASSEMBLE
 	$(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile)
 endef

+define MOVEOBJ
+	$(call MOVEFILE, "$1.obj", "$2$(DELIM)$1.obj")
+	$(call MOVEFILE, "$1.lst", "$2$(DELIM)$1.lst")
+	$(call MOVEFILE, "$1.src", "$2$(DELIM)$1.src")
+endef
+
 define ARCHIVE
 	$(Q) for __obj in $(2) ; do \
 		echo "AR: $$__obj"; \
--- a/configs/z16f2800100zcog/pashello/Make.defs
+++ b/configs/z16f2800100zcog/pashello/Make.defs
@ -208,6 +208,12 @@ define ASSEMBLE
 	$(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile)
 endef

+define MOVEOBJ
+	$(call MOVEFILE, "$1.obj", "$2$(DELIM)$1.obj")
+	$(call MOVEFILE, "$1.lst", "$2$(DELIM)$1.lst")
+	$(call MOVEFILE, "$1.src", "$2$(DELIM)$1.src")
+endef
+
 define ARCHIVE
 	$(Q) for __obj in $(2) ; do \
 		echo "AR: $$__obj"; \
--- a/configs/z8encore000zco/ostest/Make.defs
+++ b/configs/z8encore000zco/ostest/Make.defs
@ -241,6 +241,12 @@ define ASSEMBLE
 	$(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile)
 endef

+define MOVEOBJ
+	$(call MOVEFILE, "$1.obj", "$2$(DELIM)$1.obj")
+	$(call MOVEFILE, "$1.lst", "$2$(DELIM)$1.lst")
+	$(call MOVEFILE, "$1.src", "$2$(DELIM)$1.src")
+endef
+
 define ARCHIVE
 	$(Q) for __obj in $(2) ; do \
 		echo "AR: $$__obj"; \
--- a/configs/z8f64200100kit/ostest/Make.defs
+++ b/configs/z8f64200100kit/ostest/Make.defs
@ -212,6 +212,12 @@ define MOVEOBJ
 	$(call MOVEFILE, "$1.src", "$2$(DELIM)$1.src")
 endef

+define MOVEOBJ
+	$(call MOVEFILE, "$1.obj", "$2$(DELIM)$1.obj")
+	$(call MOVEFILE, "$1.lst", "$2$(DELIM)$1.lst")
+	$(call MOVEFILE, "$1.src", "$2$(DELIM)$1.src")
+endef
+
 define ARCHIVE
 	@echo AR: $2
 	$(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )