matrix-rootfs: add jffs2_extra_args
[matrix.git] / matrix / config.py
index 00be4bd..2b926fa 100644 (file)
@@ -33,11 +33,6 @@ def config_dir(path=None, url=None, branch='master', optional=False):
                if path.endswith('.git'):
                        path = path[:-4]
 
-       config.config_dirs.append(path)
-       for i in config.initial_config_dirs:
-               if i not in config.config_dirs:
-                       raise Error("Config dir hasn't been specified: %s" % i)
-
        if optional and path not in config.initial_config_dirs:
                if config.debug:
                        print 'Skipping', path
@@ -56,6 +51,9 @@ def config_dir(path=None, url=None, branch='master', optional=False):
                if not isdir(path):
                        raise Error('Config dir does not exist: %s' % path)
 
+       if path not in config.initial_config_dirs:
+               config.config_dirs.append(path)
+
 def pull_config_dirs(flag):
        config.pull_config_dirs = flag
 
@@ -74,7 +72,10 @@ class Board(object):
                     ubifs_leb_size=0,
                     ubifs_max_leb_count=0,
                     ubifs_min_io_size=0,
-                    ubinize_config_vol_size=0):
+                    ubinize_config_vol_size=0,
+                    cleanmarkers="unknown",
+                    jffs2_extra_args="",
+                    flags=[]):
 
                self.name = name
                self.arch = arch
@@ -90,6 +91,9 @@ class Board(object):
                self.ubifs_max_leb_count = ubifs_max_leb_count
                self.ubifs_min_io_size = ubifs_min_io_size
                self.ubinize_config_vol_size = ubinize_config_vol_size
+               self.cleanmarkers = cleanmarkers
+               self.jffs2_extra_args = jffs2_extra_args
+               self.flags = flags
 
                config.boards[name] = self