From f018a9cb544d3fe6c552dbcd436d8fbb6612fc4c Mon Sep 17 00:00:00 2001
From: yinshengkai <yinshengkai@xiaomi.com>
Date: Tue, 25 Oct 2022 00:09:41 +0800
Subject: [PATCH] Makefile: Remove INCDIROPT

This option, which resolves to -w when CONFIG_CYGWIN_WINTOOL is
configured, is now appended to INCDIR in tools/Config.mk.

See git commit # 5eae32577e5d5226e5d3027c169eeb369f83f77d in the main
---
 boards/arm/cxd56xx/drivers/audio/Make.defs | 4 ++--
 drivers/clk/Make.defs                      | 2 +-
 drivers/modem/alt1250/Make.defs            | 2 +-
 drivers/motor/foc/Make.defs                | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/boards/arm/cxd56xx/drivers/audio/Make.defs b/boards/arm/cxd56xx/drivers/audio/Make.defs
index 4e7244f4cd..ce889cd793 100644
--- a/boards/arm/cxd56xx/drivers/audio/Make.defs
+++ b/boards/arm/cxd56xx/drivers/audio/Make.defs
@@ -19,8 +19,8 @@
 ############################################################################
 
 ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(ARCH_SRCDIR)$(DELIM)chip)
-CFLAGS += $(shell $(INCDIR) $(INCDIROPT) "$(CC)" $(ARCH_SRCDIR)$(DELIM)common)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)chip)
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)common)
 
 ifeq ($(CONFIG_CXD56_AUDIO),y)
 CSRCS += cxd56_audio.c
diff --git a/drivers/clk/Make.defs b/drivers/clk/Make.defs
index f975b23d42..9b46b1c309 100644
--- a/drivers/clk/Make.defs
+++ b/drivers/clk/Make.defs
@@ -32,6 +32,6 @@ endif
 
 DEPPATH += --dep-path clk
 VPATH += :clk
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)clk}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)clk}
 
 endif
diff --git a/drivers/modem/alt1250/Make.defs b/drivers/modem/alt1250/Make.defs
index 4c0434701f..c04bdcf0cc 100644
--- a/drivers/modem/alt1250/Make.defs
+++ b/drivers/modem/alt1250/Make.defs
@@ -33,6 +33,6 @@ endif
 
 DEPPATH += --dep-path modem$(DELIM)alt1250
 VPATH += :modem$(DELIM)alt1250
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)modem}
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)modem}
 
 endif
diff --git a/drivers/motor/foc/Make.defs b/drivers/motor/foc/Make.defs
index a2ba01fc1e..b9b17d3945 100644
--- a/drivers/motor/foc/Make.defs
+++ b/drivers/motor/foc/Make.defs
@@ -30,4 +30,4 @@ endif
 
 DEPPATH += --dep-path motor$(DELIM)foc
 VPATH += :motor$(DELIM)foc
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)motor$(DELIM)foc}
\ No newline at end of file
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)motor$(DELIM)foc}