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

boards: Replace CONFIG_CYGWIN_WINTOOL with CONVERT_PATH

Browse Source 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao
2022-02-20 10:34:50 +08:00
committed by Petro Karashchenko
parent 1d1bdd85a3
commit 163fe4ff0b
113 changed files with 340 additions and 1296 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/ceva/src/Makefile
+15 -38
View File
@@ -41,22 +41,13 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
CFLAGS += -I$(TOPDIR)\sched
else
ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
ifeq ($(WINTOOL),y)
NUTTX = "${shell cygpath -w $(OUTDIR)/nuttx$(EXEEXT)}"
CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}"
CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/common}"
CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/$(ARCH_SUBDIR)}"
CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/$(CONFIG_ARCH_CHIP)}"
CFLAGS += -I "${shell cygpath -w $(TOPDIR)/sched}"
LDSCRIPT := ${shell cygpath -m $(LDSCRIPT)}
else
NUTTX = "$(OUTDIR)/nuttx$(EXEEXT)"
CFLAGS += -I$(ARCH_SRCDIR)/chip
CFLAGS += -I$(ARCH_SRCDIR)/common
CFLAGS += -I$(ARCH_SRCDIR)/$(ARCH_SUBDIR)
CFLAGS += -I$(ARCH_SRCDIR)/$(CONFIG_ARCH_CHIP)
CFLAGS += -I$(TOPDIR)/sched
endif
NUTTX = $(call CONVERT_PATH,$(OUTDIR)/nuttx$(EXEEXT))
CFLAGS += -I $(call CONVERT_PATH,$(ARCH_SRCDIR)/chip)
CFLAGS += -I $(call CONVERT_PATH,$(ARCH_SRCDIR)/common)
CFLAGS += -I $(call CONVERT_PATH,$(ARCH_SRCDIR)/$(ARCH_SUBDIR))
CFLAGS += -I $(call CONVERT_PATH,$(ARCH_SRCDIR)/$(CONFIG_ARCH_CHIP))
CFLAGS += -I $(call CONVERT_PATH,$(TOPDIR)/sched)
LDSCRIPT := $(call CONVERT_PATH,$(LDSCRIPT))
endif
# The "head" object
@@ -97,25 +88,15 @@ LINKLIBS ?=
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
BOARDMAKE = $(if $(wildcard .\board\Makefile),y,)
LIBPATHS += -I "$(OUTDIR)\staging"
ifeq ($(BOARDMAKE),y)
LIBPATHS += -I "$(OUTDIR)\arch\$(CONFIG_ARCH)\src\board"
endif
ifeq ($(BOARDMAKE),y)
LIBPATHS += -I "$(OUTDIR)\arch\$(CONFIG_ARCH)\src\board"
endif
else
BOARDMAKE = $(if $(wildcard ./board/Makefile),y,)
ifeq ($(WINTOOL),y)
LIBPATHS += -I "${shell cygpath -w "$(OUTDIR)/staging"}"
ifeq ($(BOARDMAKE),y)
LIBPATHS += -I "${shell cygpath -w "$(OUTDIR)/arch/$(CONFIG_ARCH)/src/board"}"
endif
else
LIBPATHS += -I "$(OUTDIR)/staging"
ifeq ($(BOARDMAKE),y)
LIBPATHS += -I "$(OUTDIR)/arch/$(CONFIG_ARCH)/src/board"
endif
endif
LIBPATHS += -I $(call CONVERT_PATH,$(OUTDIR)/staging)
ifeq ($(BOARDMAKE),y)
LIBPATHS += -I $(call CONVERT_PATH,$(OUTDIR)/arch/$(CONFIG_ARCH)/src/board)
endif
endif
LDLIBS = $(patsubst %, -lib %,$(LINKLIBS))
@@ -129,11 +110,7 @@ VPATH += common
VPATH += $(ARCH_SUBDIR)
VPATH := $(patsubst %,:$(SRCDIR)$(DELIM)%,$(VPATH))
ifeq ($(WINTOOL),y)
VPATH += :$(shell cygpath -m $(OUTDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)chip)
else
VPATH += :$(OUTDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)chip
endif
VPATH += :$(call CONVERT_PATH,$(OUTDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)chip)
all: $(HEAD_OBJ) $(BIN)
arch/ceva/src/xc5/Toolchain.defs
-4
View File
@@ -59,10 +59,6 @@ LDFLAGS += -internalCode$(ITCM_KB) -internalData$(DTCM_KB)
LIBGCC = $(CROSSDEV)libs/xc5/cevaxclib.lib
LIBGCC += $(CROSSDEV)libs/xc5/libcc.lib
ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
WINTOOL = y
endif
CC = $(CROSSDEV)/cevaxccc -mquiet -Wa,-quiet
CXX = $(CROSSDEV)/cevaxccc -mquiet -Wa,-quiet -x c++
CPP = $(CROSSDEV)/cevaxccc -mquiet -Wa,-quiet -E -P -x c
arch/ceva/src/xm6/Toolchain.defs
-4
View File
@@ -64,10 +64,6 @@ ifneq ($(CONFIG_ARCH_NR_FPUS),)
ARCHCPUFLAGS += -CG:SPU_FP_num=$(CONFIG_ARCH_NR_FPUS) -Wa,-fp=$(CONFIG_ARCH_NR_FPUS)
endif
ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
WINTOOL = y
endif
CC = $(CROSSDEV)/cevaxm6cc -mquiet -Wa,-quiet
CXX = $(CROSSDEV)/cevaxm6cc -mquiet -Wa,-quiet -x c++
CPP = $(CROSSDEV)/cevaxm6cc -mquiet -Wa,-quiet -E -P -x c