Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-22 22:20:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

build: Move .config check to the top Makefile

Browse Source 
remove the workaround to handle the inexistence of .config/Make.defs

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao
2020-05-19 03:42:11 +08:00
committed by Abdelatif Guettouche
parent 3c622db780
commit 1a95cce1a3
279 changed files with 305 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+10 -1
View File
@@ -41,9 +41,18 @@
# make -f tools/Makefile.win
#
-include .config
ifeq ($(wildcard .config),)
.DEFAULT:
@echo "Nuttx has not been configured:"
@echo " tools/configure.sh <target>"
clean distclean:
@:
else
include .config
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
include tools/Makefile.win
else
include tools/Makefile.unix
endif
endif
arch/arm/src/Makefile
+2 -2
View File
@@ -34,8 +34,8 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
-include chip$(DELIM)Make.defs
include $(TOPDIR)/Make.defs
include chip$(DELIM)Make.defs
ifeq ($(CONFIG_ARCH_ARMV7A),y) # ARMv7-A
ARCH_SUBDIR = armv7-a
arch/arm/src/lpc43xx/Make.defs
+1 -1
View File
@@ -196,4 +196,4 @@ CHIP_CSRCS += lpc43_usb0dev.c
endif
endif
-include chip/spifi/src/Make.defs
include chip/spifi/src/Make.defs
arch/avr/src/Makefile
+2 -2
View File
@@ -33,8 +33,8 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
-include chip/Make.defs
include $(TOPDIR)/Make.defs
include chip/Make.defs
ifeq ($(CONFIG_ARCH_FAMILY_AVR32),y)
ARCH_SUBDIR = avr32
arch/hc/src/Makefile
+2 -2
View File
@@ -33,8 +33,8 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
-include chip/Make.defs
include $(TOPDIR)/Make.defs
include chip/Make.defs
ifeq ($(CONFIG_ARCH_HC12),y)
ARCH_SUBDIR = hc12
arch/mips/src/Makefile
+2 -2
View File
@@ -33,8 +33,8 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
-include chip/Make.defs
include $(TOPDIR)/Make.defs
include chip/Make.defs
ifeq ($(CONFIG_ARCH_MIPS),y)
ARCH_SUBDIR = mips32
arch/misoc/src/Makefile
+2 -2
View File
@@ -33,8 +33,8 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
-include chip/Make.defs
include $(TOPDIR)/Make.defs
include chip/Make.defs
ifeq ($(CONFIG_ARCH_CHIP_LM32),y)
ARCH_SUBDIR = lm32
arch/or1k/src/Makefile
+2 -2
View File
@@ -33,8 +33,8 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
-include chip$(DELIM)Make.defs
include $(TOPDIR)/Make.defs
include chip$(DELIM)Make.defs
ifeq ($(CONFIG_ARCH_MOR1KX),y) # OpenRISC mor1kx
ARCH_SUBDIR = mor1kx
arch/renesas/src/Makefile
+2 -2
View File
@@ -33,8 +33,8 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
-include chip/Make.defs
include $(TOPDIR)/Make.defs
include chip/Make.defs
CPPFLAGS += $(EXTRAFLAGS)
CFLAGS += $(EXTRAFLAGS)
arch/sim/src/Makefile
+1 -1
View File
@@ -34,7 +34,7 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
include $(TOPDIR)/Make.defs
ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
CPPFLAGS += -I$(ARCH_SRCDIR)/chip -I$(TOPDIR)/sched $(EXTRAFLAGS)
arch/x86/src/Makefile
+2 -2
View File
@@ -33,8 +33,8 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
-include chip/Make.defs
include $(TOPDIR)/Make.defs
include chip/Make.defs
ifeq ($(CONFIG_ARCH_I486),y)
ARCH_SUBDIR = i486
arch/x86_64/src/Makefile
+2 -2
View File
@@ -18,8 +18,8 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
-include chip/Make.defs
include $(TOPDIR)/Make.defs
include chip/Make.defs
ifeq ($(CONFIG_ARCH_INTEL64),y)
ARCH_SUBDIR = intel64
arch/xtensa/src/Makefile
+2 -2
View File
@@ -33,8 +33,8 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
-include chip/Make.defs
include $(TOPDIR)/Make.defs
include chip/Make.defs
ifeq ($(CONFIG_ARCH_FAMILY_LX6),y)
ARCH_SUBDIR = lx6
arch/z16/src/Makefile
+2 -2
View File
@@ -18,8 +18,8 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
-include chip/Make.defs
include $(TOPDIR)/Make.defs
include chip/Make.defs
COMPILER = ${shell basename "$(CC)"}
ARCHSRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
arch/z80/src/Makefile
+3 -3
View File
@@ -35,9 +35,9 @@
# Makefile fragments
-include $(TOPDIR)/Make.defs
-include chip/Make.defs
-include board/Make.defs
include $(TOPDIR)/Make.defs
include chip/Make.defs
include board/Make.defs
# Compiler-Dependent Make: SDCC or ZiLOG ZDS-II
arch/z80/src/Makefile.zdsiil
+1 -1
View File
@@ -34,7 +34,7 @@
#
############################################################################
-include $(TOPDIR)\Make.defs
include $(TOPDIR)\Make.defs
############################################################################
# Tools
arch/z80/src/Makefile.zdsiiw
+1 -1
View File
@@ -34,7 +34,7 @@
#
############################################################################
-include $(TOPDIR)\Make.defs
include $(TOPDIR)\Make.defs
# Tools
audio/Makefile
+1 -2
View File
@@ -33,8 +33,7 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
DELIM ?= $(strip /)
include $(TOPDIR)/Make.defs
DEPPATH = --dep-path .
ASRCS =
binfmt/Makefile
+1 -2
View File
@@ -34,8 +34,7 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
DELIM ?= $(strip /)
include $(TOPDIR)/Make.defs
# Basic BINFMT source files
boards/Board.mk
+1 -1
View File
@@ -35,7 +35,7 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
include $(TOPDIR)/Make.defs
ifneq ($(RCSRCS)$(RCRAWS),)
ETCDIR := etctmp
boards/Makefile
+1 -1
View File
@@ -33,7 +33,7 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
include $(TOPDIR)/Make.defs
# Determine if there is a Kconfig file for any custom board configuration
boards/arm/a1x/pcduino-a10/src/Makefile
+1 -1
View File
@@ -33,7 +33,7 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
include $(TOPDIR)/Make.defs
ASRCS =
CSRCS = a1x_boot.c a1x_bringup.c a1x_leds.c
boards/arm/am335x/beaglebone-black/src/Makefile
+1 -1
View File
@@ -35,7 +35,7 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
include $(TOPDIR)/Make.defs
ASRCS =
CSRCS = am335x_boot.c am335x_bringup.c am335x_leds.c
boards/arm/c5471/c5471evm/src/Makefile
+1 -1
View File
@@ -33,7 +33,7 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
include $(TOPDIR)/Make.defs
ASRCS =
CSRCS = c5471_leds.c
boards/arm/cxd56xx/common/Makefile
+1 -1
View File
@@ -32,7 +32,7 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
include $(TOPDIR)/Make.defs
include board$(DELIM)Make.defs
include src$(DELIM)Make.defs
boards/arm/dm320/ntosd-dm320/src/Makefile
+1 -1
View File
@@ -33,7 +33,7 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
include $(TOPDIR)/Make.defs
ASRCS =
CSRCS = dm320_leds.c dm320_network.c
boards/arm/efm32/efm32-g8xx-stk/src/Makefile
+1 -1
View File
@@ -33,7 +33,7 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
include $(TOPDIR)/Make.defs
ASRCS =
CSRCS = efm32_boot.c
boards/arm/efm32/efm32gg-stk3700/src/Makefile
+1 -1
View File
@@ -33,7 +33,7 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
include $(TOPDIR)/Make.defs
ASRCS =
CSRCS = efm32_boot.c
boards/arm/efm32/olimex-efm32g880f128-stk/src/Makefile
+1 -1
View File
@@ -33,7 +33,7 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
include $(TOPDIR)/Make.defs
ASRCS =
CSRCS = efm32_boot.c
boards/arm/imx6/sabre-6quad/src/Makefile
+1 -1
View File
@@ -33,7 +33,7 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
include $(TOPDIR)/Make.defs
ASRCS =
CSRCS = imx_boardinit.c imx_bringup.c
boards/arm/imxrt/imxrt1020-evk/src/Makefile
+1 -1
View File
@@ -33,7 +33,7 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
include $(TOPDIR)/Make.defs
ASRCS =
CSRCS = imxrt_flexspi_nor_flash.c imxrt_boot.c imxrt_flexspi_nor_boot.c
boards/arm/imxrt/imxrt1050-evk/kernel/Makefile
+1 -1
View File
@@ -33,7 +33,7 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
include $(TOPDIR)/Make.defs
# This is the directory for the board-specific header files
boards/arm/imxrt/imxrt1050-evk/src/Makefile
+1 -1
View File
@@ -33,7 +33,7 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
include $(TOPDIR)/Make.defs
ASRCS =
CSRCS = imxrt_boot.c imxrt_flexspi_nor_boot.c imxrt_flexspi_nor_flash.c
boards/arm/imxrt/imxrt1060-evk/kernel/Makefile
+1 -1
View File
@@ -33,7 +33,7 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
include $(TOPDIR)/Make.defs
# This is the directory for the board-specific header files
boards/arm/imxrt/imxrt1060-evk/src/Makefile
+1 -1
View File
@@ -33,7 +33,7 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
include $(TOPDIR)/Make.defs
ASRCS =
CSRCS = imxrt_boot.c imxrt_flexspi_nor_boot.c imxrt_flexspi_nor_flash.c
boards/arm/kinetis/freedom-k28f/src/Makefile
+1 -1
View File
@@ -33,7 +33,7 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
include $(TOPDIR)/Make.defs
ASRCS =
CSRCS = k28_boot.c k28_bringup.c k28_spi.c k28_i2c.c
boards/arm/kinetis/freedom-k64f/src/Makefile
+1 -1
View File
@@ -33,7 +33,7 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
include $(TOPDIR)/Make.defs
ASRCS =
CSRCS = k64_boot.c k64_spi.c
boards/arm/kinetis/freedom-k66f/src/Makefile
+1 -1
View File
@@ -34,7 +34,7 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
include $(TOPDIR)/Make.defs
ASRCS =
CSRCS = k66_boot.c k66_spi.c
boards/arm/kinetis/kwikstik-k40/src/Makefile
+1 -1
View File
@@ -33,7 +33,7 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
include $(TOPDIR)/Make.defs
ASRCS =
CSRCS = k40_boot.c k40_lcd.c k40_spi.c
boards/arm/kinetis/teensy-3.x/src/Makefile
+1 -1
View File
@@ -33,7 +33,7 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
include $(TOPDIR)/Make.defs
ASRCS =
CSRCS = k20_boot.c k20_spi.c k20_i2c.c
boards/arm/kinetis/twr-k60n512/src/Makefile
+1 -1
View File
@@ -33,7 +33,7 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
include $(TOPDIR)/Make.defs
ASRCS =
CSRCS = k60_boot.c k60_spi.c
boards/arm/kinetis/twr-k64f120m/src/Makefile
+1 -1
View File
@@ -33,7 +33,7 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
include $(TOPDIR)/Make.defs
ASRCS =
#CSRCS = k64_boot.c k64_spi.c
boards/arm/kl/freedom-kl25z/src/Makefile
+1 -1
View File
@@ -33,7 +33,7 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
include $(TOPDIR)/Make.defs
ASRCS =
CSRCS = kl_boardinitialize.c
boards/arm/kl/freedom-kl26z/src/Makefile
+1 -1
View File
@@ -33,7 +33,7 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
include $(TOPDIR)/Make.defs
ASRCS =
CSRCS = kl_boardinitialize.c
boards/arm/kl/teensy-lc/src/Makefile
+1 -1
View File
@@ -33,7 +33,7 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
include $(TOPDIR)/Make.defs
ASRCS =
CSRCS = kl_boardinitialize.c
boards/arm/lc823450/lc823450-xgevk/kernel/Makefile
+1 -1
View File
@@ -35,7 +35,7 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
include $(TOPDIR)/Make.defs
# This is the directory for the board-specific header files
boards/arm/lc823450/lc823450-xgevk/src/Makefile
+1 -1
View File
@@ -33,7 +33,7 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
include $(TOPDIR)/Make.defs
ASRCS =
CSRCS = lc823450_boot.c lc823450_mux.c
boards/arm/lpc17xx_40xx/lincoln60/src/Makefile
+1 -1
View File
@@ -33,7 +33,7 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
include $(TOPDIR)/Make.defs
ASRCS =
CSRCS = lpc17_40_boot.c lpc17_40_leds.c
boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/Makefile
+1 -1
View File
@@ -33,7 +33,7 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
include $(TOPDIR)/Make.defs
# This is the directory for the board-specific header files
boards/arm/lpc17xx_40xx/lpc4088-devkit/src/Makefile
+1 -1
View File
@@ -33,7 +33,7 @@
#
############################################################################
-include $(TOPDIR)/Make.defs
include $(TOPDIR)/Make.defs
ASRCS =
CSRCS = lpc17_40_boardinitialize.c lpc17_40_bringup.c lpc17_40_ssp.c

Some files were not shown because too many files have changed in this diff Show More