diff --git a/arch/mips/src/Makefile b/arch/mips/src/Makefile
index cdbd2a8fb6f..c280df80afa 100644
--- a/arch/mips/src/Makefile
+++ b/arch/mips/src/Makefile
@@ -146,7 +146,7 @@ makedepfile: $(CSRCS:.c=.ddc) $(ASRCS:.S=.dds)
 ifeq ($(BOARDMAKE),y)
 	$(Q) $(MAKE) -C board depend
 endif
-	$(Q) $(MAKE) makedepfile DEPPATH="--dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR)"	
+	$(Q) $(MAKE) makedepfile DEPPATH="--dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR)"
 	$(Q) touch $@
 
 depend: .depend
diff --git a/arch/misoc/src/Makefile b/arch/misoc/src/Makefile
index d6e2eb5d763..88e38803778 100644
--- a/arch/misoc/src/Makefile
+++ b/arch/misoc/src/Makefile
@@ -149,7 +149,7 @@ makedepfile: $(CSRCS:.c=.ddc) $(ASRCS:.S=.dds)
 ifeq ($(BOARDMAKE),y)
 	$(Q) $(MAKE) -C board depend
 endif
-	$(Q) $(MAKE) makedepfile DEPPATH="--dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR)"	
+	$(Q) $(MAKE) makedepfile DEPPATH="--dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR)"
 	$(Q) touch $@
 
 depend: .depend
diff --git a/arch/renesas/src/Makefile b/arch/renesas/src/Makefile
index 8c62b8de7d2..d2421d0df34 100644
--- a/arch/renesas/src/Makefile
+++ b/arch/renesas/src/Makefile
@@ -157,7 +157,7 @@ makedepfile: $(CSRCS:.c=.ddc) $(ASRCS:.S=.dds)
 ifeq ($(BOARDMAKE),y)
 	$(Q) $(MAKE) -C board depend
 endif
-	$(Q) $(MAKE) makedepfile DEPPATH="--dep-path chip --dep-path common"	
+	$(Q) $(MAKE) makedepfile DEPPATH="--dep-path chip --dep-path common"
 	$(Q) touch $@
 
 depend: .depend
diff --git a/arch/sim/src/Makefile b/arch/sim/src/Makefile
index 611f09a2b2e..9f9fa87bba1 100644
--- a/arch/sim/src/Makefile
+++ b/arch/sim/src/Makefile
@@ -199,7 +199,7 @@ endif
 ifeq ($(CONFIG_SIM_HCISOCKET),y)
   HOSTSRCS += up_hcisocket_host.c
   CSRCS += up_hcisocket.c
-endif 
+endif
 
 ifeq ($(CONFIG_I2C_RESET),y)
   HOSTCFLAGS += -DCONFIG_I2C_RESET=1
diff --git a/arch/x86/src/Makefile b/arch/x86/src/Makefile
index fa2cfd39984..036d769bc41 100644
--- a/arch/x86/src/Makefile
+++ b/arch/x86/src/Makefile
@@ -161,7 +161,7 @@ makedepfile: $(CSRCS:.c=.ddc) $(ASRCS:.S=.dds)
 ifeq ($(BOARDMAKE),y)
 	$(Q) $(MAKE) -C board depend
 endif
-	$(Q) $(MAKE) makedepfile DEPPATH="--dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR)"	
+	$(Q) $(MAKE) makedepfile DEPPATH="--dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR)"
 	$(Q) touch $@
 
 depend: .depend
diff --git a/arch/x86_64/src/Makefile b/arch/x86_64/src/Makefile
index dac97433221..db2050ed5fb 100644
--- a/arch/x86_64/src/Makefile
+++ b/arch/x86_64/src/Makefile
@@ -156,7 +156,7 @@ makedepfile: $(CSRCS:.c=.ddc) $(ASRCS:.S=.dds)
 ifeq ($(BOARDMAKE),y)
 	$(Q) $(MAKE) -C board depend
 endif
-	$(Q) $(MAKE) makedepfile DEPPATH="--dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR)"	
+	$(Q) $(MAKE) makedepfile DEPPATH="--dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR)"
 	$(Q) touch $@
 
 depend: .depend
