3 files changed, 11 insertions, 46 deletions
diff --git a/os/license/chcustomer.h b/os/license/chcustomer.h
index 8e81312fa..433d26db2 100644
--- a/os/license/chcustomer.h
+++ b/os/license/chcustomer.h
@@ -57,6 +57,7 @@
  */
 #define CH_CUSTOMER_LIC_RT                  TRUE
 #define CH_CUSTOMER_LIC_NIL                 TRUE
+#define CH_CUSTOMER_LIC_LIB                 TRUE
 #define CH_CUSTOMER_LIC_EX                  TRUE
 #define CH_CUSTOMER_LIC_PORT_CM0            TRUE
 #define CH_CUSTOMER_LIC_PORT_CM3            TRUE
diff --git a/os/nil/nil.mk b/os/nil/nil.mk
index f3d144199..0d6350f56 100644
--- a/os/nil/nil.mk
+++ b/os/nil/nil.mk
@@ -3,34 +3,16 @@
 ifeq ($(USE_SMART_BUILD),yes)
 CHCONF := $(strip $(shell cat chconf.h | egrep -e "\#define"))
 KERNSRC := ${CHIBIOS}/os/nil/src/ch.c
-ifneq ($(findstring CH_CFG_USE_MAILBOXES TRUE,$(CHCONF)),)
-KERNSRC += $(CHIBIOS)/os/common/oslib/src/chmboxes.c
-endif
-ifneq ($(findstring CH_CFG_USE_MEMCORE TRUE,$(CHCONF)),)
-KERNSRC += $(CHIBIOS)/os/common/oslib/src/chmemcore.c
-endif
-ifneq ($(findstring CH_CFG_USE_HEAP TRUE,$(CHCONF)),)
-KERNSRC += $(CHIBIOS)/os/common/oslib/src/chheap.c
-endif
-ifneq ($(findstring CH_CFG_USE_MEMPOOLS TRUE,$(CHCONF)),)
-KERNSRC += $(CHIBIOS)/os/common/oslib/src/chmempools.c
-endif
-ifneq ($(findstring CH_CFG_USE_FACTORY TRUE,$(CHCONF)),)
-KERNSRC += $(CHIBIOS)/os/common/oslib/src/chfactory.c
-endif
 else
-KERNSRC := ${CHIBIOS}/os/nil/src/ch.c \
-           $(CHIBIOS)/os/common/oslib/src/chmboxes.c \
-           $(CHIBIOS)/os/common/oslib/src/chmemcore.c \
-           $(CHIBIOS)/os/common/oslib/src/chheap.c \
-           $(CHIBIOS)/os/common/oslib/src/chmempools.c \
-           $(CHIBIOS)/os/common/oslib/src/chfactory.c
+KERNSRC := ${CHIBIOS}/os/nil/src/ch.c
 endif
 
 # Required include directories
-KERNINC := ${CHIBIOS}/os/nil/include \
-           ${CHIBIOS}/os/common/oslib/include
+KERNINC := ${CHIBIOS}/os/nil/include
 
 # Shared variables
 ALLCSRC += $(KERNSRC)
 ALLINC  += $(KERNINC)
+
+# OS Library
+include $(CHIBIOS)/os/lib/lib.mk
diff --git a/os/rt/rt.mk b/os/rt/rt.mk
index f415cb341..8816a61e5 100644
--- a/os/rt/rt.mk
+++ b/os/rt/rt.mk
@@ -42,21 +42,6 @@ endif
 ifneq ($(findstring CH_CFG_USE_DYNAMIC TRUE,$(CHCONF)),)
 KERNSRC += $(CHIBIOS)/os/rt/src/chdynamic.c
 endif
-ifneq ($(findstring CH_CFG_USE_MAILBOXES TRUE,$(CHCONF)),)
-KERNSRC += $(CHIBIOS)/os/common/oslib/src/chmboxes.c
-endif
-ifneq ($(findstring CH_CFG_USE_MEMCORE TRUE,$(CHCONF)),)
-KERNSRC += $(CHIBIOS)/os/common/oslib/src/chmemcore.c
-endif
-ifneq ($(findstring CH_CFG_USE_HEAP TRUE,$(CHCONF)),)
-KERNSRC += $(CHIBIOS)/os/common/oslib/src/chheap.c
-endif
-ifneq ($(findstring CH_CFG_USE_MEMPOOLS TRUE,$(CHCONF)),)
-KERNSRC += $(CHIBIOS)/os/common/oslib/src/chmempools.c
-endif
-ifneq ($(findstring CH_CFG_USE_FACTORY TRUE,$(CHCONF)),)
-KERNSRC += $(CHIBIOS)/os/common/oslib/src/chfactory.c
-endif
 else
 KERNSRC := $(CHIBIOS)/os/rt/src/chsys.c \
            $(CHIBIOS)/os/rt/src/chdebug.c \
@@ -72,18 +57,15 @@ KERNSRC := $(CHIBIOS)/os/rt/src/chsys.c \
            $(CHIBIOS)/os/rt/src/chcond.c \
            $(CHIBIOS)/os/rt/src/chevents.c \
            $(CHIBIOS)/os/rt/src/chmsg.c \
-           $(CHIBIOS)/os/rt/src/chdynamic.c \
-           $(CHIBIOS)/os/common/oslib/src/chmboxes.c \
-           $(CHIBIOS)/os/common/oslib/src/chmemcore.c \
-           $(CHIBIOS)/os/common/oslib/src/chheap.c \
-           $(CHIBIOS)/os/common/oslib/src/chmempools.c \
-           $(CHIBIOS)/os/common/oslib/src/chfactory.c
+           $(CHIBIOS)/os/rt/src/chdynamic.c
 endif
 
 # Required include directories
-KERNINC := $(CHIBIOS)/os/rt/include \
-           $(CHIBIOS)/os/common/oslib/include
+KERNINC := $(CHIBIOS)/os/rt/include
 
 # Shared variables
 ALLCSRC += $(KERNSRC)
 ALLINC  += $(KERNINC)
+
+# OS Library
+include $(CHIBIOS)/os/lib/lib.mk