diff --git a/tools/FlatLibs.mk b/tools/FlatLibs.mk
index 26a9d7c868..a0eaf6bb6e 100644
--- a/tools/FlatLibs.mk
+++ b/tools/FlatLibs.mk
@@ -132,6 +132,12 @@ ifeq ($(CONFIG_OPENAMP),y)
 NUTTXLIBS += staging$(DELIM)libopenamp$(LIBEXT)
 endif
 
+# Add libraries for board common support
+
+ifeq ($(CONFIG_ARCH_BOARD_COMMON),y)
+NUTTXLIBS += staging$(DELIM)libboard$(LIBEXT)
+endif
+
 # Export all libraries
 
 EXPORTLIBS = $(NUTTXLIBS)
diff --git a/tools/KernelLibs.mk b/tools/KernelLibs.mk
index ae6d410738..c87e60e099 100644
--- a/tools/KernelLibs.mk
+++ b/tools/KernelLibs.mk
@@ -118,6 +118,12 @@ ifeq ($(CONFIG_OPENAMP),y)
 NUTTXLIBS += staging$(DELIM)libopenamp$(LIBEXT)
 endif
 
+# Add libraries for board common support
+
+ifeq ($(CONFIG_ARCH_BOARD_COMMON),y)
+NUTTXLIBS += staging$(DELIM)libboard$(LIBEXT)
+endif
+
 # Export only the user libraries
 
 EXPORTLIBS = $(USERLIBS)
diff --git a/tools/LibTargets.mk b/tools/LibTargets.mk
index 1d49e9b6f0..4eaa8e1e70 100644
--- a/tools/LibTargets.mk
+++ b/tools/LibTargets.mk
@@ -73,6 +73,12 @@ boards$(DELIM)libboards$(LIBEXT): pass2dep
 staging$(DELIM)libboards$(LIBEXT): boards$(DELIM)libboards$(LIBEXT)
 	$(Q) $(call INSTALL_LIB,$<,$@)
 
+$(ARCH_SRC)$(DELIM)board$(DELIM)libboard$(LIBEXT): pass2dep
+	$(Q) $(MAKE) -C $(ARCH_SRC)/board libboard$(LIBEXT) EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)"
+
+staging$(DELIM)libboard$(LIBEXT): $(ARCH_SRC)$(DELIM)board$(DELIM)libboard$(LIBEXT)
+	$(Q) $(call INSTALL_LIB,$<,$@)
+
 crypto$(DELIM)libcrypto$(LIBEXT): pass2dep
 	$(Q) $(MAKE) -C crypto libcrypto$(LIBEXT) EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)"
 
diff --git a/tools/ProtectedLibs.mk b/tools/ProtectedLibs.mk
index 8687a7afa6..e7d8750dfe 100644
--- a/tools/ProtectedLibs.mk
+++ b/tools/ProtectedLibs.mk
@@ -132,6 +132,12 @@ ifeq ($(CONFIG_OPENAMP),y)
 NUTTXLIBS += staging$(DELIM)libopenamp$(LIBEXT)
 endif
 
+# Add libraries for board common support
+
+ifeq ($(CONFIG_ARCH_BOARD_COMMON),y)
+NUTTXLIBS += staging$(DELIM)libboard$(LIBEXT)
+endif
+
 # Export only the user libraries
 
 EXPORTLIBS = $(USERLIBS)