Remove dependency on default options and add RTEMSConfig class.

1 files changed, 6 insertions, 7 deletions

diff --git a/py/config/__init__.py b/py/config/__init__.py
index 98042341cb..ed1cd181e8 100644
--- a/py/config/__init__.py
+++ b/py/config/__init__.py
@@ -2,11 +2,10 @@ from .base import BuildConfig, Config, Default, Feature, Disable
 from .feature import *
 from .options import *
 
-from py.waf import defaults # XXX: This needs to be removed as no dependencies from config -> waf are allowed.
-
-
-#XXX: Fix
-# Test to make sure options are sane.
-#for option in options_map:
-#	a = options_map[option]()
+class RTEMSConfig(object):
+	options_map = {}       # Global options map.
+	features_list = []     # Global features list.
+	config_list = []       # Global config list.
 
+	def __init__(self, defaults):
+		self.defaults = defaults