This is an automated email from the ASF dual-hosted git repository. gnutt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit edb0ce2d5afa8a0905bd4536ac39eaf1819dfc56 Author: Xiang Xiao <[email protected]> AuthorDate: Thu May 21 01:11:16 2020 +0800 build: Don't need use $(DELIM) in include statement Signed-off-by: Xiang Xiao <[email protected]> --- arch/arm/src/Makefile | 2 +- arch/arm/src/s32k1xx/Make.defs | 4 +- arch/or1k/src/Makefile | 2 +- binfmt/Makefile | 4 +- boards/arm/a1x/pcduino-a10/scripts/Make.defs | 2 +- boards/arm/cxd56xx/common/Makefile | 4 +- boards/arm/cxd56xx/drivers/Make.defs | 6 +- boards/arm/imx6/sabre-6quad/scripts/Make.defs | 2 +- .../lpc4088-devkit/configs/knsh/Make.defs | 2 +- .../lpc17xx_40xx/lpc4088-devkit/scripts/Make.defs | 2 +- .../lpc4088-quickstart/configs/knsh/Make.defs | 2 +- .../lpc4088-quickstart/scripts/Make.defs | 2 +- boards/arm/lpc17xx_40xx/lx_cpu/scripts/Make.defs | 2 +- .../lpc17xx_40xx/open1788/configs/knsh/Make.defs | 2 +- .../open1788/configs/knxterm/Make.defs | 2 +- boards/arm/lpc17xx_40xx/open1788/scripts/Make.defs | 2 +- .../lpc17xx_40xx/pnev5180b/configs/knsh/Make.defs | 2 +- .../arm/lpc17xx_40xx/pnev5180b/scripts/Make.defs | 2 +- boards/arm/sam34/sam3u-ek/configs/knsh/Make.defs | 2 +- boards/arm/sama5/sama5d2-xult/scripts/Make.defs | 2 +- .../arm/sama5/sama5d3-xplained/scripts/Make.defs | 2 +- boards/arm/sama5/sama5d3x-ek/scripts/Make.defs | 2 +- boards/arm/sama5/sama5d4-ek/configs/knsh/Make.defs | 2 +- boards/arm/sama5/sama5d4-ek/scripts/Make.defs | 2 +- boards/arm/stm32/common/Makefile | 4 +- .../stm32/olimex-stm32-p407/configs/kelf/Make.defs | 2 +- .../olimex-stm32-p407/configs/kmodule/Make.defs | 2 +- .../arm/tms570/launchxl-tms57004/scripts/Make.defs | 2 +- .../tms570/tms570ls31x-usb-kit/scripts/Make.defs | 2 +- drivers/Makefile | 70 +++++++++++----------- drivers/modem/Make.defs | 2 +- drivers/wireless/Make.defs | 10 ++-- drivers/wireless/ieee80211/Make.defs | 2 +- drivers/wireless/ieee802154/Make.defs | 6 +- drivers/wireless/lpwan/Make.defs | 2 +- drivers/wireless/spirit/Make.defs | 6 +- syscall/Makefile | 4 +- wireless/Makefile | 6 +- 38 files changed, 89 insertions(+), 89 deletions(-) diff --git a/arch/arm/src/Makefile b/arch/arm/src/Makefile index 3668095..8022a3f 100644 --- a/arch/arm/src/Makefile +++ b/arch/arm/src/Makefile @@ -35,7 +35,7 @@ ############################################################################ include $(TOPDIR)/Make.defs -include chip$(DELIM)Make.defs +include chip/Make.defs ifeq ($(CONFIG_ARCH_ARMV7A),y) # ARMv7-A ARCH_SUBDIR = armv7-a diff --git a/arch/arm/src/s32k1xx/Make.defs b/arch/arm/src/s32k1xx/Make.defs index b315304..64ff3fa 100644 --- a/arch/arm/src/s32k1xx/Make.defs +++ b/arch/arm/src/s32k1xx/Make.defs @@ -97,9 +97,9 @@ endif # Source files specific to the ARM CPU family and to the S32K1xx chip family ifeq ($(CONFIG_ARCH_CHIP_S32K11X),y) -include s32k1xx$(DELIM)s32k11x$(DELIM)Make.defs +include s32k1xx/s32k11x/Make.defs else -include s32k1xx$(DELIM)s32k14x$(DELIM)Make.defs +include s32k1xx/s32k14x/Make.defs endif # Make sure that the S32K1 common directory in included in the VPATH diff --git a/arch/or1k/src/Makefile b/arch/or1k/src/Makefile index 29ba153..5eceb1f 100644 --- a/arch/or1k/src/Makefile +++ b/arch/or1k/src/Makefile @@ -34,7 +34,7 @@ ############################################################################ include $(TOPDIR)/Make.defs -include chip$(DELIM)Make.defs +include chip/Make.defs ifeq ($(CONFIG_ARCH_MOR1KX),y) # OpenRISC mor1kx ARCH_SUBDIR = mor1kx diff --git a/binfmt/Makefile b/binfmt/Makefile index 538f85d..6111002 100644 --- a/binfmt/Makefile +++ b/binfmt/Makefile @@ -63,8 +63,8 @@ VPATH = SUBDIRS = DEPPATH = --dep-path . -include libnxflat$(DELIM)Make.defs -include libelf$(DELIM)Make.defs +include libnxflat/Make.defs +include libelf/Make.defs BINFMT_AOBJS = $(BINFMT_ASRCS:.S=$(OBJEXT)) BINFMT_COBJS = $(BINFMT_CSRCS:.c=$(OBJEXT)) diff --git a/boards/arm/a1x/pcduino-a10/scripts/Make.defs b/boards/arm/a1x/pcduino-a10/scripts/Make.defs index 5ba5b53..c117a58 100644 --- a/boards/arm/a1x/pcduino-a10/scripts/Make.defs +++ b/boards/arm/a1x/pcduino-a10/scripts/Make.defs @@ -35,7 +35,7 @@ include $(TOPDIR)/.config include $(TOPDIR)/tools/Config.mk -include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-a$(DELIM)Toolchain.defs +include $(TOPDIR)/arch/arm/src/armv7-a/Toolchain.defs LDSCRIPT = sdram.ld diff --git a/boards/arm/cxd56xx/common/Makefile b/boards/arm/cxd56xx/common/Makefile index 75dbfc8..0a78a28 100644 --- a/boards/arm/cxd56xx/common/Makefile +++ b/boards/arm/cxd56xx/common/Makefile @@ -34,8 +34,8 @@ include $(TOPDIR)/Make.defs -include board$(DELIM)Make.defs -include src$(DELIM)Make.defs +include board/Make.defs +include src/Make.defs DEPPATH += --dep-path board DEPPATH += --dep-path src diff --git a/boards/arm/cxd56xx/drivers/Make.defs b/boards/arm/cxd56xx/drivers/Make.defs index 767831f..55b5003 100644 --- a/boards/arm/cxd56xx/drivers/Make.defs +++ b/boards/arm/cxd56xx/drivers/Make.defs @@ -33,6 +33,6 @@ # ############################################################################ -include platform$(DELIM)audio$(DELIM)Make.defs -include platform$(DELIM)sensors$(DELIM)Make.defs -include platform$(DELIM)camera$(DELIM)Make.defs +include platform/audio/Make.defs +include platform/sensors/Make.defs +include platform/camera/Make.defs diff --git a/boards/arm/imx6/sabre-6quad/scripts/Make.defs b/boards/arm/imx6/sabre-6quad/scripts/Make.defs index 652083f..c014613 100644 --- a/boards/arm/imx6/sabre-6quad/scripts/Make.defs +++ b/boards/arm/imx6/sabre-6quad/scripts/Make.defs @@ -35,7 +35,7 @@ include $(TOPDIR)/.config include $(TOPDIR)/tools/Config.mk -include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-a$(DELIM)Toolchain.defs +include $(TOPDIR)/arch/arm/src/armv7-a/Toolchain.defs LDSCRIPT = dramboot.ld diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/knsh/Make.defs b/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/knsh/Make.defs index 4f91d77..71a3809 100644 --- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/knsh/Make.defs +++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/knsh/Make.defs @@ -35,7 +35,7 @@ include $(TOPDIR)/.config include $(TOPDIR)/tools/Config.mk -include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs +include $(TOPDIR)/arch/arm/src/armv7-m/Toolchain.defs ifeq ($(CONFIG_CYGWIN_WINTOOL),y) # Windows-native toolchains diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/scripts/Make.defs b/boards/arm/lpc17xx_40xx/lpc4088-devkit/scripts/Make.defs index 1574dba..b1374a0 100644 --- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/scripts/Make.defs +++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/scripts/Make.defs @@ -35,7 +35,7 @@ include $(TOPDIR)/.config include $(TOPDIR)/tools/Config.mk -include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs +include $(TOPDIR)/arch/arm/src/armv7-m/Toolchain.defs ifeq ($(CONFIG_CYGWIN_WINTOOL),y) # Windows-native toolchains diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/knsh/Make.defs b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/knsh/Make.defs index 7855a20..f7f4885 100644 --- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/knsh/Make.defs +++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/knsh/Make.defs @@ -35,7 +35,7 @@ include $(TOPDIR)/.config include $(TOPDIR)/tools/Config.mk -include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs +include $(TOPDIR)/arch/arm/src/armv7-m/Toolchain.defs ifeq ($(CONFIG_CYGWIN_WINTOOL),y) # Windows-native toolchains diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/scripts/Make.defs b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/scripts/Make.defs index 91262d6..8846c53 100644 --- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/scripts/Make.defs +++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/scripts/Make.defs @@ -35,7 +35,7 @@ include $(TOPDIR)/.config include $(TOPDIR)/tools/Config.mk -include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs +include $(TOPDIR)/arch/arm/src/armv7-m/Toolchain.defs ifeq ($(CONFIG_CYGWIN_WINTOOL),y) # Windows-native toolchains diff --git a/boards/arm/lpc17xx_40xx/lx_cpu/scripts/Make.defs b/boards/arm/lpc17xx_40xx/lx_cpu/scripts/Make.defs index a493286..0c7a4f6 100644 --- a/boards/arm/lpc17xx_40xx/lx_cpu/scripts/Make.defs +++ b/boards/arm/lpc17xx_40xx/lx_cpu/scripts/Make.defs @@ -35,7 +35,7 @@ include $(TOPDIR)/.config include $(TOPDIR)/tools/Config.mk -include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs +include $(TOPDIR)/arch/arm/src/armv7-m/Toolchain.defs # Setup for the kind of memory that we are executing from diff --git a/boards/arm/lpc17xx_40xx/open1788/configs/knsh/Make.defs b/boards/arm/lpc17xx_40xx/open1788/configs/knsh/Make.defs index 9e4b029..33e54d2 100644 --- a/boards/arm/lpc17xx_40xx/open1788/configs/knsh/Make.defs +++ b/boards/arm/lpc17xx_40xx/open1788/configs/knsh/Make.defs @@ -35,7 +35,7 @@ include $(TOPDIR)/.config include $(TOPDIR)/tools/Config.mk -include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs +include $(TOPDIR)/arch/arm/src/armv7-m/Toolchain.defs ifeq ($(CONFIG_CYGWIN_WINTOOL),y) # Windows-native toolchains diff --git a/boards/arm/lpc17xx_40xx/open1788/configs/knxterm/Make.defs b/boards/arm/lpc17xx_40xx/open1788/configs/knxterm/Make.defs index 69f2022..d6fda80 100644 --- a/boards/arm/lpc17xx_40xx/open1788/configs/knxterm/Make.defs +++ b/boards/arm/lpc17xx_40xx/open1788/configs/knxterm/Make.defs @@ -35,7 +35,7 @@ include $(TOPDIR)/.config include $(TOPDIR)/tools/Config.mk -include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs +include $(TOPDIR)/arch/arm/src/armv7-m/Toolchain.defs ifeq ($(CONFIG_CYGWIN_WINTOOL),y) # Windows-native toolchains diff --git a/boards/arm/lpc17xx_40xx/open1788/scripts/Make.defs b/boards/arm/lpc17xx_40xx/open1788/scripts/Make.defs index acb4b91..f988c35 100644 --- a/boards/arm/lpc17xx_40xx/open1788/scripts/Make.defs +++ b/boards/arm/lpc17xx_40xx/open1788/scripts/Make.defs @@ -35,7 +35,7 @@ include $(TOPDIR)/.config include $(TOPDIR)/tools/Config.mk -include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs +include $(TOPDIR)/arch/arm/src/armv7-m/Toolchain.defs ifeq ($(CONFIG_CYGWIN_WINTOOL),y) # Windows-native toolchains diff --git a/boards/arm/lpc17xx_40xx/pnev5180b/configs/knsh/Make.defs b/boards/arm/lpc17xx_40xx/pnev5180b/configs/knsh/Make.defs index 868b3f2..df29620 100644 --- a/boards/arm/lpc17xx_40xx/pnev5180b/configs/knsh/Make.defs +++ b/boards/arm/lpc17xx_40xx/pnev5180b/configs/knsh/Make.defs @@ -40,7 +40,7 @@ include $(TOPDIR)/.config include $(TOPDIR)/tools/Config.mk -include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs +include $(TOPDIR)/arch/arm/src/armv7-m/Toolchain.defs ifeq ($(CONFIG_CYGWIN_WINTOOL),y) # Windows-native toolchains diff --git a/boards/arm/lpc17xx_40xx/pnev5180b/scripts/Make.defs b/boards/arm/lpc17xx_40xx/pnev5180b/scripts/Make.defs index 354b89e..e838aed 100644 --- a/boards/arm/lpc17xx_40xx/pnev5180b/scripts/Make.defs +++ b/boards/arm/lpc17xx_40xx/pnev5180b/scripts/Make.defs @@ -41,7 +41,7 @@ include $(TOPDIR)/.config include $(TOPDIR)/tools/Config.mk -include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs +include $(TOPDIR)/arch/arm/src/armv7-m/Toolchain.defs ifeq ($(CONFIG_CYGWIN_WINTOOL),y) # Windows-native toolchains diff --git a/boards/arm/sam34/sam3u-ek/configs/knsh/Make.defs b/boards/arm/sam34/sam3u-ek/configs/knsh/Make.defs index 33baf5b..2efeeca 100644 --- a/boards/arm/sam34/sam3u-ek/configs/knsh/Make.defs +++ b/boards/arm/sam34/sam3u-ek/configs/knsh/Make.defs @@ -35,7 +35,7 @@ include $(TOPDIR)/.config include $(TOPDIR)/tools/Config.mk -include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs +include $(TOPDIR)/arch/arm/src/armv7-m/Toolchain.defs ifeq ($(CONFIG_CYGWIN_WINTOOL),y) # Windows-native toolchains diff --git a/boards/arm/sama5/sama5d2-xult/scripts/Make.defs b/boards/arm/sama5/sama5d2-xult/scripts/Make.defs index b73d910..e9f83f4 100644 --- a/boards/arm/sama5/sama5d2-xult/scripts/Make.defs +++ b/boards/arm/sama5/sama5d2-xult/scripts/Make.defs @@ -35,7 +35,7 @@ include $(TOPDIR)/.config include $(TOPDIR)/tools/Config.mk -include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-a$(DELIM)Toolchain.defs +include $(TOPDIR)/arch/arm/src/armv7-a/Toolchain.defs ifeq ($(CONFIG_SAMA5_BOOT_ISRAM),y) LDSCRIPT = isram.ld diff --git a/boards/arm/sama5/sama5d3-xplained/scripts/Make.defs b/boards/arm/sama5/sama5d3-xplained/scripts/Make.defs index db6ba4d..00752a1 100644 --- a/boards/arm/sama5/sama5d3-xplained/scripts/Make.defs +++ b/boards/arm/sama5/sama5d3-xplained/scripts/Make.defs @@ -35,7 +35,7 @@ include $(TOPDIR)/.config include $(TOPDIR)/tools/Config.mk -include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-a$(DELIM)Toolchain.defs +include $(TOPDIR)/arch/arm/src/armv7-a/Toolchain.defs ifeq ($(CONFIG_SAMA5_BOOT_ISRAM),y) LDSCRIPT = isram.ld diff --git a/boards/arm/sama5/sama5d3x-ek/scripts/Make.defs b/boards/arm/sama5/sama5d3x-ek/scripts/Make.defs index 1658661..15fd290 100644 --- a/boards/arm/sama5/sama5d3x-ek/scripts/Make.defs +++ b/boards/arm/sama5/sama5d3x-ek/scripts/Make.defs @@ -35,7 +35,7 @@ include $(TOPDIR)/.config include $(TOPDIR)/tools/Config.mk -include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-a$(DELIM)Toolchain.defs +include $(TOPDIR)/arch/arm/src/armv7-a/Toolchain.defs ifeq ($(CONFIG_SAMA5_BOOT_ISRAM),y) LDSCRIPT = isram.ld diff --git a/boards/arm/sama5/sama5d4-ek/configs/knsh/Make.defs b/boards/arm/sama5/sama5d4-ek/configs/knsh/Make.defs index c46f62e..e74f1cb 100644 --- a/boards/arm/sama5/sama5d4-ek/configs/knsh/Make.defs +++ b/boards/arm/sama5/sama5d4-ek/configs/knsh/Make.defs @@ -35,7 +35,7 @@ include $(TOPDIR)/.config include $(TOPDIR)/tools/Config.mk -include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-a$(DELIM)Toolchain.defs +include $(TOPDIR)/arch/arm/src/armv7-a/Toolchain.defs ifeq ($(CONFIG_SAMA5_BOOT_ISRAM),y) LDSCRIPT = isram.ld diff --git a/boards/arm/sama5/sama5d4-ek/scripts/Make.defs b/boards/arm/sama5/sama5d4-ek/scripts/Make.defs index 6d36531..59ccff3 100644 --- a/boards/arm/sama5/sama5d4-ek/scripts/Make.defs +++ b/boards/arm/sama5/sama5d4-ek/scripts/Make.defs @@ -35,7 +35,7 @@ include $(TOPDIR)/.config include $(TOPDIR)/tools/Config.mk -include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-a$(DELIM)Toolchain.defs +include $(TOPDIR)/arch/arm/src/armv7-a/Toolchain.defs ifeq ($(CONFIG_SAMA5_BOOT_ISRAM),y) LDSCRIPT = isram.ld diff --git a/boards/arm/stm32/common/Makefile b/boards/arm/stm32/common/Makefile index 9b502f3..18f3dad 100644 --- a/boards/arm/stm32/common/Makefile +++ b/boards/arm/stm32/common/Makefile @@ -20,8 +20,8 @@ include $(TOPDIR)/Make.defs -include board$(DELIM)Make.defs -include src$(DELIM)Make.defs +include board/Make.defs +include src/Make.defs DEPPATH += --dep-path board DEPPATH += --dep-path src diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/kelf/Make.defs b/boards/arm/stm32/olimex-stm32-p407/configs/kelf/Make.defs index 118e505..d2aa4d6 100644 --- a/boards/arm/stm32/olimex-stm32-p407/configs/kelf/Make.defs +++ b/boards/arm/stm32/olimex-stm32-p407/configs/kelf/Make.defs @@ -35,7 +35,7 @@ include $(TOPDIR)/.config include $(TOPDIR)/tools/Config.mk -include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs +include $(TOPDIR)/arch/arm/src/armv7-m/Toolchain.defs ifeq ($(CONFIG_CYGWIN_WINTOOL),y) # Windows-native toolchains diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/kmodule/Make.defs b/boards/arm/stm32/olimex-stm32-p407/configs/kmodule/Make.defs index 50a7bee..cbc9b3e 100644 --- a/boards/arm/stm32/olimex-stm32-p407/configs/kmodule/Make.defs +++ b/boards/arm/stm32/olimex-stm32-p407/configs/kmodule/Make.defs @@ -35,7 +35,7 @@ include $(TOPDIR)/.config include $(TOPDIR)/tools/Config.mk -include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-m$(DELIM)Toolchain.defs +include $(TOPDIR)/arch/arm/src/armv7-m/Toolchain.defs ifeq ($(CONFIG_CYGWIN_WINTOOL),y) # Windows-native toolchains diff --git a/boards/arm/tms570/launchxl-tms57004/scripts/Make.defs b/boards/arm/tms570/launchxl-tms57004/scripts/Make.defs index f06c8ec..a485f2c 100644 --- a/boards/arm/tms570/launchxl-tms57004/scripts/Make.defs +++ b/boards/arm/tms570/launchxl-tms57004/scripts/Make.defs @@ -35,7 +35,7 @@ include $(TOPDIR)/.config include $(TOPDIR)/tools/Config.mk -include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-r$(DELIM)Toolchain.defs +include $(TOPDIR)/arch/arm/src/armv7-r/Toolchain.defs LDSCRIPT = flash-sram.ld diff --git a/boards/arm/tms570/tms570ls31x-usb-kit/scripts/Make.defs b/boards/arm/tms570/tms570ls31x-usb-kit/scripts/Make.defs index e7774cf..ba1660a 100644 --- a/boards/arm/tms570/tms570ls31x-usb-kit/scripts/Make.defs +++ b/boards/arm/tms570/tms570ls31x-usb-kit/scripts/Make.defs @@ -35,7 +35,7 @@ include $(TOPDIR)/.config include $(TOPDIR)/tools/Config.mk -include $(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-r$(DELIM)Toolchain.defs +include $(TOPDIR)/arch/arm/src/armv7-r/Toolchain.defs LDSCRIPT = flash-sram.ld diff --git a/drivers/Makefile b/drivers/Makefile index b49f043..fd63b1d 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -44,43 +44,43 @@ VPATH = . # files to the source file list, add its DEPPATH info, and will add # the appropriate paths to the VPATH variable -include analog$(DELIM)Make.defs -include audio$(DELIM)Make.defs -include bch$(DELIM)Make.defs -include can$(DELIM)Make.defs -include crypto$(DELIM)Make.defs -include i2c$(DELIM)Make.defs -include i2s$(DELIM)Make.defs -include input$(DELIM)Make.defs -include ioexpander$(DELIM)Make.defs -include lcd$(DELIM)Make.defs -include leds$(DELIM)Make.defs -include loop$(DELIM)Make.defs -include mmcsd$(DELIM)Make.defs -include modem$(DELIM)Make.defs -include mtd$(DELIM)Make.defs -include eeprom$(DELIM)Make.defs -include net$(DELIM)Make.defs -include pipes$(DELIM)Make.defs -include power$(DELIM)Make.defs -include rptun$(DELIM)Make.defs -include sensors$(DELIM)Make.defs -include serial$(DELIM)Make.defs -include spi$(DELIM)Make.defs -include syslog$(DELIM)Make.defs -include timers$(DELIM)Make.defs -include usbdev$(DELIM)Make.defs -include usbhost$(DELIM)Make.defs -include usbmisc$(DELIM)Make.defs -include usbmonitor$(DELIM)Make.defs -include video$(DELIM)Make.defs -include wireless$(DELIM)Make.defs -include contactless$(DELIM)Make.defs -include 1wire$(DELIM)Make.defs -include rf$(DELIM)Make.defs +include analog/Make.defs +include audio/Make.defs +include bch/Make.defs +include can/Make.defs +include crypto/Make.defs +include i2c/Make.defs +include i2s/Make.defs +include input/Make.defs +include ioexpander/Make.defs +include lcd/Make.defs +include leds/Make.defs +include loop/Make.defs +include mmcsd/Make.defs +include modem/Make.defs +include mtd/Make.defs +include eeprom/Make.defs +include net/Make.defs +include pipes/Make.defs +include power/Make.defs +include rptun/Make.defs +include sensors/Make.defs +include serial/Make.defs +include spi/Make.defs +include syslog/Make.defs +include timers/Make.defs +include usbdev/Make.defs +include usbhost/Make.defs +include usbmisc/Make.defs +include usbmonitor/Make.defs +include video/Make.defs +include wireless/Make.defs +include contactless/Make.defs +include 1wire/Make.defs +include rf/Make.defs ifeq ($(CONFIG_SPECIFIC_DRIVERS),y) -include platform$(DELIM)Make.defs +include platform/Make.defs endif ifeq ($(CONFIG_DEV_SIMPLE_ADDRENV),y) diff --git a/drivers/modem/Make.defs b/drivers/modem/Make.defs index ad2215e..b6d6bd7 100644 --- a/drivers/modem/Make.defs +++ b/drivers/modem/Make.defs @@ -39,7 +39,7 @@ ifeq ($(CONFIG_MODEM_U_BLOX),y) CSRCS += u-blox.c endif -include modem$(DELIM)altair$(DELIM)Make.defs +include modem/altair/Make.defs # Include modem driver build support diff --git a/drivers/wireless/Make.defs b/drivers/wireless/Make.defs index 7b30e60..1e5b271 100644 --- a/drivers/wireless/Make.defs +++ b/drivers/wireless/Make.defs @@ -38,25 +38,25 @@ ifeq ($(CONFIG_DRIVERS_WIRELESS),y) # Include IEEE 802.15.4 support ifeq ($(CONFIG_DRIVERS_IEEE802154),y) -include wireless$(DELIM)ieee802154$(DELIM)Make.defs +include wireless/ieee802154/Make.defs endif # Include IEEE 802.11 support ifeq ($(CONFIG_DRIVERS_IEEE80211),y) -include wireless$(DELIM)ieee80211$(DELIM)Make.defs +include wireless/ieee80211/Make.defs endif # Include Bluetooth support ifeq ($(CONFIG_DRIVERS_BLUETOOTH),y) -include wireless$(DELIM)bluetooth$(DELIM)Make.defs +include wireless/bluetooth/Make.defs endif # Include LPWAN support ifeq ($(CONFIG_DRIVERS_LPWAN),y) -include wireless$(DELIM)lpwan$(DELIM)Make.defs +include wireless/lpwan/Make.defs endif # Include wireless drivers @@ -71,7 +71,7 @@ CSRCS += gs2200m.c endif ifeq ($(CONFIG_WL_SPIRIT),y) -include wireless$(DELIM)spirit$(DELIM)Make.defs +include wireless/spirit/Make.defs endif ifeq ($(CONFIG_WL_NRF24L01),y) diff --git a/drivers/wireless/ieee80211/Make.defs b/drivers/wireless/ieee80211/Make.defs index e3e5f49..1781e3d 100644 --- a/drivers/wireless/ieee80211/Make.defs +++ b/drivers/wireless/ieee80211/Make.defs @@ -40,6 +40,6 @@ ifeq ($(CONFIG_DRIVERS_IEEE80211),y) # Include IEEE 802.11 drivers into the build -include wireless$(DELIM)ieee80211$(DELIM)bcm43xxx$(DELIM)Make.defs +include wireless/ieee80211/bcm43xxx/Make.defs endif # CONFIG_DRIVERS_IEEE80211 diff --git a/drivers/wireless/ieee802154/Make.defs b/drivers/wireless/ieee802154/Make.defs index 3eaa91c..d273694 100644 --- a/drivers/wireless/ieee802154/Make.defs +++ b/drivers/wireless/ieee802154/Make.defs @@ -41,9 +41,9 @@ ifeq ($(CONFIG_DRIVERS_IEEE802154),y) # Include IEEE 802.15.4 drivers into the build -include wireless$(DELIM)ieee802154$(DELIM)mrf24j40$(DELIM)Make.defs -include wireless$(DELIM)ieee802154$(DELIM)at86rf23x$(DELIM)Make.defs -include wireless$(DELIM)ieee802154$(DELIM)xbee$(DELIM)Make.defs +include wireless/ieee802154/mrf24j40/Make.defs +include wireless/ieee802154/at86rf23x/Make.defs +include wireless/ieee802154/xbee/Make.defs # Include common IEEE 802.15.4 build support diff --git a/drivers/wireless/lpwan/Make.defs b/drivers/wireless/lpwan/Make.defs index 90563b7..7e0a515 100644 --- a/drivers/wireless/lpwan/Make.defs +++ b/drivers/wireless/lpwan/Make.defs @@ -37,6 +37,6 @@ ifeq ($(CONFIG_DRIVERS_LPWAN),y) -include wireless$(DELIM)lpwan$(DELIM)sx127x$(DELIM)Make.defs +include wireless/lpwan/sx127x/Make.defs endif # CONFIG_DRIVERS_LPWAN diff --git a/drivers/wireless/spirit/Make.defs b/drivers/wireless/spirit/Make.defs index 8962b30..592d8a2 100644 --- a/drivers/wireless/spirit/Make.defs +++ b/drivers/wireless/spirit/Make.defs @@ -37,8 +37,8 @@ ifeq ($(CONFIG_WL_SPIRIT),y) # Include Spirit library support -include wireless$(DELIM)spirit$(DELIM)lib$(DELIM)Make.defs -include wireless$(DELIM)spirit$(DELIM)include$(DELIM)Make.defs -include wireless$(DELIM)spirit$(DELIM)drivers$(DELIM)Make.defs +include wireless/spirit/lib/Make.defs +include wireless/spirit/include/Make.defs +include wireless/spirit/drivers/Make.defs endif diff --git a/syscall/Makefile b/syscall/Makefile index 8e04d3e..c7da7cb 100644 --- a/syscall/Makefile +++ b/syscall/Makefile @@ -35,8 +35,8 @@ include $(TOPDIR)/Make.defs -include proxies$(DELIM)Make.defs -include stubs$(DELIM)Make.defs +include proxies/Make.defs +include stubs/Make.defs MKSYSCALL = "$(TOPDIR)$(DELIM)tools$(DELIM)mksyscall$(HOSTEXEEXT)" CSVFILE = "$(TOPDIR)$(DELIM)syscall$(DELIM)syscall.csv" diff --git a/wireless/Makefile b/wireless/Makefile index b613f30..ddb3027 100644 --- a/wireless/Makefile +++ b/wireless/Makefile @@ -45,9 +45,9 @@ VPATH = . # Add IEEE 802.15.4 files to the build -include bluetooth$(DELIM)Make.defs -include ieee802154$(DELIM)Make.defs -include pktradio$(DELIM)Make.defs +include bluetooth/Make.defs +include ieee802154/Make.defs +include pktradio/Make.defs AOBJS = $(ASRCS:.S=$(OBJEXT)) COBJS = $(CSRCS:.c=$(OBJEXT))
