arch/: Add the ARCH_SRC directory to the context and clean_context

targets Signed-off-by: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
2020-09-23 12:48:02 +01:00 · 2020-09-23 12:48:02 +01:00 · 609a5fa4f0
commit 609a5fa4f0
parent 7284956730
19 changed files with 84 additions and 16 deletions
--- a/arch/arm/src/Makefile
+++ b/arch/arm/src/Makefile
@ -35,7 +35,7 @@
 ############################################################################

 include $(TOPDIR)/Make.defs
-include chip/Make.defs
+-include chip/Make.defs

 ifeq ($(CONFIG_ARCH_ARMV7A),y)          # ARMv7-A
 ARCH_SUBDIR = armv7-a
@ -204,6 +204,10 @@ endif

 depend: .depend

+context::
+
+clean_context::
+
 clean:
 ifeq ($(BOARDMAKE),y)
 	$(Q) $(MAKE) -C board clean
--- a/arch/avr/src/Makefile
+++ b/arch/avr/src/Makefile
@ -34,7 +34,7 @@
 ############################################################################

 include $(TOPDIR)/Make.defs
-include chip/Make.defs
+-include chip/Make.defs

 ifeq ($(CONFIG_ARCH_FAMILY_AVR32),y)
 ARCH_SUBDIR = avr32
@ -150,6 +150,10 @@ endif

 depend: .depend

+context::
+
+clean_context::
+
 clean:
 ifeq ($(BOARDMAKE),y)
 	$(Q) $(MAKE) -C board clean
--- a/arch/hc/src/Makefile
+++ b/arch/hc/src/Makefile
@ -34,7 +34,7 @@
 ############################################################################

 include $(TOPDIR)/Make.defs
-include chip/Make.defs
+-include chip/Make.defs

 ifeq ($(CONFIG_ARCH_HC12),y)
 ARCH_SUBDIR = hc12
@ -165,6 +165,10 @@ endif

 depend: .depend

+context::
+
+clean_context::
+
 clean:
 ifeq ($(BOARDMAKE),y)
 	$(Q) $(MAKE) -C board clean
--- a/arch/mips/src/Makefile
+++ b/arch/mips/src/Makefile
@ -34,7 +34,7 @@
 ############################################################################

 include $(TOPDIR)/Make.defs
-include chip/Make.defs
+-include chip/Make.defs

 ifeq ($(CONFIG_ARCH_MIPS),y)
 ARCH_SUBDIR = mips32
@ -148,6 +148,10 @@ endif

 depend: .depend

+context::
+
+clean_context::
+
 clean:
 ifeq ($(BOARDMAKE),y)
 	$(Q) $(MAKE) -C board clean
--- a/arch/misoc/src/Makefile
+++ b/arch/misoc/src/Makefile
@ -34,7 +34,7 @@
 ############################################################################

 include $(TOPDIR)/Make.defs
-include chip/Make.defs
+-include chip/Make.defs

 ifeq ($(CONFIG_ARCH_CHIP_LM32),y)
 ARCH_SUBDIR = lm32
@ -151,6 +151,10 @@ endif

 depend: .depend

+context::
+
+clean_context::
+
 clean:
 ifeq ($(BOARDMAKE),y)
 	$(Q) $(MAKE) -C board clean
--- a/arch/or1k/src/Makefile
+++ b/arch/or1k/src/Makefile
@ -34,7 +34,7 @@
 ############################################################################

 include $(TOPDIR)/Make.defs
-include chip/Make.defs
+-include chip/Make.defs

 ifeq ($(CONFIG_ARCH_MOR1KX),y)          # OpenRISC mor1kx
 ARCH_SUBDIR = mor1kx
@ -191,6 +191,10 @@ endif

 depend: .depend

+context::
+
+clean_context::
+
 clean:
 ifeq ($(BOARDMAKE),y)
 	$(Q) $(MAKE) -C board clean
--- a/arch/renesas/src/Makefile
+++ b/arch/renesas/src/Makefile
@ -34,7 +34,7 @@
 ############################################################################

 include $(TOPDIR)/Make.defs
-include chip/Make.defs
+-include chip/Make.defs

 ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src

@ -158,6 +158,10 @@ endif

 depend: .depend

+context::
+
+clean_context::
+
 clean:
 ifeq ($(BOARDMAKE),y)
 	$(Q) $(MAKE) -C board clean
--- a/arch/risc-v/src/Makefile
+++ b/arch/risc-v/src/Makefile
@ -36,7 +36,7 @@
 ############################################################################

 include $(TOPDIR)/Make.defs
-include chip/Make.defs
+-include chip/Make.defs

 ifeq ($(CONFIG_ARCH_RV32I),y)           # Base Integer support
 ARCH_SUBDIR = rv32i
@ -194,6 +194,10 @@ endif

 depend: .depend

+context::
+
+clean_context::
+
 clean:
 ifeq ($(BOARDMAKE),y)
 	$(Q) $(MAKE) -C board clean
--- a/arch/sim/src/Makefile
+++ b/arch/sim/src/Makefile
@ -34,7 +34,7 @@
 #
 ############################################################################

-include $(TOPDIR)/Make.defs
+-include $(TOPDIR)/Make.defs

 ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src

@ -324,6 +324,10 @@ export_startup: board/libboard$(LIBEXT) up_head.o $(HOSTOBJS) nuttx-names.dat

 depend: .depend

