diff --git a/boards/arm/cxd56xx/scripts/Config.mk b/boards/arm/cxd56xx/scripts/Config.mk
new file mode 100644
index 0000000000000..5af62679a40b2
--- /dev/null
+++ b/boards/arm/cxd56xx/scripts/Config.mk
@@ -0,0 +1,41 @@
+############################################################################
+# board/arm/cxd56xx/script/Config.mk
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# 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.
+#
+############################################################################
+
+# These are the macros that will be used in the NuttX make system to compile
+# and assembly source files and to insert the resulting object files into an
+# archive.  These replace the default definitions at tools/Config.mk
+
+# POSTBUILD -- Perform post build operations
+
+ifeq ($(CONFIG_CXD56_BINARY),y)
+define POSTBUILD
+	$(Q) if [ ! -f "tools/cxd56/mkspk" ] ; then \
+		echo ""; \
+		echo "Please run the following command to build the needed tool"; \
+		echo ""; \
+		echo "cd tools/cxd56 && make && cd ../.."; \
+		echo ""; \
+		echo "run make again to create the nuttx.spk image."; \
+	else \
+		echo "Generating: $(NUTTXNAME).spk"; \
+		tools/cxd56/mkspk -c2 nuttx nuttx nuttx.spk; \
+	fi
+endef
+endif
diff --git a/boards/arm/cxd56xx/spresense/scripts/Make.defs b/boards/arm/cxd56xx/spresense/scripts/Make.defs
index 92b2f92b21818..c7df6e0f342d5 100644
--- a/boards/arm/cxd56xx/spresense/scripts/Make.defs
+++ b/boards/arm/cxd56xx/spresense/scripts/Make.defs
@@ -35,6 +35,7 @@
 
 include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
+include ${TOPDIR}/boards/arm/cxd56xx/scripts/Config.mk
 include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
 
 # Setup for the kind of memory that we are executing from
diff --git a/boards/z16/z16f/z16f2800100zcog/scripts/Make.defs b/boards/z16/z16f/z16f2800100zcog/scripts/Make.defs
index 92eae9b5e1a1e..f30d0299e0617 100644
--- a/boards/z16/z16f/z16f2800100zcog/scripts/Make.defs
+++ b/boards/z16/z16f/z16f2800100zcog/scripts/Make.defs
@@ -36,7 +36,7 @@
 include $(TOPDIR)/.config
 include $(TOPDIR)/tools/Config.mk
 include ${TOPDIR}/arch/z16/src/z16f/Toolchain.defs
-include $(TOPDIR)/tools/zds/zds_Config.mk
+include $(TOPDIR)/tools/zds/Config.mk
 
 # CFLAGS
 
diff --git a/boards/z80/ez80/ez80f910200kitg/scripts/Make.defs b/boards/z80/ez80/ez80f910200kitg/scripts/Make.defs
index 27f4907106740..bf911dc57877c 100644
--- a/boards/z80/ez80/ez80f910200kitg/scripts/Make.defs
+++ b/boards/z80/ez80/ez80f910200kitg/scripts/Make.defs
@@ -36,7 +36,7 @@
 include $(TOPDIR)/.config
 include $(TOPDIR)/tools/Config.mk
 include ${TOPDIR}/arch/z80/src/ez80/Toolchain.defs
-include $(TOPDIR)/tools/zds/zds_Config.mk
+include $(TOPDIR)/tools/zds/Config.mk
 
 # CFLAGS
 
diff --git a/boards/z80/ez80/ez80f910200zco/scripts/Make.defs b/boards/z80/ez80/ez80f910200zco/scripts/Make.defs
index 0f4b15c6b13e3..b7c632a941173 100644
--- a/boards/z80/ez80/ez80f910200zco/scripts/Make.defs
+++ b/boards/z80/ez80/ez80f910200zco/scripts/Make.defs
@@ -36,7 +36,7 @@
 include $(TOPDIR)/.config
 include $(TOPDIR)/tools/Config.mk
 include ${TOPDIR}/arch/z80/src/ez80/Toolchain.defs
-include $(TOPDIR)/tools/zds/zds_Config.mk
+include $(TOPDIR)/tools/zds/Config.mk
 
 # CFLAGS
 
