Revert "global: Remove CONFIG_SYS_EXTRA_OPTIONS support"

Unfortunately, we require additional logic to buildman to support this
removal and still use SYS_SOC, etc, for build targets.

This reverts commit eeec00072d7a0b5b91896d014618e558ce438738.

Signed-off-by: Tom Rini <trini@konsulko.com>

1 files changed, 11 insertions, 1 deletions

diff --git a/tools/genboardscfg.py b/tools/genboardscfg.py
index ecdc166d7b9..07bf681d1d9 100755
--- a/tools/genboardscfg.py
+++ b/tools/genboardscfg.py
@@ -111,6 +111,7 @@ class KconfigScanner:
         'vendor' : 'SYS_VENDOR',
         'board' : 'SYS_BOARD',
         'config' : 'SYS_CONFIG_NAME',
+        'options' : 'SYS_EXTRA_OPTIONS'
     }
 
     def __init__(self):
@@ -148,6 +149,7 @@ class KconfigScanner:
               'board': <board_name>,
               'target': <target_name>,
               'config': <config_header_name>,
+              'options': <extra_options>
           }
         """
         # strip special prefixes and save it in a temporary file
@@ -183,6 +185,14 @@ class KconfigScanner:
         if params['arch'] == 'arm' and params['cpu'] == 'armv8':
             params['arch'] = 'aarch64'
 
+        # fix-up options field. It should have the form:
+        # <config name>[:comma separated config options]
+        if params['options'] != '-':
+            params['options'] = params['config'] + ':' + \
+                                params['options'].replace(r'\"', '"')
+        elif params['config'] != params['target']:
+            params['options'] = params['config']
+
         return params
 
 def scan_defconfigs_for_multiprocess(queue, defconfigs):
@@ -368,7 +378,7 @@ def format_and_output(params_list, output):
       output: The path to the output file
     """
     FIELDS = ('status', 'arch', 'cpu', 'soc', 'vendor', 'board', 'target',
-              'maintainers')
+              'options', 'maintainers')
 
     # First, decide the width of each column
     max_length = dict([ (f, 0) for f in FIELDS])