+context::
+
+clean_context::
+
 clean:
 	$(Q) if [ -e board/Makefile ]; then \
 		$(MAKE) -C board clean ; \
--- a/arch/x86/src/Makefile
+++ b/arch/x86/src/Makefile
@ -34,7 +34,7 @@
 ############################################################################

 include $(TOPDIR)/Make.defs
-include chip/Make.defs
+-include chip/Make.defs

 ifeq ($(CONFIG_ARCH_I486),y)
 ARCH_SUBDIR = i486
@ -163,6 +163,10 @@ endif

 depend: .depend

+context::
+
+clean_context::
+
 clean:
 ifeq ($(BOARDMAKE),y)
 	$(Q) $(MAKE) -C board clean
--- a/arch/x86_64/src/Makefile
+++ b/arch/x86_64/src/Makefile
@ -19,7 +19,7 @@
 ############################################################################

 include $(TOPDIR)/Make.defs
-include chip/Make.defs
+-include chip/Make.defs

 ifeq ($(CONFIG_ARCH_INTEL64),y)
 ARCH_SUBDIR = intel64
@ -158,6 +158,10 @@ endif

 depend: .depend

+context::
+
+clean_context::
+
 clean:
 ifeq ($(BOARDMAKE),y)
 	$(Q) $(MAKE) -C board clean
--- a/arch/xtensa/src/Makefile
+++ b/arch/xtensa/src/Makefile
@ -34,7 +34,7 @@
 ############################################################################

 include $(TOPDIR)/Make.defs
-include chip/Make.defs
+-include chip/Make.defs

 ifeq ($(CONFIG_ARCH_FAMILY_LX6),y)
 ARCH_SUBDIR = lx6
@ -149,6 +149,10 @@ endif

 depend: .depend

+context::
+
+clean_context::
+
 clean:
 ifeq ($(BOARDMAKE),y)
 	$(Q) $(MAKE) -C board clean
--- a/arch/z16/src/Makefile
+++ b/arch/z16/src/Makefile
@ -19,7 +19,7 @@
 ############################################################################

 include $(TOPDIR)/Make.defs
-include chip/Make.defs
+-include chip/Make.defs

 COMPILER = ${shell basename "$(CC)"}
 ARCHSRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
@ -138,6 +138,10 @@ endif

 depend: .depend

+context::
+
+clean_context::
+
 clean:
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
 	$(Q) if exist board$(DELIM)Makefile ( $(MAKE) -C board clean )
--- a/arch/z80/src/Makefile
+++ b/arch/z80/src/Makefile
@ -36,7 +36,7 @@
 # Makefile fragments

 include $(TOPDIR)/Make.defs
-include chip/Make.defs
+-include chip/Make.defs

 # Compiler-Dependent Make:  SDCC or ZiLOG ZDS-II

--- a/arch/z80/src/Makefile.sdccl
+++ b/arch/z80/src/Makefile.sdccl
@ -216,6 +216,10 @@ export_startup: board/libboard$(LIBEXT) $(STARTUP_OBJS)

 depend: .depend

+context::
+
+clean_context::
+
 clean:
 	$(Q) if [ -e board/Makefile ]; then \
 		$(MAKE) -C board clean ; \
--- a/arch/z80/src/Makefile.sdccw
+++ b/arch/z80/src/Makefile.sdccw
@ -208,6 +208,10 @@ export_startup: board\libboard$(LIBEXT) $(STARTUP_OBJS)

 depend: .depend

+context::
+
+clean_context::
+
 clean:
 	$(Q) if exist board\Makefile ( $(MAKE) -C board clean )
 	$(call DELFILE, asm_mem.h)
--- a/arch/z80/src/Makefile.zdsiil
+++ b/arch/z80/src/Makefile.zdsiil
@ -158,6 +158,10 @@ export_startup: board$(DELIM)libboard$(LIBEXT) $(STARTUP_OBJS)

 depend: .depend

+context::
+
+clean_context::
+
 clean:
 	$(Q) if [ -e board$(DELIM)Makefile ]; then \
 		$(MAKE) -C board clean ; \
--- a/arch/z80/src/Makefile.zdsiiw
+++ b/arch/z80/src/Makefile.zdsiiw
@ -140,6 +140,10 @@ export_startup: board$(DELIM)libboard$(LIBEXT) $(STARTUP_OBJS)

 depend: .depend

+context::
+
+clean_context::
+
 clean:
 	$(Q) if exist board$(DELIM)Makefile ( $(MAKE) -C board clean )
 	$(call DELFILE, nuttx.linkcmd)
--- a/tools/Directories.mk
+++ b/tools/Directories.mk
@ -53,7 +53,7 @@
 #   CONFIG_BUILD_KERNEL is selected, then applications are not build at all.

 CLEANDIRS :=
-CCLEANDIRS := boards $(APPDIR) graphics
+CCLEANDIRS := boards $(APPDIR) graphics $(ARCH_SRC)
 KERNDEPDIRS :=
 USERDEPDIRS :=

@ -77,7 +77,7 @@ ifeq ($(EXTERNALDIR),external)
  KERNDEPDIRS += external
 endif

-CONTEXTDIRS = boards fs $(APPDIR)
+CONTEXTDIRS = boards fs $(APPDIR) $(ARCH_SRC)
 CLEANDIRS += pass1

 ifeq ($(CONFIG_BUILD_FLAT),y)