diff --git a/boards/z80/ez80/makerlisp/scripts/Make.defs b/boards/z80/ez80/makerlisp/scripts/Make.defs
index b351ee7332374..389a2f553b533 100644
--- a/boards/z80/ez80/makerlisp/scripts/Make.defs
+++ b/boards/z80/ez80/makerlisp/scripts/Make.defs
@@ -36,7 +36,7 @@
 include $(TOPDIR)/.config
 include $(TOPDIR)/tools/Config.mk
 include ${TOPDIR}/arch/z80/src/ez80/Toolchain.defs
-include $(TOPDIR)/tools/zds/zds_Config.mk
+include $(TOPDIR)/tools/zds/Config.mk
 
 # CFLAGS
 
diff --git a/boards/z80/ez80/z20x/scripts/Make.defs b/boards/z80/ez80/z20x/scripts/Make.defs
index c47077b9b516e..c8070575e32bd 100644
--- a/boards/z80/ez80/z20x/scripts/Make.defs
+++ b/boards/z80/ez80/z20x/scripts/Make.defs
@@ -21,7 +21,7 @@
 include $(TOPDIR)/.config
 include $(TOPDIR)/tools/Config.mk
 include ${TOPDIR}/arch/z80/src/ez80/Toolchain.defs
-include $(TOPDIR)/tools/zds/zds_Config.mk
+include $(TOPDIR)/tools/zds/Config.mk
 
 # CFLAGS
 
diff --git a/boards/z80/z8/z8encore000zco/scripts/Make.defs b/boards/z80/z8/z8encore000zco/scripts/Make.defs
index 72402eee5b583..3e1bbf28bf658 100644
--- a/boards/z80/z8/z8encore000zco/scripts/Make.defs
+++ b/boards/z80/z8/z8encore000zco/scripts/Make.defs
@@ -36,7 +36,7 @@
 include $(TOPDIR)/.config
 include $(TOPDIR)/tools/Config.mk
 include ${TOPDIR}/arch/z80/src/z8/Toolchain.defs
-include $(TOPDIR)/tools/zds/zds_Config.mk
+include $(TOPDIR)/tools/zds/Config.mk
 
 # CFLAGS
 
diff --git a/boards/z80/z8/z8f64200100kit/scripts/Make.defs b/boards/z80/z8/z8f64200100kit/scripts/Make.defs
index ab663d02bc978..528cd0e9a68be 100644
--- a/boards/z80/z8/z8f64200100kit/scripts/Make.defs
+++ b/boards/z80/z8/z8f64200100kit/scripts/Make.defs
@@ -36,7 +36,7 @@
 include $(TOPDIR)/.config
 include $(TOPDIR)/tools/Config.mk
 include ${TOPDIR}/arch/z80/src/z8/Toolchain.defs
-include $(TOPDIR)/tools/zds/zds_Config.mk
+include $(TOPDIR)/tools/zds/Config.mk
 
 # CFLAGS
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
diff --git a/tools/Config.mk b/tools/Config.mk
index 43870aab94cc9..1b3f826e52b61 100644
--- a/tools/Config.mk
+++ b/tools/Config.mk
@@ -2,7 +2,7 @@
 # tools/Config.mk
 # Global build rules and macros.
 #
-#   Copyright (C) 2011, 2013-2014, 2018-2019 Gregory Nutt. All rights
+#   Copyright (C) 2011, 2013-2014, 2018-2019, 2020 Gregory Nutt. All rights
 #     reserved.
 #   Author: Richard Cochran
 #           Gregory Nutt <gnutt@nuttx.org>
@@ -239,6 +239,15 @@ define PRELINK
 endef
 endif
 
+# POSTBUILD -- Perform post build operations
+# Some architectures require the use of special tools and special handling
+# AFTER building the NuttX binary.  Make.defs files for thos architectures
+# should override the following define with the correct operations for
+# that platform
+
+define POSTBUILD
+endef
+
 # DELFILE - Delete one file
 
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
diff --git a/tools/Makefile.unix b/tools/Makefile.unix
index 5fb6ada733b5e..1c4ee2dfaa2a7 100644
--- a/tools/Makefile.unix
+++ b/tools/Makefile.unix
@@ -480,19 +480,6 @@ ifeq ($(CONFIG_RAW_BINARY),y)
 	@echo "CP: $(NUTTXNAME).bin"
 	$(Q) $(OBJCOPY) $(OBJCOPYARGS) -O binary $(BIN) $(NUTTXNAME).bin
 endif
