From c6aed84638bbac5439663559e85b5fcdbd69cb7b Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Sun, 13 Oct 2024 18:45:42 +0800 Subject: [PATCH] tools: Rename apps-or-nuttx-Make.defs to Make.defs follow the same pattern as other Make.defs files Signed-off-by: Xiang Xiao --- arch/arm/src/Makefile | 2 +- arch/arm64/src/Makefile | 2 +- arch/avr/src/Makefile | 2 +- arch/ceva/src/Makefile | 2 +- arch/hc/src/Makefile | 2 +- arch/mips/src/Makefile | 2 +- arch/misoc/src/Makefile | 2 +- arch/or1k/src/Makefile | 2 +- arch/renesas/src/Makefile | 2 +- arch/risc-v/src/Makefile | 2 +- arch/sim/src/Makefile | 2 +- arch/sparc/src/Makefile | 2 +- arch/x86/src/Makefile | 2 +- arch/x86_64/src/Makefile | 2 +- arch/xtensa/src/Makefile | 2 +- arch/z16/src/Makefile | 2 +- arch/z80/src/Makefile | 2 +- tools/{apps-or-nuttx-Make.defs => Make.defs} | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) rename tools/{apps-or-nuttx-Make.defs => Make.defs} (98%) diff --git a/arch/arm/src/Makefile b/arch/arm/src/Makefile index ce348865a6d..a5d5a087d5e 100644 --- a/arch/arm/src/Makefile +++ b/arch/arm/src/Makefile @@ -18,7 +18,7 @@ # ############################################################################ -include $(TOPDIR)/tools/apps-or-nuttx-Make.defs +include $(TOPDIR)/tools/Make.defs include chip/Make.defs ifeq ($(CONFIG_ARCH_ARMV7A),y) # ARMv7-A diff --git a/arch/arm64/src/Makefile b/arch/arm64/src/Makefile index 8b04f6a946b..f0598f23098 100644 --- a/arch/arm64/src/Makefile +++ b/arch/arm64/src/Makefile @@ -18,7 +18,7 @@ # ############################################################################ -include $(TOPDIR)/tools/apps-or-nuttx-Make.defs +include $(TOPDIR)/tools/Make.defs include chip/Make.defs ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src diff --git a/arch/avr/src/Makefile b/arch/avr/src/Makefile index da50e27beea..f7233bc18e5 100644 --- a/arch/avr/src/Makefile +++ b/arch/avr/src/Makefile @@ -18,7 +18,7 @@ # ############################################################################ -include $(TOPDIR)/tools/apps-or-nuttx-Make.defs +include $(TOPDIR)/tools/Make.defs include chip/Make.defs ifeq ($(CONFIG_ARCH_FAMILY_AVR32),y) diff --git a/arch/ceva/src/Makefile b/arch/ceva/src/Makefile index cd0c91c132e..810443dcbae 100644 --- a/arch/ceva/src/Makefile +++ b/arch/ceva/src/Makefile @@ -18,7 +18,7 @@ # ############################################################################ -include $(TOPDIR)/tools/apps-or-nuttx-Make.defs +include $(TOPDIR)/tools/Make.defs -include chip$(DELIM)Make.defs ifeq ($(CONFIG_ARCH_XC5),y) diff --git a/arch/hc/src/Makefile b/arch/hc/src/Makefile index 607b1f72195..cbc12ffd00a 100644 --- a/arch/hc/src/Makefile +++ b/arch/hc/src/Makefile @@ -18,7 +18,7 @@ # ############################################################################ -include $(TOPDIR)/tools/apps-or-nuttx-Make.defs +include $(TOPDIR)/tools/Make.defs include chip/Make.defs ifeq ($(CONFIG_ARCH_HC12),y) diff --git a/arch/mips/src/Makefile b/arch/mips/src/Makefile index 722e4c272f0..8e1d0d74686 100644 --- a/arch/mips/src/Makefile +++ b/arch/mips/src/Makefile @@ -18,7 +18,7 @@ # ############################################################################ -include $(TOPDIR)/tools/apps-or-nuttx-Make.defs +include $(TOPDIR)/tools/Make.defs include chip/Make.defs ifeq ($(CONFIG_ARCH_MIPS),y) diff --git a/arch/misoc/src/Makefile b/arch/misoc/src/Makefile index 6773d6e8cd2..931fa12d1d4 100644 --- a/arch/misoc/src/Makefile +++ b/arch/misoc/src/Makefile @@ -18,7 +18,7 @@ # ############################################################################ -include $(TOPDIR)/tools/apps-or-nuttx-Make.defs +include $(TOPDIR)/tools/Make.defs include chip/Make.defs ifeq ($(CONFIG_ARCH_CHIP_LM32),y) diff --git a/arch/or1k/src/Makefile b/arch/or1k/src/Makefile index 48fcd3ff5ee..60eaff97016 100644 --- a/arch/or1k/src/Makefile +++ b/arch/or1k/src/Makefile @@ -18,7 +18,7 @@ # ############################################################################ -include $(TOPDIR)/tools/apps-or-nuttx-Make.defs +include $(TOPDIR)/tools/Make.defs include chip/Make.defs ifeq ($(CONFIG_ARCH_MOR1KX),y) # OpenRISC mor1kx diff --git a/arch/renesas/src/Makefile b/arch/renesas/src/Makefile index 13cbc84940a..f2811a63136 100644 --- a/arch/renesas/src/Makefile +++ b/arch/renesas/src/Makefile @@ -18,7 +18,7 @@ # ############################################################################ -include $(TOPDIR)/tools/apps-or-nuttx-Make.defs +include $(TOPDIR)/tools/Make.defs include chip/Make.defs ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src diff --git a/arch/risc-v/src/Makefile b/arch/risc-v/src/Makefile index c6197518500..37ab9c6a5c8 100644 --- a/arch/risc-v/src/Makefile +++ b/arch/risc-v/src/Makefile @@ -18,7 +18,7 @@ # ############################################################################ -include $(TOPDIR)/tools/apps-or-nuttx-Make.defs +include $(TOPDIR)/tools/Make.defs include chip/Make.defs ifeq ($(CONFIG_OPENSBI),y) include opensbi/Make.defs diff --git a/arch/sim/src/Makefile b/arch/sim/src/Makefile index 9e89a5faeb4..b7f552d6f29 100644 --- a/arch/sim/src/Makefile +++ b/arch/sim/src/Makefile @@ -18,7 +18,7 @@ # ############################################################################ -include $(TOPDIR)/tools/apps-or-nuttx-Make.defs +include $(TOPDIR)/tools/Make.defs ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src APPSDIR = $(TOPDIR)$(DELIM)$(CONFIG_APPS_DIR) diff --git a/arch/sparc/src/Makefile b/arch/sparc/src/Makefile index a6af15bc327..848a72ee2c5 100644 --- a/arch/sparc/src/Makefile +++ b/arch/sparc/src/Makefile @@ -18,7 +18,7 @@ # ############################################################################ -include $(TOPDIR)/tools/apps-or-nuttx-Make.defs +include $(TOPDIR)/tools/Make.defs -include chip/Make.defs ARCH_SUBDIR = sparc_v8 diff --git a/arch/x86/src/Makefile b/arch/x86/src/Makefile index 53e6d701b87..1340d16d21e 100644 --- a/arch/x86/src/Makefile +++ b/arch/x86/src/Makefile @@ -18,7 +18,7 @@ # ############################################################################ -include $(TOPDIR)/tools/apps-or-nuttx-Make.defs +include $(TOPDIR)/tools/Make.defs include chip/Make.defs ifeq ($(CONFIG_ARCH_I486),y) diff --git a/arch/x86_64/src/Makefile b/arch/x86_64/src/Makefile index 9039c91f937..6468b4cb0c0 100644 --- a/arch/x86_64/src/Makefile +++ b/arch/x86_64/src/Makefile @@ -18,7 +18,7 @@ # ############################################################################ -include $(TOPDIR)/tools/apps-or-nuttx-Make.defs +include $(TOPDIR)/tools/Make.defs include chip/Make.defs ifeq ($(CONFIG_ARCH_INTEL64),y) diff --git a/arch/xtensa/src/Makefile b/arch/xtensa/src/Makefile index ec83edd9b89..6973f022db9 100644 --- a/arch/xtensa/src/Makefile +++ b/arch/xtensa/src/Makefile @@ -18,7 +18,7 @@ # ############################################################################ -include $(TOPDIR)/tools/apps-or-nuttx-Make.defs +include $(TOPDIR)/tools/Make.defs include chip/Make.defs ifeq ($(CONFIG_ARCH_FAMILY_LX6),y) diff --git a/arch/z16/src/Makefile b/arch/z16/src/Makefile index 3456da90662..9abe2afb2c7 100644 --- a/arch/z16/src/Makefile +++ b/arch/z16/src/Makefile @@ -18,7 +18,7 @@ # ############################################################################ -include $(TOPDIR)/tools/apps-or-nuttx-Make.defs +include $(TOPDIR)/tools/Make.defs include chip/Make.defs COMPILER = ${shell basename "$(CC)"} diff --git a/arch/z80/src/Makefile b/arch/z80/src/Makefile index 3fe81ea10e1..a25d81e4f3e 100644 --- a/arch/z80/src/Makefile +++ b/arch/z80/src/Makefile @@ -20,7 +20,7 @@ # Makefile fragments -include $(TOPDIR)/tools/apps-or-nuttx-Make.defs +include $(TOPDIR)/tools/Make.defs include chip/Make.defs # Compiler-Dependent Make: SDCC, Clang, or ZiLOG ZDS-II diff --git a/tools/apps-or-nuttx-Make.defs b/tools/Make.defs similarity index 98% rename from tools/apps-or-nuttx-Make.defs rename to tools/Make.defs index dfce5e64ff8..d8899bbcd80 100644 --- a/tools/apps-or-nuttx-Make.defs +++ b/tools/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# apps-or-nuttx-Make.defs +# tools/Make.defs # # SPDX-License-Identifier: Apache-2.0 #