diff --git a/arch/xtensa/src/Makefile b/arch/xtensa/src/Makefile
index 31a454457b5..247d9e7581f 100644
--- a/arch/xtensa/src/Makefile
+++ b/arch/xtensa/src/Makefile
@@ -147,7 +147,7 @@ makedepfile: $(CSRCS:.c=.ddc) $(ASRCS:.S=.dds)
 ifeq ($(BOARDMAKE),y)
 	$(Q) $(MAKE) -C board depend
 endif
-	$(Q) $(MAKE) makedepfile DEPPATH="--dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR)"	
+	$(Q) $(MAKE) makedepfile DEPPATH="--dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR)"
 	$(Q) touch $@
 
 depend: .depend
diff --git a/arch/z80/src/Makefile.zdsiil b/arch/z80/src/Makefile.zdsiil
index 1b47539c725..668aa15747a 100644
--- a/arch/z80/src/Makefile.zdsiil
+++ b/arch/z80/src/Makefile.zdsiil
@@ -50,7 +50,7 @@ WARCHCMNDIR = ${shell cygpath -w $(ARCHCMDDIR)}
 USRINCLUDES = -usrinc:'$(WSCHEDSRCDIR);$(WARCHCHIPDIR);$(WARCHCMNDIR)'
 
 INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES)
-CFLAGS := $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES) 
+CFLAGS := $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES)
 CPPFLAGS += -I$(ARCHSRCDIR) -I$(ZDSSTDINCDIR) -I$(ZDSZILOGINCDIR)
 LDFLAGS  += @nuttx.linkcmd
 
diff --git a/audio/Makefile b/audio/Makefile
index a8c782938e6..c679adeb670 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -68,7 +68,7 @@ $(COBJS): %$(OBJEXT): %.c
 
 $(BIN): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
-  
+
 makedepfile: $(CSRCS:.c=.ddc) $(ASRCS:.S=.dds)
 	$(call CATFILE, Make.dep, $^)
 	$(call DELFILE, $^)
diff --git a/binfmt/Makefile b/binfmt/Makefile
index fd5299536bd..ed25a9e87b4 100644
--- a/binfmt/Makefile
+++ b/binfmt/Makefile
@@ -80,7 +80,7 @@ $(BINFMT_COBJS): %$(OBJEXT): %.c
 
 $(BIN): $(BINFMT_OBJS)
 	$(call ARCHIVE, $@, $(BINFMT_OBJS))
-  
+
 makedepfile: $(BINFMT_CSRCS:.c=.ddc) $(BINFMT_ASRCS:.S=.dds)
 	$(call CATFILE, Make.dep, $^)
 	$(call DELFILE, $^)
diff --git a/boards/Makefile b/boards/Makefile
index 8169ebdbcd1..d272093444c 100644
--- a/boards/Makefile
+++ b/boards/Makefile
@@ -98,7 +98,7 @@ $(CXXOBJS): %$(OBJEXT): %.cxx
 
 $(BIN): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
-  
+
 makedepfile: $(CSRCS:.c=.ddc) $(ASRCS:.S=.dds) $(CXXSRCS:.cxx=.ddx)
 	$(call CATFILE, Make.dep, $^)
 	$(call DELFILE, $^)
diff --git a/boards/renesas/rx65n/rx65n-rsk2mb/src/Makefile b/boards/renesas/rx65n/rx65n-rsk2mb/src/Makefile
index 5ef14684081..c463332df2e 100644
--- a/boards/renesas/rx65n/rx65n-rsk2mb/src/Makefile
+++ b/boards/renesas/rx65n/rx65n-rsk2mb/src/Makefile
@@ -7,15 +7,15 @@
 # ASF licenses this file to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance with the
 # License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
 # License for the specific language governing permissions and limitations
 # under the License.
-# 
+#
 ############################################################################
 
 include $(TOPDIR)/Make.defs
diff --git a/crypto/Makefile b/crypto/Makefile
index 68eb31a3843..a9112a4359b 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -89,7 +89,7 @@ $(COBJS): %$(OBJEXT): %.c
 
 $(BIN): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
-  
+
 makedepfile: $(CSRCS:.c=.ddc) $(ASRCS:.S=.dds)
 	$(call CATFILE, Make.dep, $^)
 	$(call DELFILE, $^)
diff --git a/drivers/Makefile b/drivers/Makefile
index 1c1139d8adc..d58a78b8ffd 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -119,7 +119,7 @@ $(COBJS): %$(OBJEXT): %.c
 
 $(BIN): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
