From 0ca35b4b5a8fc67b2222fa0981cb650f1b938f35 Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Sat, 17 Mar 2018 11:24:50 +0000
Subject: Removed separated configuration file for oslib.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11795 110e8d01-0319-4d1e-a829-52ad28d1bb01
---
 os/rt/include/chchecks.h       | 55 +-----------------------------------------
 os/rt/include/chrestrictions.h |  5 ++++
 2 files changed, 6 insertions(+), 54 deletions(-)

(limited to 'os/rt')

diff --git a/os/rt/include/chchecks.h b/os/rt/include/chchecks.h
index b4ca1c80d..5c38757cd 100644
--- a/os/rt/include/chchecks.h
+++ b/os/rt/include/chchecks.h
@@ -115,11 +115,7 @@
 #endif
 
 #if !defined(CH_CFG_USE_CONDVARS_TIMEOUT)
-#error " not defined in chconf.h"
-#endif
-
-#if !defined(CH_CFG_USE_CONDVARS_TIMEOUT)
-#error " not defined in chconf.h"
+#error "CH_CFG_USE_CONDVARS_TIMEOUT not defined in chconf.h"
 #endif
 
 #if !defined(CH_CFG_USE_EVENTS)
@@ -138,59 +134,10 @@
 #error "CH_CFG_USE_MESSAGES_PRIORITY not defined in chconf.h"
 #endif
 
-#if !defined(CH_CFG_USE_MAILBOXES)
-#error "CH_CFG_USE_MAILBOXES not defined in chconf.h"
-#endif
-
-#if !defined(CH_CFG_USE_MEMCORE)
-#error "CH_CFG_USE_MEMCORE not defined in chconf.h"
-#endif
-
-#if !defined(CH_CFG_USE_HEAP)
-#error "CH_CFG_USE_HEAP not defined in chconf.h"
-#endif
-
-#if !defined(CH_CFG_USE_MEMPOOLS)
-#error "CH_CFG_USE_MEMPOOLS not defined in chconf.h"
-#endif
-
-#if !defined(CH_CFG_USE_OBJ_FIFOS)
-#error "CH_CFG_USE_OBJ_FIFOS not defined in chconf.h"
-#endif
-
 #if !defined(CH_CFG_USE_DYNAMIC)
 #error "CH_CFG_USE_DYNAMIC not defined in chconf.h"
 #endif
 
-/* Objects factory options checks.*/
-#if !defined(CH_CFG_USE_FACTORY)
-#error "CH_CFG_USE_FACTORY not defined in chconf.h"
-#endif
-
-#if !defined(CH_CFG_FACTORY_MAX_NAMES_LENGTH)
-#error "CH_CFG_FACTORY_MAX_NAMES_LENGTH not defined in chconf.h"
-#endif
-
-#if !defined(CH_CFG_FACTORY_OBJECTS_REGISTRY)
-#error "CH_CFG_FACTORY_OBJECTS_REGISTRY not defined in chconf.h"
-#endif
-
-#if !defined(CH_CFG_FACTORY_GENERIC_BUFFERS)
-#error "CH_CFG_FACTORY_GENERIC_BUFFERS not defined in chconf.h"
-#endif
-
-#if !defined(CH_CFG_FACTORY_SEMAPHORES)
-#error "CH_CFG_FACTORY_SEMAPHORES not defined in chconf.h"
-#endif
-
-#if !defined(CH_CFG_FACTORY_MAILBOXES)
-#error "CH_CFG_FACTORY_MAILBOXES not defined in chconf.h"
-#endif
-
-#if !defined(CH_CFG_FACTORY_OBJ_FIFOS)
-#error "CH_CFG_FACTORY_OBJ_FIFOS not defined in chconf.h"
-#endif
-
 /* Debug options checks.*/
 #if !defined(CH_DBG_STATISTICS)
 #error "CH_DBG_STATISTICS not defined in chconf.h"
diff --git a/os/rt/include/chrestrictions.h b/os/rt/include/chrestrictions.h
index 91dc5401f..3871b3c59 100644
--- a/os/rt/include/chrestrictions.h
+++ b/os/rt/include/chrestrictions.h
@@ -37,6 +37,11 @@
 /* Derived constants and error checks.                                       */
 /*===========================================================================*/
 
+/* License checks.*/
+#if !defined(CH_CUSTOMER_LIC_RT) || !defined(CH_LICENSE_FEATURES)
+#error "malformed chlicense.h"
+#endif
+
 #if CH_CUSTOMER_LIC_RT == FALSE
 #error "ChibiOS/RT not licensed"
 #endif
-- 
cgit v1.2.3