-ifeq ($(CONFIG_CXD56_BINARY),y)
-	$(Q) if [ ! -f "tools/cxd56/mkspk" ] ; then \
-		echo ""; \
-		echo "Please run the following command to build the needed tool"; \
-		echo ""; \
-		echo "cd tools/cxd56 && make && cd ../.."; \
-		echo ""; \
-		echo "run make again to create the nuttx.spk image."; \
-	else \
-		echo "Generating: $(NUTTXNAME).spk"; \
-		tools/cxd56/mkspk -c2 nuttx nuttx nuttx.spk; \
-	fi
-endif
 ifeq ($(CONFIG_UBOOT_UIMAGE),y)
 	@echo "MKIMAGE: uImage"
 	$(Q) mkimage -A $(CONFIG_ARCH) -O linux -C none -T kernel -a $(CONFIG_UIMAGE_LOAD_ADDRESS) \
@@ -501,6 +488,7 @@ ifeq ($(CONFIG_UBOOT_UIMAGE),y)
 		cp -f uImage /tftpboot/uImage; \
 	fi
 endif
+	$(call POSTBUILD)
 
 # $(BIN)
 #
diff --git a/tools/Makefile.win b/tools/Makefile.win
index 89e1365952fc8..71939071dd8ad 100644
--- a/tools/Makefile.win
+++ b/tools/Makefile.win
@@ -490,19 +490,7 @@ ifeq ($(CONFIG_RAW_BINARY),y)
 	@echo "CP: $(NUTTXNAME).bin"
 	$(Q) $(OBJCOPY) $(OBJCOPYARGS) -O binary $(BIN) $(NUTTXNAME).bin
 endif
-ifeq ($(CONFIG_CXD56_BINARY),y)
-	$(Q) if [ ! -f "tools/cxd56/mkspk.exe" ] ; then \
-		echo ""; \
-		echo "Please run the following command to build the needed tool"; \
-		echo ""; \
-		echo "cd tools/cxd56 && make && cd ../.."; \
-		echo ""; \
-		echo "run make again to create the nuttx.spk image."; \
-	else \
-		echo "Generating: $(NUTTXNAME).spk"; \
-		tools\cxd56\mkspk.exe -c2 nuttx nuttx nuttx.spk; \
-	fi
-endif
+	$(call POSTBUILD)
 
 # $(BIN)
 #
diff --git a/tools/zds/zds_Config.mk b/tools/zds/Config.mk
similarity index 99%
rename from tools/zds/zds_Config.mk
rename to tools/zds/Config.mk
index a7192cff985ba..be60b9012223c 100644
--- a/tools/zds/zds_Config.mk
+++ b/tools/zds/Config.mk
@@ -1,5 +1,5 @@
 ############################################################################
-# tools/zds/zds_Config.defs
+# tools/zds/Config.mk
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
diff --git a/tools/zds/README.txt b/tools/zds/README.txt
index fbcf546f3c155..39c7b483001b8 100644
--- a/tools/zds/README.txt
+++ b/tools/zds/README.txt
@@ -7,10 +7,10 @@ tools/zds/zdsar.c:  This is a wrapper around the ZDS_II librarian.  It
   the build files but it also improves performance and, more importantly,i
   provides a common solution for the Windows native build case.
 
-tools/zds/zds_Config.mk:  This makefile fragment is include by ZDS-II
-  Make.defs files after including tools/Config.mk.  The definitions in this
-  file override some of the the definitions in tools/Config.mk to customize
-  the build for use with the ZDS-II tools.
+tools/zds/Config.mk:  This makefile fragment is include by ZDS-II Make.defs
+  files after including tools/Config.mk.  The definitions in this file
+  override some of the the definitions in tools/Config.mk to customize the
+  build for use with the ZDS-II tools.
 
 These tools should work with all ZDS-II based platforms including z8, zNeo,
 and ez80.