-  
+
 makedepfile: $(CSRCS:.c=.ddc) $(ASRCS:.S=.dds)
 	$(call CATFILE, Make.dep, $^)
 	$(call DELFILE, $^)
diff --git a/fs/Makefile b/fs/Makefile
index 6d7717ada53..815088b8113 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -97,7 +97,7 @@ $(BIN):	$(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
 
 context::
-  
+
 makedepfile: $(CSRCS:.c=.ddc) $(ASRCS:.S=.dds)
 	$(call CATFILE, Make.dep, $^)
 	$(call DELFILE, $^)
diff --git a/libs/libc/Makefile b/libs/libc/Makefile
index 8371b115200..dcb415ad7ff 100644
--- a/libs/libc/Makefile
+++ b/libs/libc/Makefile
@@ -159,7 +159,7 @@ endif
 makedepfile: $(CSRCS:.c=.ddc) $(ASRCS:.S=.dds)
 	$(call CATFILE, bin/Make.dep, $^)
 	$(call DELFILE, $^)
-  
+
 makekdepfile: $(CSRCS:.c=.ddc) $(ASRCS:.S=.dds)
 	$(call CATFILE, kbin/Make.dep, $^)
 	$(call DELFILE, $^)
diff --git a/libs/libc/bin/Makefile b/libs/libc/bin/Makefile
index dedc963fb00..ffccef3b484 100644
--- a/libs/libc/bin/Makefile
+++ b/libs/libc/bin/Makefile
@@ -37,7 +37,7 @@ include $(TOPDIR)/Make.defs
 
 all:
 .PHONY: clean distclean
-  
+
 # Clean Targets:
 
 clean:
diff --git a/libs/libdsp/Makefile b/libs/libdsp/Makefile
index 6d1ed1a88a1..29c9b95e82a 100644
--- a/libs/libdsp/Makefile
+++ b/libs/libdsp/Makefile
@@ -49,7 +49,7 @@ $(COBJS): %$(OBJEXT): %.c
 
 $(BIN): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
-  
+
 makedepfile: $(CSRCS:.c=.ddc) $(ASRCS:.S=.dds)
 	$(call CATFILE, Make.dep, $^)
 	$(call DELFILE, $^)
diff --git a/libs/libnx/Makefile b/libs/libnx/Makefile
index 2408eee6abc..ff835298313 100644
--- a/libs/libnx/Makefile
+++ b/libs/libnx/Makefile
@@ -238,7 +238,7 @@ endif
 makedepfile: $(CSRCS:.c=.ddc) $(ASRCS:.S=.dds)
 	$(call CATFILE, bin/Make.dep, $^)
 	$(call DELFILE, $^)
-  
+
 makekdepfile: $(CSRCS:.c=.ddc) $(ASRCS:.S=.dds)
 	$(call CATFILE, kbin/Make.dep, $^)
 	$(call DELFILE, $^)
diff --git a/libs/libnx/kbin/Makefile b/libs/libnx/kbin/Makefile
index dd4e30e3c50..e3475231f9c 100644
--- a/libs/libnx/kbin/Makefile
+++ b/libs/libnx/kbin/Makefile
@@ -37,7 +37,7 @@ include $(TOPDIR)/Make.defs
 
 all:
 .PHONY: clean distclean
-  
+
 # Clean Targets:
 
 clean:
diff --git a/mm/Makefile b/mm/Makefile
index a2b6cb57afa..81b6c900ba6 100644
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -85,13 +85,13 @@ endif
 makedepfile: $(CSRCS:.c=.ddc) $(ASRCS:.S=.dds)
 	$(call CATFILE, bin/Make.dep, $^)
 	$(call DELFILE, $^)
-  
+
 makekdepfile: $(CSRCS:.c=.ddc) $(ASRCS:.S=.dds)
 	$(call CATFILE, kbin/Make.dep, $^)
 	$(call DELFILE, $^)
 
 .depend: Makefile $(SRCS) $(TOPDIR)$(DELIM).config
-	$(Q) $(MAKE) makedepfile 
+	$(Q) $(MAKE) makedepfile
 ifneq ($(CONFIG_BUILD_FLAT),y)
 	$(Q) $(MAKE) makekdepfile CFLAGS="$(CFLAGS) $(KDEFINE)"
 endif
diff --git a/net/Makefile b/net/Makefile
index 7cf01a1ad9d..94d92a2f875 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -91,7 +91,7 @@ $(COBJS): %$(OBJEXT): %.c
 
 $(BIN): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
-  
+
 makedepfile: $(CSRCS:.c=.ddc) $(ASRCS:.S=.dds)
 	$(call CATFILE, Make.dep, $^)
 	$(call DELFILE, $^)
diff --git a/pass1/Makefile b/pass1/Makefile
index d9a90294316..a79186290ab 100644
--- a/pass1/Makefile
+++ b/pass1/Makefile
@@ -57,7 +57,7 @@ $(COBJS): %$(OBJEXT): %.c
 
 $(BIN): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
-  
+
 makedepfile: $(CSRCS:.c=.ddc) $(ASRCS:.S=.dds)
 	$(call CATFILE, Make.dep, $^)
 	$(call DELFILE, $^)
diff --git a/sched/Makefile b/sched/Makefile
index fb3bd8deb50..9f7c7ca4774 100644
--- a/sched/Makefile
+++ b/sched/Makefile
@@ -58,7 +58,7 @@ $(COBJS): %$(OBJEXT): %.c
 
 $(BIN): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
-  
+
 makedepfile: $(CSRCS:.c=.ddc) $(ASRCS:.S=.dds)
 	$(call CATFILE, Make.dep, $^)
 	$(call DELFILE, $^)
diff --git a/tools/Makefile.unix b/tools/Makefile.unix
index ca58293a905..f49ce75fd0a 100644
--- a/tools/Makefile.unix
+++ b/tools/Makefile.unix
@@ -320,10 +320,10 @@ else ifneq ($(CONFIG_ARCH_CHIP),)
 endif
 
 dirlinks: include/arch include/arch/board include/arch/chip $(ARCH_SRC)/board $(ARCH_SRC)/chip drivers/platform
-	$(Q) $(MAKE) -C libs/libxx dirlinks 
-	$(Q) $(MAKE) -C boards dirlinks 
+	$(Q) $(MAKE) -C libs/libxx dirlinks
+	$(Q) $(MAKE) -C boards dirlinks
 	$(Q) $(MAKE) -C openamp dirlinks
-	$(Q) $(MAKE) -C $(CONFIG_APPS_DIR) dirlinks 
+	$(Q) $(MAKE) -C $(CONFIG_APPS_DIR) dirlinks
 
 # context
 #
diff --git a/tools/Makefile.win b/tools/Makefile.win
index bb551b5776f..100a7489ffa 100644
--- a/tools/Makefile.win
+++ b/tools/Makefile.win
@@ -299,8 +299,8 @@ else ifneq ($(CONFIG_ARCH_CHIP),)
 endif
 
 dirlinks: include\arch include\arch\board include\arch\chip $(ARCH_SRC)\board $(ARCH_SRC)\chip drivers\platform
-	$(Q) $(MAKE) -C libs/libxx dirlinks 
-	$(Q) $(MAKE) -C boards dirlinks 
+	$(Q) $(MAKE) -C libs/libxx dirlinks
+	$(Q) $(MAKE) -C boards dirlinks
 	$(Q) $(MAKE) -C openamp dirlinks
 	$(Q) $(MAKE) -C $(CONFIG_APPS_DIR) dirlinks
 
diff --git a/video/Makefile b/video/Makefile
index 87752291db9..92f91aebdb5 100644
--- a/video/Makefile
+++ b/video/Makefile
@@ -55,7 +55,7 @@ $(COBJS): %$(OBJEXT): %.c
 
 $(BIN):	$(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
-  
+
 makedepfile: $(CSRCS:.c=.ddc) $(ASRCS:.S=.dds)
 	$(call CATFILE, Make.dep, $^)
 	$(call DELFILE, $^)
diff --git a/wireless/Makefile b/wireless/Makefile
index b2c46fa6353..66d8fb5b154 100644
--- a/wireless/Makefile
+++ b/wireless/Makefile
@@ -60,7 +60,7 @@ $(COBJS): %$(OBJEXT): %.c
 
 $(BIN): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
-  
+
 makedepfile: $(CSRCS:.c=.ddc) $(ASRCS:.S=.dds)
 	$(call CATFILE, Make.dep, $^)
 	$(call DELFILE, $^)