arch/z16/src: Replicate build changes make for ez80 and z8 for zneo.

arch/z16/src/Makefile

@@ -40,14 +40,14 @@ COMPILER = ${shell basename "$(CC)"}
 ARCHSRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
 
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
-  USRINCLUDES = -usrinc:'.;$(TOPDIR)/sched;$(ARCHSRCDIR);$(ARCHSRCDIR)/common'
+  USRINCLUDES = -usrinc:'.;$(TOPDIR)/sched;$(ARCHSRCDIR)$(DELIM)chip;$(ARCHSRCDIR)$(DELIM)common'
 else
 ifeq ($(COMPILER),zneocc.exe)
   WARCHSRCDIR := ${shell cygpath -w $(ARCHSRCDIR)}
-  USRINCLUDES = -usrinc:'.;$(WTOPDIR)\sched;$(WARCHSRCDIR);$(WARCHSRCDIR)\common'
+  USRINCLUDES = -usrinc:'.;$(WTOPDIR)\sched;$(WARCHSRCDIR)$(DELIM)chip;$(WARCHSRCDIR)$(DELIM)common'
 else
   WARCHSRCDIR = $(ARCHSRCDIR)
-  USRINCLUDES = -I$(TOPDIR)/sched -I$(ARCHSRCDIR) -I$(ARCHSRCDIR)/common
+  USRINCLUDES = -I$(TOPDIR)/sched -I$(ARCHSRCDIR)$(DELIM)chip -I$(ARCHSRCDIR)$(DELIM)common
 endif
 endif
 

arch/z16/src/common/up_allocateheap.c

@@ -47,7 +47,7 @@
 #include <nuttx/kmalloc.h>
 #include <arch/board/board.h>
 
-#include "chip/chip.h"
+#include "chip.h"
 #include "up_internal.h"
 
 /****************************************************************************

arch/z16/src/common/up_arch.h

@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 #include <arch/board/board.h>
-#include "chip/chip.h"
+#include "chip.h"
 
 /************************************************************************************
  * Pre-processor Definitions

arch/z16/src/common/up_assert.c

@@ -53,7 +53,7 @@
 
 #include <arch/board/board.h>
 
-#include "chip/chip.h"
+#include "chip.h"
 #include "sched/sched.h"
 #include "up_internal.h"
 

arch/z16/src/common/up_createstack.c

@@ -49,7 +49,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "chip/chip.h"
+#include "chip.h"
 #include "up_internal.h"
 
 /****************************************************************************

arch/z16/src/common/up_doirq.c

@@ -46,7 +46,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "chip/chip.h"
+#include "chip.h"
 #include "up_internal.h"
 
 /****************************************************************************

arch/z16/src/common/up_exit.c

@@ -49,7 +49,7 @@
 #  include <nuttx/fs/fs.h>
 #endif
 
-#include "chip/chip.h"
+#include "chip.h"
 #include "task/task.h"
 #include "sched/sched.h"
 #include "up_internal.h"

arch/z16/src/common/up_initialstate.c

@@ -43,7 +43,7 @@
 #include <string.h>
 #include <nuttx/arch.h>
 
-#include "chip/chip.h"
+#include "chip.h"
 #include "up_internal.h"
 
 /****************************************************************************

arch/z16/src/common/up_internal.h

@@ -42,7 +42,7 @@
  ****************************************************************************/
 
 #include <arch/irq.h>
-#include "chip/chip.h"
+#include "chip.h"
 
 /****************************************************************************
  * Pre-processor Definitions

arch/z16/src/common/up_releasepending.c

@@ -45,7 +45,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/sched.h>
 
-#include "chip/chip.h"
+#include "chip.h"
 #include "sched/sched.h"
 #include "up_internal.h"
 

arch/z16/src/common/up_reprioritizertr.c

@@ -47,7 +47,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/sched.h>
 
-#include "chip/chip.h"
+#include "chip.h"
 #include "sched/sched.h"
 #include "up_internal.h"
 

arch/z16/src/common/up_stackdump.c

@@ -41,7 +41,7 @@
 
 #include <debug.h>
 
-#include "chip/chip.h"
+#include "chip.h"
 #include "sched/sched.h"
 #include "up_internal.h"
 

arch/z16/src/common/up_unblocktask.c

@@ -45,7 +45,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/sched.h>
 
-#include "chip/chip.h"
+#include "chip.h"
 #include "sched/sched.h"
 #include "clock/clock.h"
 #include "up_internal.h"

arch/z16/src/z16f/z16f_clkinit.c

@@ -39,7 +39,7 @@
  * Included Files
  ****************************************************************************/
 
-#include "chip/chip.h"
+#include "chip.h"
 
 /****************************************************************************
  * Pre-processor Definitions

arch/z16/src/z16f/z16f_irq.c

@@ -44,7 +44,7 @@
 #include <nuttx/irq.h>
 #include <arch/irq.h>
 
-#include "chip/chip.h"
+#include "chip.h"
 #include "up_internal.h"
 
 /****************************************************************************

arch/z16/src/z16f/z16f_lowuart.S

@@ -39,7 +39,7 @@
  *************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/chip.h"
+#include "chip.h"
 #include "common/up_internal.h"
 
 #ifdef USE_LOWUARTINIT

arch/z16/src/z16f/z16f_restoreusercontext.S

@@ -39,7 +39,7 @@
 
 #include <nuttx/config.h>
 #include <arch/irq.h>
-#include "chip/chip.h"
+#include "chip.h"
 
 /*************************************************************************
  * External References / External Definitions

arch/z16/src/z16f/z16f_saveusercontext.S

@@ -39,7 +39,7 @@
 
 #include <nuttx/config.h>
 #include <arch/irq.h>
-#include "chip/chip.h"
+#include "chip.h"
 
 /*************************************************************************
  * External References / External Definitions

arch/z16/src/z16f/z16f_serial.c

@@ -52,7 +52,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/serial/serial.h>
 
-#include "chip/chip.h"
+#include "chip.h"
 #include "up_internal.h"
 
 #ifdef USE_SERIALDRIVER

arch/z16/src/z16f/z16f_sysexec.c

@@ -44,7 +44,7 @@
 
 #include <nuttx/arch.h>
 
-#include "chip/chip.h"
+#include "chip.h"
 #include "up_internal.h"
 
 /****************************************************************************

arch/z16/src/z16f/z16f_timerisr.c

@@ -45,7 +45,7 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "chip/chip.h"
+#include "chip.h"
 #include "clock/clock.h"
 #include "up_internal.h"
 

configs/z16f2800100zcog/src/z16f_lowinit.c

@@ -41,7 +41,7 @@
 
 #include <nuttx/config.h>
 
-#include "chip/chip.h"
+#include "chip.h"
 
 /****************************************************************************
  * Pre-processor Definitions