Changeset 7aaed09 in mainline for tools/config.py

Timestamp:

2011-12-18T14:02:30Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c868e2d

Parents:

3b71e84d (diff), 1761268 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• tools/config.py (modified) (7 diffs)

tools/config.py

@@ -85 +85 @@
         if ctype == 'cnf':
                 return True
+        
         return False
 
@@ -242 +243 @@
                 
                 default = get_default_rule(rule)
-
+                
                 #
                 # If we don't have a value but we do have
@@ -344 +345 @@
         return True
 
+def preprocess_config(config, rules):
+        "Preprocess configuration"
+        
+        varname_mode = 'CONFIG_BFB_MODE'
+        varname_width = 'CONFIG_BFB_WIDTH'
+        varname_height = 'CONFIG_BFB_HEIGHT'
+        
+        if varname_mode in config:
+                mode = config[varname_mode].partition('x')
+                
+                config[varname_width] = mode[0]
+                rules.append((varname_width, 'choice', 'Default framebuffer width', None, None))
+                
+                config[varname_height] = mode[2]
+                rules.append((varname_height, 'choice', 'Default framebuffer height', None, None))
+
 def create_output(mkname, mcname, config, rules):
         "Create output configuration"
@@ -504 +521 @@
         if (len(sys.argv) >= 3) and (sys.argv[2] == 'default'):
                 if (infer_verify_choices(config, rules)):
+                        preprocess_config(config, rules)
                         create_output(MAKEFILE, MACROS, config, rules)
                         return 0
@@ -517 +535 @@
                 
                 if (infer_verify_choices(config, rules)):
+                        preprocess_config(config, rules)
                         create_output(MAKEFILE, MACROS, config, rules)
                         return 0
@@ -564 +583 @@
                                 
                                 default = get_default_rule(rule)
-
+                                
                                 #
                                 # If we don't have a value but we do have
@@ -626 +645 @@
                 xtui.screen_done(screen)
         
+        preprocess_config(config, rules)
         create_output(MAKEFILE, MACROS, config, rules)
         return 0