Blame view

tools/moveconfig.py 44.2 KB
5a27c7343   Masahiro Yamada   tools: moveconfig...
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
  #!/usr/bin/env python2
  #
  # Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  #
  # SPDX-License-Identifier:	GPL-2.0+
  #
  
  """
  Move config options from headers to defconfig files.
  
  Since Kconfig was introduced to U-Boot, we have worked on moving
  config options from headers to Kconfig (defconfig).
  
  This tool intends to help this tremendous work.
  
  
  Usage
  -----
b6ef393ad   Masahiro Yamada   tools: moveconfig...
19
  First, you must edit the Kconfig to add the menu entries for the configs
96464badc   Joe Hershberger   moveconfig: Alway...
20
  you are moving.
b6ef393ad   Masahiro Yamada   tools: moveconfig...
21
22
23
  And then run this tool giving CONFIG names you want to move.
  For example, if you want to move CONFIG_CMD_USB and CONFIG_SYS_TEXT_BASE,
  simply type as follows:
5a27c7343   Masahiro Yamada   tools: moveconfig...
24

b6ef393ad   Masahiro Yamada   tools: moveconfig...
25
    $ tools/moveconfig.py CONFIG_CMD_USB CONFIG_SYS_TEXT_BASE
5a27c7343   Masahiro Yamada   tools: moveconfig...
26

b6ef393ad   Masahiro Yamada   tools: moveconfig...
27
  The tool walks through all the defconfig files and move the given CONFIGs.
5a27c7343   Masahiro Yamada   tools: moveconfig...
28
29
  
  The log is also displayed on the terminal.
1d085568b   Masahiro Yamada   tools: moveconfig...
30
  The log is printed for each defconfig as follows:
5a27c7343   Masahiro Yamada   tools: moveconfig...
31

1d085568b   Masahiro Yamada   tools: moveconfig...
32
33
34
35
36
  <defconfig_name>
      <action1>
      <action2>
      <action3>
      ...
5a27c7343   Masahiro Yamada   tools: moveconfig...
37

1d085568b   Masahiro Yamada   tools: moveconfig...
38
39
40
  <defconfig_name> is the name of the defconfig.
  
  <action*> shows what the tool did for that defconfig.
c21fc7e22   Masahiro Yamada   treewide: fix "fo...
41
  It looks like one of the following:
5a27c7343   Masahiro Yamada   tools: moveconfig...
42
43
44
  
   - Move 'CONFIG_... '
     This config option was moved to the defconfig
cc008299f   Masahiro Yamada   tools: moveconfig...
45
   - CONFIG_... is not defined in Kconfig.  Do nothing.
916224c38   Masahiro Yamada   tools: moveconfig...
46
47
48
49
50
51
     The entry for this CONFIG was not found in Kconfig.  The option is not
     defined in the config header, either.  So, this case can be just skipped.
  
   - CONFIG_... is not defined in Kconfig (suspicious).  Do nothing.
     This option is defined in the config header, but its entry was not found
     in Kconfig.
cc008299f   Masahiro Yamada   tools: moveconfig...
52
53
54
55
     There are two common cases:
       - You forgot to create an entry for the CONFIG before running
         this tool, or made a typo in a CONFIG passed to this tool.
       - The entry was hidden due to unmet 'depends on'.
916224c38   Masahiro Yamada   tools: moveconfig...
56
57
     The tool does not know if the result is reasonable, so please check it
     manually.
cc008299f   Masahiro Yamada   tools: moveconfig...
58
59
60
61
  
   - 'CONFIG_...' is the same as the define in Kconfig.  Do nothing.
     The define in the config header matched the one in Kconfig.
     We do not need to touch it.
5a27c7343   Masahiro Yamada   tools: moveconfig...
62

90ed6cba5   Masahiro Yamada   tools: moveconfig...
63
64
65
66
67
68
   - Compiler is missing.  Do nothing.
     The compiler specified for this architecture was not found
     in your PATH environment.
     (If -e option is passed, the tool exits immediately.)
  
   - Failed to process.
5a27c7343   Masahiro Yamada   tools: moveconfig...
69
70
71
72
73
74
75
76
77
     An error occurred during processing this defconfig.  Skipped.
     (If -e option is passed, the tool exits immediately on error.)
  
  Finally, you will be asked, Clean up headers? [y/n]:
  
  If you say 'y' here, the unnecessary config defines are removed
  from the config headers (include/configs/*.h).
  It just uses the regex method, so you should not rely on it.
  Just in case, please do 'git diff' to see what happened.
b6ef393ad   Masahiro Yamada   tools: moveconfig...
78
79
  How does it work?
  -----------------
5a27c7343   Masahiro Yamada   tools: moveconfig...
80
81
82
83
84
85
  
  This tool runs configuration and builds include/autoconf.mk for every
  defconfig.  The config options defined in Kconfig appear in the .config
  file (unless they are hidden because of unmet dependency.)
  On the other hand, the config options defined by board headers are seen
  in include/autoconf.mk.  The tool looks for the specified options in both
b6ef393ad   Masahiro Yamada   tools: moveconfig...
86
87
88
89
90
  of them to decide the appropriate action for the options.  If the given
  config option is found in the .config, but its value does not match the
  one from the board header, the config option in the .config is replaced
  with the define in the board header.  Then, the .config is synced by
  "make savedefconfig" and the defconfig is updated with it.
5a27c7343   Masahiro Yamada   tools: moveconfig...
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
  
  For faster processing, this tool handles multi-threading.  It creates
  separate build directories where the out-of-tree build is run.  The
  temporary build directories are automatically created and deleted as
  needed.  The number of threads are chosen based on the number of the CPU
  cores of your system although you can change it via -j (--jobs) option.
  
  
  Toolchains
  ----------
  
  Appropriate toolchain are necessary to generate include/autoconf.mk
  for all the architectures supported by U-Boot.  Most of them are available
  at the kernel.org site, some are not provided by kernel.org.
  
  The default per-arch CROSS_COMPILE used by this tool is specified by
  the list below, CROSS_COMPILE.  You may wish to update the list to
  use your own.  Instead of modifying the list directly, you can give
  them via environments.
  
  
  Available options
  -----------------
  
   -c, --color
     Surround each portion of the log with escape sequences to display it
     in color on the terminal.
9ede21234   Simon Glass   moveconfig: Add a...
118
119
120
   -C, --commit
     Create a git commit with the changes when the operation is complete. A
     standard commit message is used which may need to be edited.
91040e853   Joe Hershberger   moveconfig: Add a...
121
   -d, --defconfigs
0dbc9b591   Masahiro Yamada   tools: moveconfig...
122
123
    Specify a file containing a list of defconfigs to move.  The defconfig
    files can be given with shell-style wildcards.
91040e853   Joe Hershberger   moveconfig: Add a...
124

5a27c7343   Masahiro Yamada   tools: moveconfig...
125
   -n, --dry-run
b6ef393ad   Masahiro Yamada   tools: moveconfig...
126
     Perform a trial run that does not make any changes.  It is useful to
5a27c7343   Masahiro Yamada   tools: moveconfig...
127
128
129
130
131
     see what is going to happen before one actually runs it.
  
   -e, --exit-on-error
     Exit immediately if Make exits with a non-zero status while processing
     a defconfig file.
8513dc048   Masahiro Yamada   tools: moveconfig...
132
133
134
135
   -s, --force-sync
     Do "make savedefconfig" forcibly for all the defconfig files.
     If not specified, "make savedefconfig" only occurs for cases
     where at least one CONFIG was moved.
07913d1e4   Masahiro Yamada   tools: moveconfig...
136
137
138
139
140
   -S, --spl
     Look for moved config options in spl/include/autoconf.mk instead of
     include/autoconf.mk.  This is useful for moving options for SPL build
     because SPL related options (mostly prefixed with CONFIG_SPL_) are
     sometimes blocked by CONFIG_SPL_BUILD ifdef conditionals.
2144f8804   Joe Hershberger   moveconfig: Add a...
141
142
   -H, --headers-only
     Only cleanup the headers; skip the defconfig processing
5a27c7343   Masahiro Yamada   tools: moveconfig...
143
144
145
   -j, --jobs
     Specify the number of threads to run simultaneously.  If not specified,
     the number of threads is the same as the number of CPU cores.
6b96c1a1c   Joe Hershberger   tools: moveconfig...
146
147
148
149
150
151
152
   -r, --git-ref
     Specify the git ref to clone for building the autoconf.mk. If unspecified
     use the CWD. This is useful for when changes to the Kconfig affect the
     default values and you want to capture the state of the defconfig from
     before that change was in effect. If in doubt, specify a ref pre-Kconfig
     changes (use HEAD if Kconfig changes are not committed). Worst case it will
     take a bit longer to run, but will always do the right thing.
95bf9c7e3   Joe Hershberger   moveconfig: Add a...
153
154
   -v, --verbose
     Show any build errors as boards are built
6b403dfd2   Simon Glass   moveconfig: Add a...
155
156
157
   -y, --yes
     Instead of prompting, automatically go ahead with all operations. This
     includes cleaning up headers and CONFIG_SYS_EXTRA_OPTIONS.
5a27c7343   Masahiro Yamada   tools: moveconfig...
158
159
160
161
162
  To see the complete list of supported options, run
  
    $ tools/moveconfig.py -h
  
  """
8ba1f5de4   Masahiro Yamada   tools: moveconfig...
163
  import copy
f2f6981a1   Masahiro Yamada   tools: moveconfig...
164
  import difflib
c8e1b10d0   Masahiro Yamada   tools: moveconfig...
165
  import filecmp
5a27c7343   Masahiro Yamada   tools: moveconfig...
166
  import fnmatch
0dbc9b591   Masahiro Yamada   tools: moveconfig...
167
  import glob
5a27c7343   Masahiro Yamada   tools: moveconfig...
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
  import multiprocessing
  import optparse
  import os
  import re
  import shutil
  import subprocess
  import sys
  import tempfile
  import time
  
  SHOW_GNU_MAKE = 'scripts/show-gnu-make'
  SLEEP_TIME=0.03
  
  # Here is the list of cross-tools I use.
  # Most of them are available at kernel.org
c21fc7e22   Masahiro Yamada   treewide: fix "fo...
183
  # (https://www.kernel.org/pub/tools/crosstool/files/bin/), except the following:
5a27c7343   Masahiro Yamada   tools: moveconfig...
184
185
  # arc: https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases
  # blackfin: http://sourceforge.net/projects/adi-toolchain/files/
4440ecece   Bin Meng   tools: moveconfig...
186
  # nds32: http://osdk.andestech.com/packages/nds32le-linux-glibc-v1.tgz
5a27c7343   Masahiro Yamada   tools: moveconfig...
187
188
  # nios2: https://sourcery.mentor.com/GNUToolchain/subscription42545
  # sh: http://sourcery.mentor.com/public/gnu_toolchain/sh-linux-gnu
e8aebc474   Bin Meng   tools: Update ope...
189
190
191
  #
  # openrisc kernel.org toolchain is out of date, download latest one from
  # http://opencores.org/or1k/OpenRISC_GNU_tool_chain#Prebuilt_versions
5a27c7343   Masahiro Yamada   tools: moveconfig...
192
193
194
195
196
197
198
199
200
201
202
  CROSS_COMPILE = {
      'arc': 'arc-linux-',
      'aarch64': 'aarch64-linux-',
      'arm': 'arm-unknown-linux-gnueabi-',
      'avr32': 'avr32-linux-',
      'blackfin': 'bfin-elf-',
      'm68k': 'm68k-linux-',
      'microblaze': 'microblaze-linux-',
      'mips': 'mips-linux-',
      'nds32': 'nds32le-linux-',
      'nios2': 'nios2-linux-gnu-',
e8aebc474   Bin Meng   tools: Update ope...
203
      'openrisc': 'or1k-elf-',
5a27c7343   Masahiro Yamada   tools: moveconfig...
204
205
206
      'powerpc': 'powerpc-linux-',
      'sh': 'sh-linux-gnu-',
      'sparc': 'sparc-linux-',
88e1346e3   Masahiro Yamada   tools: moveconfig...
207
208
      'x86': 'i386-linux-',
      'xtensa': 'xtensa-linux-'
5a27c7343   Masahiro Yamada   tools: moveconfig...
209
210
211
212
213
  }
  
  STATE_IDLE = 0
  STATE_DEFCONFIG = 1
  STATE_AUTOCONF = 2
96464badc   Joe Hershberger   moveconfig: Alway...
214
  STATE_SAVEDEFCONFIG = 3
5a27c7343   Masahiro Yamada   tools: moveconfig...
215
216
  
  ACTION_MOVE = 0
cc008299f   Masahiro Yamada   tools: moveconfig...
217
  ACTION_NO_ENTRY = 1
916224c38   Masahiro Yamada   tools: moveconfig...
218
219
  ACTION_NO_ENTRY_WARN = 2
  ACTION_NO_CHANGE = 3
5a27c7343   Masahiro Yamada   tools: moveconfig...
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
  
  COLOR_BLACK        = '0;30'
  COLOR_RED          = '0;31'
  COLOR_GREEN        = '0;32'
  COLOR_BROWN        = '0;33'
  COLOR_BLUE         = '0;34'
  COLOR_PURPLE       = '0;35'
  COLOR_CYAN         = '0;36'
  COLOR_LIGHT_GRAY   = '0;37'
  COLOR_DARK_GRAY    = '1;30'
  COLOR_LIGHT_RED    = '1;31'
  COLOR_LIGHT_GREEN  = '1;32'
  COLOR_YELLOW       = '1;33'
  COLOR_LIGHT_BLUE   = '1;34'
  COLOR_LIGHT_PURPLE = '1;35'
  COLOR_LIGHT_CYAN   = '1;36'
  COLOR_WHITE        = '1;37'
  
  ### helper functions ###
  def get_devnull():
      """Get the file object of '/dev/null' device."""
      try:
          devnull = subprocess.DEVNULL # py3k
      except AttributeError:
          devnull = open(os.devnull, 'wb')
      return devnull
  
  def check_top_directory():
      """Exit if we are not at the top of source directory."""
      for f in ('README', 'Licenses'):
          if not os.path.exists(f):
              sys.exit('Please run at the top of source directory.')
bd63e5baf   Masahiro Yamada   tools: moveconfig...
252
253
254
255
256
  def check_clean_directory():
      """Exit if the source tree is not clean."""
      for f in ('.config', 'include/config'):
          if os.path.exists(f):
              sys.exit("source tree is not clean, please run 'make mrproper'")
5a27c7343   Masahiro Yamada   tools: moveconfig...
257
258
259
260
261
262
263
264
265
266
267
268
  def get_make_cmd():
      """Get the command name of GNU Make.
  
      U-Boot needs GNU Make for building, but the command name is not
      necessarily "make". (for example, "gmake" on FreeBSD).
      Returns the most appropriate command name on your system.
      """
      process = subprocess.Popen([SHOW_GNU_MAKE], stdout=subprocess.PIPE)
      ret = process.communicate()
      if process.returncode:
          sys.exit('GNU Make not found')
      return ret[0].rstrip()
0dbc9b591   Masahiro Yamada   tools: moveconfig...
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
  def get_matched_defconfigs(defconfigs_file):
      """Get all the defconfig files that match the patterns in a file."""
      defconfigs = []
      for i, line in enumerate(open(defconfigs_file)):
          line = line.strip()
          if not line:
              continue # skip blank lines silently
          pattern = os.path.join('configs', line)
          matched = glob.glob(pattern) + glob.glob(pattern + '_defconfig')
          if not matched:
              print >> sys.stderr, "warning: %s:%d: no defconfig matched '%s'" % \
                                                   (defconfigs_file, i + 1, line)
  
          defconfigs += matched
  
      # use set() to drop multiple matching
      return [ defconfig[len('configs') + 1:]  for defconfig in set(defconfigs) ]
684c306ec   Masahiro Yamada   tools: moveconfig...
286
287
288
289
290
291
292
293
294
  def get_all_defconfigs():
      """Get all the defconfig files under the configs/ directory."""
      defconfigs = []
      for (dirpath, dirnames, filenames) in os.walk('configs'):
          dirpath = dirpath[len('configs') + 1:]
          for filename in fnmatch.filter(filenames, '*_defconfig'):
              defconfigs.append(os.path.join(dirpath, filename))
  
      return defconfigs
5a27c7343   Masahiro Yamada   tools: moveconfig...
295
296
297
  def color_text(color_enabled, color, string):
      """Return colored string."""
      if color_enabled:
1d085568b   Masahiro Yamada   tools: moveconfig...
298
299
300
301
302
303
          # LF should not be surrounded by the escape sequence.
          # Otherwise, additional whitespace or line-feed might be printed.
          return '
  '.join([ '\033[' + color + 'm' + s + '\033[0m' if s else ''
                             for s in string.split('
  ') ])
5a27c7343   Masahiro Yamada   tools: moveconfig...
304
305
      else:
          return string
e9ea12215   Masahiro Yamada   tools: moveconfig...
306
  def show_diff(a, b, file_path, color_enabled):
f2f6981a1   Masahiro Yamada   tools: moveconfig...
307
308
309
310
311
312
      """Show unidified diff.
  
      Arguments:
        a: A list of lines (before)
        b: A list of lines (after)
        file_path: Path to the file
e9ea12215   Masahiro Yamada   tools: moveconfig...
313
        color_enabled: Display the diff in color
f2f6981a1   Masahiro Yamada   tools: moveconfig...
314
315
316
317
318
319
320
      """
  
      diff = difflib.unified_diff(a, b,
                                  fromfile=os.path.join('a', file_path),
                                  tofile=os.path.join('b', file_path))
  
      for line in diff:
e9ea12215   Masahiro Yamada   tools: moveconfig...
321
322
323
324
325
326
          if line[0] == '-' and line[1] != '-':
              print color_text(color_enabled, COLOR_RED, line),
          elif line[0] == '+' and line[1] != '+':
              print color_text(color_enabled, COLOR_GREEN, line),
          else:
              print line,
f2f6981a1   Masahiro Yamada   tools: moveconfig...
327

90ed6cba5   Masahiro Yamada   tools: moveconfig...
328
  def update_cross_compile(color_enabled):
1cc0a9f49   Robert P. J. Day   Fix various typos...
329
      """Update per-arch CROSS_COMPILE via environment variables
5a27c7343   Masahiro Yamada   tools: moveconfig...
330
331
332
  
      The default CROSS_COMPILE values are available
      in the CROSS_COMPILE list above.
1cc0a9f49   Robert P. J. Day   Fix various typos...
333
      You can override them via environment variables
5a27c7343   Masahiro Yamada   tools: moveconfig...
334
335
336
337
338
339
340
      CROSS_COMPILE_{ARCH}.
  
      For example, if you want to override toolchain prefixes
      for ARM and PowerPC, you can do as follows in your shell:
  
      export CROSS_COMPILE_ARM=...
      export CROSS_COMPILE_POWERPC=...
90ed6cba5   Masahiro Yamada   tools: moveconfig...
341
342
343
  
      Then, this function checks if specified compilers really exist in your
      PATH environment.
5a27c7343   Masahiro Yamada   tools: moveconfig...
344
345
346
347
348
349
350
351
352
353
354
355
356
      """
      archs = []
  
      for arch in os.listdir('arch'):
          if os.path.exists(os.path.join('arch', arch, 'Makefile')):
              archs.append(arch)
  
      # arm64 is a special case
      archs.append('aarch64')
  
      for arch in archs:
          env = 'CROSS_COMPILE_' + arch.upper()
          cross_compile = os.environ.get(env)
90ed6cba5   Masahiro Yamada   tools: moveconfig...
357
358
359
360
361
362
363
364
365
366
367
368
369
370
          if not cross_compile:
              cross_compile = CROSS_COMPILE.get(arch, '')
  
          for path in os.environ["PATH"].split(os.pathsep):
              gcc_path = os.path.join(path, cross_compile + 'gcc')
              if os.path.isfile(gcc_path) and os.access(gcc_path, os.X_OK):
                  break
          else:
              print >> sys.stderr, color_text(color_enabled, COLOR_YELLOW,
                   'warning: %sgcc: not found in PATH.  %s architecture boards will be skipped'
                                              % (cross_compile, arch))
              cross_compile = None
  
          CROSS_COMPILE[arch] = cross_compile
5a27c7343   Masahiro Yamada   tools: moveconfig...
371

8ba1f5de4   Masahiro Yamada   tools: moveconfig...
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
  def extend_matched_lines(lines, matched, pre_patterns, post_patterns, extend_pre,
                           extend_post):
      """Extend matched lines if desired patterns are found before/after already
      matched lines.
  
      Arguments:
        lines: A list of lines handled.
        matched: A list of line numbers that have been already matched.
                 (will be updated by this function)
        pre_patterns: A list of regular expression that should be matched as
                      preamble.
        post_patterns: A list of regular expression that should be matched as
                       postamble.
        extend_pre: Add the line number of matched preamble to the matched list.
        extend_post: Add the line number of matched postamble to the matched list.
      """
      extended_matched = []
  
      j = matched[0]
  
      for i in matched:
          if i == 0 or i < j:
              continue
          j = i
          while j in matched:
              j += 1
          if j >= len(lines):
              break
  
          for p in pre_patterns:
              if p.search(lines[i - 1]):
                  break
          else:
              # not matched
              continue
  
          for p in post_patterns:
              if p.search(lines[j]):
                  break
          else:
              # not matched
              continue
  
          if extend_pre:
              extended_matched.append(i - 1)
          if extend_post:
              extended_matched.append(j)
  
      matched += extended_matched
      matched.sort()
e9ea12215   Masahiro Yamada   tools: moveconfig...
422
  def cleanup_one_header(header_path, patterns, options):
5a27c7343   Masahiro Yamada   tools: moveconfig...
423
424
425
426
427
428
      """Clean regex-matched lines away from a file.
  
      Arguments:
        header_path: path to the cleaned file.
        patterns: list of regex patterns.  Any lines matching to these
                  patterns are deleted.
e9ea12215   Masahiro Yamada   tools: moveconfig...
429
        options: option flags.
5a27c7343   Masahiro Yamada   tools: moveconfig...
430
431
432
433
434
435
      """
      with open(header_path) as f:
          lines = f.readlines()
  
      matched = []
      for i, line in enumerate(lines):
a3a779f7f   Masahiro Yamada   tools: moveconfig...
436
437
438
439
          if i - 1 in matched and lines[i - 1][-2:] == '\\
  ':
              matched.append(i)
              continue
5a27c7343   Masahiro Yamada   tools: moveconfig...
440
          for pattern in patterns:
8ba1f5de4   Masahiro Yamada   tools: moveconfig...
441
              if pattern.search(line):
5a27c7343   Masahiro Yamada   tools: moveconfig...
442
443
                  matched.append(i)
                  break
8ba1f5de4   Masahiro Yamada   tools: moveconfig...
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
      if not matched:
          return
  
      # remove empty #ifdef ... #endif, successive blank lines
      pattern_if = re.compile(r'#\s*if(def|ndef)?\W') #  #if, #ifdef, #ifndef
      pattern_elif = re.compile(r'#\s*el(if|se)\W')   #  #elif, #else
      pattern_endif = re.compile(r'#\s*endif\W')      #  #endif
      pattern_blank = re.compile(r'^\s*$')            #  empty line
  
      while True:
          old_matched = copy.copy(matched)
          extend_matched_lines(lines, matched, [pattern_if],
                               [pattern_endif], True, True)
          extend_matched_lines(lines, matched, [pattern_elif],
                               [pattern_elif, pattern_endif], True, False)
          extend_matched_lines(lines, matched, [pattern_if, pattern_elif],
                               [pattern_blank], False, True)
          extend_matched_lines(lines, matched, [pattern_blank],
                               [pattern_elif, pattern_endif], True, False)
          extend_matched_lines(lines, matched, [pattern_blank],
                               [pattern_blank], True, False)
          if matched == old_matched:
              break
f2f6981a1   Masahiro Yamada   tools: moveconfig...
467
468
469
470
      tolines = copy.copy(lines)
  
      for i in reversed(matched):
          tolines.pop(i)
e9ea12215   Masahiro Yamada   tools: moveconfig...
471
      show_diff(lines, tolines, header_path, options.color)
8ba1f5de4   Masahiro Yamada   tools: moveconfig...
472

e9ea12215   Masahiro Yamada   tools: moveconfig...
473
      if options.dry_run:
5a27c7343   Masahiro Yamada   tools: moveconfig...
474
475
476
          return
  
      with open(header_path, 'w') as f:
f2f6981a1   Masahiro Yamada   tools: moveconfig...
477
478
          for line in tolines:
              f.write(line)
5a27c7343   Masahiro Yamada   tools: moveconfig...
479

e9ea12215   Masahiro Yamada   tools: moveconfig...
480
  def cleanup_headers(configs, options):
5a27c7343   Masahiro Yamada   tools: moveconfig...
481
482
483
      """Delete config defines from board headers.
  
      Arguments:
b134bc135   Masahiro Yamada   tools: moveconfig...
484
        configs: A list of CONFIGs to remove.
e9ea12215   Masahiro Yamada   tools: moveconfig...
485
        options: option flags.
5a27c7343   Masahiro Yamada   tools: moveconfig...
486
      """
6b403dfd2   Simon Glass   moveconfig: Add a...
487
488
489
490
491
492
      if not options.yes:
          while True:
              choice = raw_input('Clean up headers? [y/n]: ').lower()
              print choice
              if choice == 'y' or choice == 'n':
                  break
5a27c7343   Masahiro Yamada   tools: moveconfig...
493

6b403dfd2   Simon Glass   moveconfig: Add a...
494
495
          if choice == 'n':
              return
5a27c7343   Masahiro Yamada   tools: moveconfig...
496
497
  
      patterns = []
b134bc135   Masahiro Yamada   tools: moveconfig...
498
      for config in configs:
5a27c7343   Masahiro Yamada   tools: moveconfig...
499
500
          patterns.append(re.compile(r'#\s*define\s+%s\W' % config))
          patterns.append(re.compile(r'#\s*undef\s+%s\W' % config))
60727f514   Joe Hershberger   moveconfig: Clean...
501
502
      for dir in 'include', 'arch', 'board':
          for (dirpath, dirnames, filenames) in os.walk(dir):
dc6de50bd   Masahiro Yamada   tools: moveconfig...
503
504
              if dirpath == os.path.join('include', 'generated'):
                  continue
60727f514   Joe Hershberger   moveconfig: Clean...
505
506
507
              for filename in filenames:
                  if not fnmatch.fnmatch(filename, '*~'):
                      cleanup_one_header(os.path.join(dirpath, filename),
e9ea12215   Masahiro Yamada   tools: moveconfig...
508
                                         patterns, options)
5a27c7343   Masahiro Yamada   tools: moveconfig...
509

9ab0296a8   Masahiro Yamada   tools: moveconfig...
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
  def cleanup_one_extra_option(defconfig_path, configs, options):
      """Delete config defines in CONFIG_SYS_EXTRA_OPTIONS in one defconfig file.
  
      Arguments:
        defconfig_path: path to the cleaned defconfig file.
        configs: A list of CONFIGs to remove.
        options: option flags.
      """
  
      start = 'CONFIG_SYS_EXTRA_OPTIONS="'
      end = '"
  '
  
      with open(defconfig_path) as f:
          lines = f.readlines()
  
      for i, line in enumerate(lines):
          if line.startswith(start) and line.endswith(end):
              break
      else:
          # CONFIG_SYS_EXTRA_OPTIONS was not found in this defconfig
          return
  
      old_tokens = line[len(start):-len(end)].split(',')
      new_tokens = []
  
      for token in old_tokens:
          pos = token.find('=')
          if not (token[:pos] if pos >= 0 else token) in configs:
              new_tokens.append(token)
  
      if new_tokens == old_tokens:
          return
  
      tolines = copy.copy(lines)
  
      if new_tokens:
          tolines[i] = start + ','.join(new_tokens) + end
      else:
          tolines.pop(i)
  
      show_diff(lines, tolines, defconfig_path, options.color)
  
      if options.dry_run:
          return
  
      with open(defconfig_path, 'w') as f:
          for line in tolines:
              f.write(line)
  
  def cleanup_extra_options(configs, options):
      """Delete config defines in CONFIG_SYS_EXTRA_OPTIONS in defconfig files.
  
      Arguments:
        configs: A list of CONFIGs to remove.
        options: option flags.
      """
6b403dfd2   Simon Glass   moveconfig: Add a...
567
568
569
570
571
572
573
      if not options.yes:
          while True:
              choice = (raw_input('Clean up CONFIG_SYS_EXTRA_OPTIONS? [y/n]: ').
                        lower())
              print choice
              if choice == 'y' or choice == 'n':
                  break
9ab0296a8   Masahiro Yamada   tools: moveconfig...
574

6b403dfd2   Simon Glass   moveconfig: Add a...
575
576
          if choice == 'n':
              return
9ab0296a8   Masahiro Yamada   tools: moveconfig...
577
578
579
580
581
582
583
584
  
      configs = [ config[len('CONFIG_'):] for config in configs ]
  
      defconfigs = get_all_defconfigs()
  
      for defconfig in defconfigs:
          cleanup_one_extra_option(os.path.join('configs', defconfig), configs,
                                   options)
5a27c7343   Masahiro Yamada   tools: moveconfig...
585
  ### classes ###
c5e60fd49   Masahiro Yamada   tools: moveconfig...
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
  class Progress:
  
      """Progress Indicator"""
  
      def __init__(self, total):
          """Create a new progress indicator.
  
          Arguments:
            total: A number of defconfig files to process.
          """
          self.current = 0
          self.total = total
  
      def inc(self):
          """Increment the number of processed defconfig files."""
  
          self.current += 1
  
      def show(self):
          """Display the progress."""
          print ' %d defconfigs out of %d\r' % (self.current, self.total),
          sys.stdout.flush()
5a27c7343   Masahiro Yamada   tools: moveconfig...
608
609
610
611
612
613
  class KconfigParser:
  
      """A parser of .config and include/autoconf.mk."""
  
      re_arch = re.compile(r'CONFIG_SYS_ARCH="(.*)"')
      re_cpu = re.compile(r'CONFIG_SYS_CPU="(.*)"')
522e8dcb4   Masahiro Yamada   tools: moveconfig...
614
      def __init__(self, configs, options, build_dir):
5a27c7343   Masahiro Yamada   tools: moveconfig...
615
616
617
          """Create a new parser.
  
          Arguments:
b134bc135   Masahiro Yamada   tools: moveconfig...
618
            configs: A list of CONFIGs to move.
5a27c7343   Masahiro Yamada   tools: moveconfig...
619
620
621
            options: option flags.
            build_dir: Build directory.
          """
b134bc135   Masahiro Yamada   tools: moveconfig...
622
          self.configs = configs
5a27c7343   Masahiro Yamada   tools: moveconfig...
623
          self.options = options
1f16992ee   Masahiro Yamada   tools: moveconfig...
624
625
          self.dotconfig = os.path.join(build_dir, '.config')
          self.autoconf = os.path.join(build_dir, 'include', 'autoconf.mk')
07913d1e4   Masahiro Yamada   tools: moveconfig...
626
627
          self.spl_autoconf = os.path.join(build_dir, 'spl', 'include',
                                           'autoconf.mk')
1f16992ee   Masahiro Yamada   tools: moveconfig...
628
629
          self.config_autoconf = os.path.join(build_dir, 'include', 'config',
                                              'auto.conf')
5da4f857b   Masahiro Yamada   tools: moveconfig...
630
          self.defconfig = os.path.join(build_dir, 'defconfig')
5a27c7343   Masahiro Yamada   tools: moveconfig...
631
632
633
634
635
636
  
      def get_cross_compile(self):
          """Parse .config file and return CROSS_COMPILE.
  
          Returns:
            A string storing the compiler prefix for the architecture.
90ed6cba5   Masahiro Yamada   tools: moveconfig...
637
638
639
640
            Return a NULL string for architectures that do not require
            compiler prefix (Sandbox and native build is the case).
            Return None if the specified compiler is missing in your PATH.
            Caller should distinguish '' and None.
5a27c7343   Masahiro Yamada   tools: moveconfig...
641
642
643
          """
          arch = ''
          cpu = ''
1f16992ee   Masahiro Yamada   tools: moveconfig...
644
          for line in open(self.dotconfig):
5a27c7343   Masahiro Yamada   tools: moveconfig...
645
646
647
648
649
650
651
              m = self.re_arch.match(line)
              if m:
                  arch = m.group(1)
                  continue
              m = self.re_cpu.match(line)
              if m:
                  cpu = m.group(1)
90ed6cba5   Masahiro Yamada   tools: moveconfig...
652
653
          if not arch:
              return None
5a27c7343   Masahiro Yamada   tools: moveconfig...
654
655
656
657
  
          # fix-up for aarch64
          if arch == 'arm' and cpu == 'armv8':
              arch = 'aarch64'
90ed6cba5   Masahiro Yamada   tools: moveconfig...
658
          return CROSS_COMPILE.get(arch, None)
5a27c7343   Masahiro Yamada   tools: moveconfig...
659

b134bc135   Masahiro Yamada   tools: moveconfig...
660
      def parse_one_config(self, config, dotconfig_lines, autoconf_lines):
5a27c7343   Masahiro Yamada   tools: moveconfig...
661
662
663
664
665
666
667
          """Parse .config, defconfig, include/autoconf.mk for one config.
  
          This function looks for the config options in the lines from
          defconfig, .config, and include/autoconf.mk in order to decide
          which action should be taken for this defconfig.
  
          Arguments:
b134bc135   Masahiro Yamada   tools: moveconfig...
668
            config: CONFIG name to parse.
cc008299f   Masahiro Yamada   tools: moveconfig...
669
            dotconfig_lines: lines from the .config file.
5a27c7343   Masahiro Yamada   tools: moveconfig...
670
671
672
673
674
675
            autoconf_lines: lines from the include/autoconf.mk file.
  
          Returns:
            A tupple of the action for this defconfig and the line
            matched for the config.
          """
5a27c7343   Masahiro Yamada   tools: moveconfig...
676
          not_set = '# %s is not set' % config
5a27c7343   Masahiro Yamada   tools: moveconfig...
677
678
679
          for line in autoconf_lines:
              line = line.rstrip()
              if line.startswith(config + '='):
cc008299f   Masahiro Yamada   tools: moveconfig...
680
                  new_val = line
5a27c7343   Masahiro Yamada   tools: moveconfig...
681
                  break
5a27c7343   Masahiro Yamada   tools: moveconfig...
682
          else:
cc008299f   Masahiro Yamada   tools: moveconfig...
683
              new_val = not_set
916224c38   Masahiro Yamada   tools: moveconfig...
684
685
686
687
688
689
690
691
692
693
          for line in dotconfig_lines:
              line = line.rstrip()
              if line.startswith(config + '=') or line == not_set:
                  old_val = line
                  break
          else:
              if new_val == not_set:
                  return (ACTION_NO_ENTRY, config)
              else:
                  return (ACTION_NO_ENTRY_WARN, config)
cc008299f   Masahiro Yamada   tools: moveconfig...
694
695
696
697
698
699
700
          # If this CONFIG is neither bool nor trisate
          if old_val[-2:] != '=y' and old_val[-2:] != '=m' and old_val != not_set:
              # tools/scripts/define2mk.sed changes '1' to 'y'.
              # This is a problem if the CONFIG is int type.
              # Check the type in Kconfig and handle it correctly.
              if new_val[-2:] == '=y':
                  new_val = new_val[:-1] + '1'
5a27c7343   Masahiro Yamada   tools: moveconfig...
701

5030159e2   Masahiro Yamada   tools: moveconfig...
702
703
          return (ACTION_NO_CHANGE if old_val == new_val else ACTION_MOVE,
                  new_val)
5a27c7343   Masahiro Yamada   tools: moveconfig...
704

1d085568b   Masahiro Yamada   tools: moveconfig...
705
      def update_dotconfig(self):
6ff36d217   Masahiro Yamada   tools: moveconfig...
706
          """Parse files for the config options and update the .config.
5a27c7343   Masahiro Yamada   tools: moveconfig...
707

cc008299f   Masahiro Yamada   tools: moveconfig...
708
709
          This function parses the generated .config and include/autoconf.mk
          searching the target options.
6ff36d217   Masahiro Yamada   tools: moveconfig...
710
          Move the config option(s) to the .config as needed.
5a27c7343   Masahiro Yamada   tools: moveconfig...
711
712
713
  
          Arguments:
            defconfig: defconfig name.
522e8dcb4   Masahiro Yamada   tools: moveconfig...
714
715
  
          Returns:
7fb0bacd3   Masahiro Yamada   tools: moveconfig...
716
717
718
            Return a tuple of (updated flag, log string).
            The "updated flag" is True if the .config was updated, False
            otherwise.  The "log string" shows what happend to the .config.
5a27c7343   Masahiro Yamada   tools: moveconfig...
719
          """
5a27c7343   Masahiro Yamada   tools: moveconfig...
720
          results = []
7fb0bacd3   Masahiro Yamada   tools: moveconfig...
721
          updated = False
916224c38   Masahiro Yamada   tools: moveconfig...
722
          suspicious = False
07913d1e4   Masahiro Yamada   tools: moveconfig...
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
          rm_files = [self.config_autoconf, self.autoconf]
  
          if self.options.spl:
              if os.path.exists(self.spl_autoconf):
                  autoconf_path = self.spl_autoconf
                  rm_files.append(self.spl_autoconf)
              else:
                  for f in rm_files:
                      os.remove(f)
                  return (updated, suspicious,
                          color_text(self.options.color, COLOR_BROWN,
                                     "SPL is not enabled.  Skipped.") + '
  ')
          else:
              autoconf_path = self.autoconf
5a27c7343   Masahiro Yamada   tools: moveconfig...
738

1f16992ee   Masahiro Yamada   tools: moveconfig...
739
          with open(self.dotconfig) as f:
cc008299f   Masahiro Yamada   tools: moveconfig...
740
              dotconfig_lines = f.readlines()
5a27c7343   Masahiro Yamada   tools: moveconfig...
741

07913d1e4   Masahiro Yamada   tools: moveconfig...
742
          with open(autoconf_path) as f:
5a27c7343   Masahiro Yamada   tools: moveconfig...
743
              autoconf_lines = f.readlines()
b134bc135   Masahiro Yamada   tools: moveconfig...
744
745
          for config in self.configs:
              result = self.parse_one_config(config, dotconfig_lines,
96464badc   Joe Hershberger   moveconfig: Alway...
746
                                             autoconf_lines)
5a27c7343   Masahiro Yamada   tools: moveconfig...
747
748
749
750
751
752
753
754
              results.append(result)
  
          log = ''
  
          for (action, value) in results:
              if action == ACTION_MOVE:
                  actlog = "Move '%s'" % value
                  log_color = COLOR_LIGHT_GREEN
cc008299f   Masahiro Yamada   tools: moveconfig...
755
756
              elif action == ACTION_NO_ENTRY:
                  actlog = "%s is not defined in Kconfig.  Do nothing." % value
5a27c7343   Masahiro Yamada   tools: moveconfig...
757
                  log_color = COLOR_LIGHT_BLUE
916224c38   Masahiro Yamada   tools: moveconfig...
758
759
760
761
              elif action == ACTION_NO_ENTRY_WARN:
                  actlog = "%s is not defined in Kconfig (suspicious).  Do nothing." % value
                  log_color = COLOR_YELLOW
                  suspicious = True
cc008299f   Masahiro Yamada   tools: moveconfig...
762
763
764
              elif action == ACTION_NO_CHANGE:
                  actlog = "'%s' is the same as the define in Kconfig.  Do nothing." \
                           % value
5a27c7343   Masahiro Yamada   tools: moveconfig...
765
                  log_color = COLOR_LIGHT_PURPLE
07913d1e4   Masahiro Yamada   tools: moveconfig...
766
767
768
              elif action == ACTION_SPL_NOT_EXIST:
                  actlog = "SPL is not enabled for this defconfig.  Skip."
                  log_color = COLOR_PURPLE
5a27c7343   Masahiro Yamada   tools: moveconfig...
769
770
              else:
                  sys.exit("Internal Error. This should not happen.")
1d085568b   Masahiro Yamada   tools: moveconfig...
771
772
              log += color_text(self.options.color, log_color, actlog) + '
  '
5a27c7343   Masahiro Yamada   tools: moveconfig...
773

1f16992ee   Masahiro Yamada   tools: moveconfig...
774
          with open(self.dotconfig, 'a') as f:
e423d17fc   Masahiro Yamada   tools: moveconfig...
775
776
777
778
              for (action, value) in results:
                  if action == ACTION_MOVE:
                      f.write(value + '
  ')
7fb0bacd3   Masahiro Yamada   tools: moveconfig...
779
                      updated = True
5a27c7343   Masahiro Yamada   tools: moveconfig...
780

5da4f857b   Masahiro Yamada   tools: moveconfig...
781
          self.results = results
07913d1e4   Masahiro Yamada   tools: moveconfig...
782
783
          for f in rm_files:
              os.remove(f)
5a27c7343   Masahiro Yamada   tools: moveconfig...
784

916224c38   Masahiro Yamada   tools: moveconfig...
785
          return (updated, suspicious, log)
522e8dcb4   Masahiro Yamada   tools: moveconfig...
786

5da4f857b   Masahiro Yamada   tools: moveconfig...
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
      def check_defconfig(self):
          """Check the defconfig after savedefconfig
  
          Returns:
            Return additional log if moved CONFIGs were removed again by
            'make savedefconfig'.
          """
  
          log = ''
  
          with open(self.defconfig) as f:
              defconfig_lines = f.readlines()
  
          for (action, value) in self.results:
              if action != ACTION_MOVE:
                  continue
              if not value + '
  ' in defconfig_lines:
                  log += color_text(self.options.color, COLOR_YELLOW,
                                    "'%s' was removed by savedefconfig.
  " %
                                    value)
  
          return log
5a27c7343   Masahiro Yamada   tools: moveconfig...
811
812
813
814
815
816
817
818
  class Slot:
  
      """A slot to store a subprocess.
  
      Each instance of this class handles one subprocess.
      This class is useful to control multiple threads
      for faster processing.
      """
6b96c1a1c   Joe Hershberger   tools: moveconfig...
819
      def __init__(self, configs, options, progress, devnull, make_cmd, reference_src_dir):
5a27c7343   Masahiro Yamada   tools: moveconfig...
820
821
822
          """Create a new process slot.
  
          Arguments:
b134bc135   Masahiro Yamada   tools: moveconfig...
823
            configs: A list of CONFIGs to move.
5a27c7343   Masahiro Yamada   tools: moveconfig...
824
            options: option flags.
c5e60fd49   Masahiro Yamada   tools: moveconfig...
825
            progress: A progress indicator.
5a27c7343   Masahiro Yamada   tools: moveconfig...
826
827
            devnull: A file object of '/dev/null'.
            make_cmd: command name of GNU Make.
6b96c1a1c   Joe Hershberger   tools: moveconfig...
828
829
            reference_src_dir: Determine the true starting config state from this
                               source tree.
5a27c7343   Masahiro Yamada   tools: moveconfig...
830
831
          """
          self.options = options
c5e60fd49   Masahiro Yamada   tools: moveconfig...
832
          self.progress = progress
5a27c7343   Masahiro Yamada   tools: moveconfig...
833
834
835
          self.build_dir = tempfile.mkdtemp()
          self.devnull = devnull
          self.make_cmd = (make_cmd, 'O=' + self.build_dir)
6b96c1a1c   Joe Hershberger   tools: moveconfig...
836
          self.reference_src_dir = reference_src_dir
522e8dcb4   Masahiro Yamada   tools: moveconfig...
837
          self.parser = KconfigParser(configs, options, self.build_dir)
5a27c7343   Masahiro Yamada   tools: moveconfig...
838
          self.state = STATE_IDLE
09c6c0668   Masahiro Yamada   tools: moveconfig...
839
840
          self.failed_boards = set()
          self.suspicious_boards = set()
5a27c7343   Masahiro Yamada   tools: moveconfig...
841
842
843
844
845
846
  
      def __del__(self):
          """Delete the working directory
  
          This function makes sure the temporary directory is cleaned away
          even if Python suddenly dies due to error.  It should be done in here
f2dae751f   Joe Hershberger   tools: moveconfig...
847
          because it is guaranteed the destructor is always invoked when the
5a27c7343   Masahiro Yamada   tools: moveconfig...
848
849
850
851
852
853
854
855
          instance of the class gets unreferenced.
  
          If the subprocess is still running, wait until it finishes.
          """
          if self.state != STATE_IDLE:
              while self.ps.poll() == None:
                  pass
          shutil.rmtree(self.build_dir)
c5e60fd49   Masahiro Yamada   tools: moveconfig...
856
      def add(self, defconfig):
5a27c7343   Masahiro Yamada   tools: moveconfig...
857
858
859
860
861
862
863
864
865
866
867
868
869
870
          """Assign a new subprocess for defconfig and add it to the slot.
  
          If the slot is vacant, create a new subprocess for processing the
          given defconfig and add it to the slot.  Just returns False if
          the slot is occupied (i.e. the current subprocess is still running).
  
          Arguments:
            defconfig: defconfig name.
  
          Returns:
            Return True on success or False on failure
          """
          if self.state != STATE_IDLE:
              return False
e307fa9d8   Masahiro Yamada   tools: moveconfig...
871

5a27c7343   Masahiro Yamada   tools: moveconfig...
872
          self.defconfig = defconfig
1d085568b   Masahiro Yamada   tools: moveconfig...
873
          self.log = ''
f432c33f2   Masahiro Yamada   tools: moveconfig...
874
          self.current_src_dir = self.reference_src_dir
e307fa9d8   Masahiro Yamada   tools: moveconfig...
875
          self.do_defconfig()
5a27c7343   Masahiro Yamada   tools: moveconfig...
876
877
878
879
880
881
882
883
884
          return True
  
      def poll(self):
          """Check the status of the subprocess and handle it as needed.
  
          Returns True if the slot is vacant (i.e. in idle state).
          If the configuration is successfully finished, assign a new
          subprocess to build include/autoconf.mk.
          If include/autoconf.mk is generated, invoke the parser to
7fb0bacd3   Masahiro Yamada   tools: moveconfig...
885
886
887
888
889
          parse the .config and the include/autoconf.mk, moving
          config options to the .config as needed.
          If the .config was updated, run "make savedefconfig" to sync
          it, update the original defconfig, and then set the slot back
          to the idle state.
5a27c7343   Masahiro Yamada   tools: moveconfig...
890
891
892
893
894
895
896
897
898
899
900
  
          Returns:
            Return True if the subprocess is terminated, False otherwise
          """
          if self.state == STATE_IDLE:
              return True
  
          if self.ps.poll() == None:
              return False
  
          if self.ps.poll() != 0:
e307fa9d8   Masahiro Yamada   tools: moveconfig...
901
902
              self.handle_error()
          elif self.state == STATE_DEFCONFIG:
f432c33f2   Masahiro Yamada   tools: moveconfig...
903
              if self.reference_src_dir and not self.current_src_dir:
6b96c1a1c   Joe Hershberger   tools: moveconfig...
904
905
906
                  self.do_savedefconfig()
              else:
                  self.do_autoconf()
e307fa9d8   Masahiro Yamada   tools: moveconfig...
907
          elif self.state == STATE_AUTOCONF:
f432c33f2   Masahiro Yamada   tools: moveconfig...
908
909
              if self.current_src_dir:
                  self.current_src_dir = None
6b96c1a1c   Joe Hershberger   tools: moveconfig...
910
911
912
                  self.do_defconfig()
              else:
                  self.do_savedefconfig()
e307fa9d8   Masahiro Yamada   tools: moveconfig...
913
914
915
916
          elif self.state == STATE_SAVEDEFCONFIG:
              self.update_defconfig()
          else:
              sys.exit("Internal Error. This should not happen.")
5a27c7343   Masahiro Yamada   tools: moveconfig...
917

e307fa9d8   Masahiro Yamada   tools: moveconfig...
918
          return True if self.state == STATE_IDLE else False
96464badc   Joe Hershberger   moveconfig: Alway...
919

e307fa9d8   Masahiro Yamada   tools: moveconfig...
920
921
      def handle_error(self):
          """Handle error cases."""
8513dc048   Masahiro Yamada   tools: moveconfig...
922

e307fa9d8   Masahiro Yamada   tools: moveconfig...
923
924
925
926
927
928
929
          self.log += color_text(self.options.color, COLOR_LIGHT_RED,
                                 "Failed to process.
  ")
          if self.options.verbose:
              self.log += color_text(self.options.color, COLOR_LIGHT_CYAN,
                                     self.ps.stderr.read())
          self.finish(False)
96464badc   Joe Hershberger   moveconfig: Alway...
930

e307fa9d8   Masahiro Yamada   tools: moveconfig...
931
932
      def do_defconfig(self):
          """Run 'make <board>_defconfig' to create the .config file."""
c8e1b10d0   Masahiro Yamada   tools: moveconfig...
933

e307fa9d8   Masahiro Yamada   tools: moveconfig...
934
935
936
          cmd = list(self.make_cmd)
          cmd.append(self.defconfig)
          self.ps = subprocess.Popen(cmd, stdout=self.devnull,
f432c33f2   Masahiro Yamada   tools: moveconfig...
937
938
                                     stderr=subprocess.PIPE,
                                     cwd=self.current_src_dir)
e307fa9d8   Masahiro Yamada   tools: moveconfig...
939
          self.state = STATE_DEFCONFIG
c8e1b10d0   Masahiro Yamada   tools: moveconfig...
940

e307fa9d8   Masahiro Yamada   tools: moveconfig...
941
942
      def do_autoconf(self):
          """Run 'make include/config/auto.conf'."""
5a27c7343   Masahiro Yamada   tools: moveconfig...
943

25400090b   Joe Hershberger   moveconfig: Print...
944
          self.cross_compile = self.parser.get_cross_compile()
90ed6cba5   Masahiro Yamada   tools: moveconfig...
945
          if self.cross_compile is None:
1d085568b   Masahiro Yamada   tools: moveconfig...
946
947
948
              self.log += color_text(self.options.color, COLOR_YELLOW,
                                     "Compiler is missing.  Do nothing.
  ")
4efef998c   Masahiro Yamada   tools: moveconfig...
949
              self.finish(False)
e307fa9d8   Masahiro Yamada   tools: moveconfig...
950
              return
90ed6cba5   Masahiro Yamada   tools: moveconfig...
951

5a27c7343   Masahiro Yamada   tools: moveconfig...
952
          cmd = list(self.make_cmd)
25400090b   Joe Hershberger   moveconfig: Print...
953
954
          if self.cross_compile:
              cmd.append('CROSS_COMPILE=%s' % self.cross_compile)
7740f653e   Joe Hershberger   moveconfig: Ignor...
955
          cmd.append('KCONFIG_IGNORE_DUPLICATES=1')
5a27c7343   Masahiro Yamada   tools: moveconfig...
956
          cmd.append('include/config/auto.conf')
25400090b   Joe Hershberger   moveconfig: Print...
957
          self.ps = subprocess.Popen(cmd, stdout=self.devnull,
f432c33f2   Masahiro Yamada   tools: moveconfig...
958
959
                                     stderr=subprocess.PIPE,
                                     cwd=self.current_src_dir)
5a27c7343   Masahiro Yamada   tools: moveconfig...
960
          self.state = STATE_AUTOCONF
e307fa9d8   Masahiro Yamada   tools: moveconfig...
961
962
963
  
      def do_savedefconfig(self):
          """Update the .config and run 'make savedefconfig'."""
916224c38   Masahiro Yamada   tools: moveconfig...
964
965
966
          (updated, suspicious, log) = self.parser.update_dotconfig()
          if suspicious:
              self.suspicious_boards.add(self.defconfig)
e307fa9d8   Masahiro Yamada   tools: moveconfig...
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
          self.log += log
  
          if not self.options.force_sync and not updated:
              self.finish(True)
              return
          if updated:
              self.log += color_text(self.options.color, COLOR_LIGHT_GREEN,
                                     "Syncing by savedefconfig...
  ")
          else:
              self.log += "Syncing by savedefconfig (forced by option)...
  "
  
          cmd = list(self.make_cmd)
          cmd.append('savedefconfig')
          self.ps = subprocess.Popen(cmd, stdout=self.devnull,
                                     stderr=subprocess.PIPE)
          self.state = STATE_SAVEDEFCONFIG
  
      def update_defconfig(self):
          """Update the input defconfig and go back to the idle state."""
fc2661eeb   Masahiro Yamada   tools: moveconfig...
988
989
          log = self.parser.check_defconfig()
          if log:
09c6c0668   Masahiro Yamada   tools: moveconfig...
990
              self.suspicious_boards.add(self.defconfig)
fc2661eeb   Masahiro Yamada   tools: moveconfig...
991
              self.log += log
e307fa9d8   Masahiro Yamada   tools: moveconfig...
992
993
994
995
996
          orig_defconfig = os.path.join('configs', self.defconfig)
          new_defconfig = os.path.join(self.build_dir, 'defconfig')
          updated = not filecmp.cmp(orig_defconfig, new_defconfig)
  
          if updated:
06cc1d36d   Joe Hershberger   tools: moveconfig...
997
              self.log += color_text(self.options.color, COLOR_LIGHT_BLUE,
e307fa9d8   Masahiro Yamada   tools: moveconfig...
998
999
1000
1001
1002
1003
                                     "defconfig was updated.
  ")
  
          if not self.options.dry_run and updated:
              shutil.move(new_defconfig, orig_defconfig)
          self.finish(True)
5a27c7343   Masahiro Yamada   tools: moveconfig...
1004

4efef998c   Masahiro Yamada   tools: moveconfig...
1005
1006
      def finish(self, success):
          """Display log along with progress and go to the idle state.
1d085568b   Masahiro Yamada   tools: moveconfig...
1007
1008
  
          Arguments:
4efef998c   Masahiro Yamada   tools: moveconfig...
1009
1010
            success: Should be True when the defconfig was processed
                     successfully, or False when it fails.
1d085568b   Masahiro Yamada   tools: moveconfig...
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
          """
          # output at least 30 characters to hide the "* defconfigs out of *".
          log = self.defconfig.ljust(30) + '
  '
  
          log += '
  '.join([ '    ' + s for s in self.log.split('
  ') ])
          # Some threads are running in parallel.
          # Print log atomically to not mix up logs from different threads.
4efef998c   Masahiro Yamada   tools: moveconfig...
1021
1022
1023
1024
1025
1026
1027
          print >> (sys.stdout if success else sys.stderr), log
  
          if not success:
              if self.options.exit_on_error:
                  sys.exit("Exit on error.")
              # If --exit-on-error flag is not set, skip this board and continue.
              # Record the failed board.
09c6c0668   Masahiro Yamada   tools: moveconfig...
1028
              self.failed_boards.add(self.defconfig)
4efef998c   Masahiro Yamada   tools: moveconfig...
1029

1d085568b   Masahiro Yamada   tools: moveconfig...
1030
1031
          self.progress.inc()
          self.progress.show()
4efef998c   Masahiro Yamada   tools: moveconfig...
1032
          self.state = STATE_IDLE
1d085568b   Masahiro Yamada   tools: moveconfig...
1033

5a27c7343   Masahiro Yamada   tools: moveconfig...
1034
      def get_failed_boards(self):
09c6c0668   Masahiro Yamada   tools: moveconfig...
1035
          """Returns a set of failed boards (defconfigs) in this slot.
5a27c7343   Masahiro Yamada   tools: moveconfig...
1036
1037
          """
          return self.failed_boards
fc2661eeb   Masahiro Yamada   tools: moveconfig...
1038
      def get_suspicious_boards(self):
09c6c0668   Masahiro Yamada   tools: moveconfig...
1039
          """Returns a set of boards (defconfigs) with possible misconversion.
fc2661eeb   Masahiro Yamada   tools: moveconfig...
1040
          """
916224c38   Masahiro Yamada   tools: moveconfig...
1041
          return self.suspicious_boards - self.failed_boards
fc2661eeb   Masahiro Yamada   tools: moveconfig...
1042

5a27c7343   Masahiro Yamada   tools: moveconfig...
1043
1044
1045
  class Slots:
  
      """Controller of the array of subprocess slots."""
6b96c1a1c   Joe Hershberger   tools: moveconfig...
1046
      def __init__(self, configs, options, progress, reference_src_dir):
5a27c7343   Masahiro Yamada   tools: moveconfig...
1047
1048
1049
          """Create a new slots controller.
  
          Arguments:
b134bc135   Masahiro Yamada   tools: moveconfig...
1050
            configs: A list of CONFIGs to move.
5a27c7343   Masahiro Yamada   tools: moveconfig...
1051
            options: option flags.
c5e60fd49   Masahiro Yamada   tools: moveconfig...
1052
            progress: A progress indicator.
6b96c1a1c   Joe Hershberger   tools: moveconfig...
1053
1054
            reference_src_dir: Determine the true starting config state from this
                               source tree.
5a27c7343   Masahiro Yamada   tools: moveconfig...
1055
1056
1057
1058
1059
1060
          """
          self.options = options
          self.slots = []
          devnull = get_devnull()
          make_cmd = get_make_cmd()
          for i in range(options.jobs):
b134bc135   Masahiro Yamada   tools: moveconfig...
1061
              self.slots.append(Slot(configs, options, progress, devnull,
6b96c1a1c   Joe Hershberger   tools: moveconfig...
1062
                                     make_cmd, reference_src_dir))
5a27c7343   Masahiro Yamada   tools: moveconfig...
1063

c5e60fd49   Masahiro Yamada   tools: moveconfig...
1064
      def add(self, defconfig):
5a27c7343   Masahiro Yamada   tools: moveconfig...
1065
1066
1067
1068
1069
1070
1071
1072
1073
          """Add a new subprocess if a vacant slot is found.
  
          Arguments:
            defconfig: defconfig name to be put into.
  
          Returns:
            Return True on success or False on failure
          """
          for slot in self.slots:
c5e60fd49   Masahiro Yamada   tools: moveconfig...
1074
              if slot.add(defconfig):
5a27c7343   Masahiro Yamada   tools: moveconfig...
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
                  return True
          return False
  
      def available(self):
          """Check if there is a vacant slot.
  
          Returns:
            Return True if at lease one vacant slot is found, False otherwise.
          """
          for slot in self.slots:
              if slot.poll():
                  return True
          return False
  
      def empty(self):
          """Check if all slots are vacant.
  
          Returns:
            Return True if all the slots are vacant, False otherwise.
          """
          ret = True
          for slot in self.slots:
              if not slot.poll():
                  ret = False
          return ret
  
      def show_failed_boards(self):
          """Display all of the failed boards (defconfigs)."""
09c6c0668   Masahiro Yamada   tools: moveconfig...
1103
          boards = set()
96dccd976   Masahiro Yamada   tools: moveconfig...
1104
          output_file = 'moveconfig.failed'
5a27c7343   Masahiro Yamada   tools: moveconfig...
1105
1106
  
          for slot in self.slots:
09c6c0668   Masahiro Yamada   tools: moveconfig...
1107
              boards |= slot.get_failed_boards()
96dccd976   Masahiro Yamada   tools: moveconfig...
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
  
          if boards:
              boards = '
  '.join(boards) + '
  '
              msg = "The following boards were not processed due to error:
  "
              msg += boards
              msg += "(the list has been saved in %s)
  " % output_file
              print >> sys.stderr, color_text(self.options.color, COLOR_LIGHT_RED,
                                              msg)
  
              with open(output_file, 'w') as f:
                  f.write(boards)
2559cd896   Joe Hershberger   moveconfig: Outpu...
1123

fc2661eeb   Masahiro Yamada   tools: moveconfig...
1124
1125
      def show_suspicious_boards(self):
          """Display all boards (defconfigs) with possible misconversion."""
09c6c0668   Masahiro Yamada   tools: moveconfig...
1126
          boards = set()
fc2661eeb   Masahiro Yamada   tools: moveconfig...
1127
1128
1129
          output_file = 'moveconfig.suspicious'
  
          for slot in self.slots:
09c6c0668   Masahiro Yamada   tools: moveconfig...
1130
              boards |= slot.get_suspicious_boards()
fc2661eeb   Masahiro Yamada   tools: moveconfig...
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
  
          if boards:
              boards = '
  '.join(boards) + '
  '
              msg = "The following boards might have been converted incorrectly.
  "
              msg += "It is highly recommended to check them manually:
  "
              msg += boards
              msg += "(the list has been saved in %s)
  " % output_file
              print >> sys.stderr, color_text(self.options.color, COLOR_YELLOW,
                                              msg)
  
              with open(output_file, 'w') as f:
                  f.write(boards)
5cc42a518   Masahiro Yamada   tools: moveconfig...
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
  class ReferenceSource:
  
      """Reference source against which original configs should be parsed."""
  
      def __init__(self, commit):
          """Create a reference source directory based on a specified commit.
  
          Arguments:
            commit: commit to git-clone
          """
          self.src_dir = tempfile.mkdtemp()
          print "Cloning git repo to a separate work directory..."
          subprocess.check_output(['git', 'clone', os.getcwd(), '.'],
                                  cwd=self.src_dir)
          print "Checkout '%s' to build the original autoconf.mk." % \
              subprocess.check_output(['git', 'rev-parse', '--short', commit]).strip()
          subprocess.check_output(['git', 'checkout', commit],
                                  stderr=subprocess.STDOUT, cwd=self.src_dir)
6b96c1a1c   Joe Hershberger   tools: moveconfig...
1166
1167
  
      def __del__(self):
5cc42a518   Masahiro Yamada   tools: moveconfig...
1168
          """Delete the reference source directory
6b96c1a1c   Joe Hershberger   tools: moveconfig...
1169
1170
1171
1172
1173
1174
  
          This function makes sure the temporary directory is cleaned away
          even if Python suddenly dies due to error.  It should be done in here
          because it is guaranteed the destructor is always invoked when the
          instance of the class gets unreferenced.
          """
5cc42a518   Masahiro Yamada   tools: moveconfig...
1175
1176
1177
1178
          shutil.rmtree(self.src_dir)
  
      def get_dir(self):
          """Return the absolute path to the reference source directory."""
6b96c1a1c   Joe Hershberger   tools: moveconfig...
1179

5cc42a518   Masahiro Yamada   tools: moveconfig...
1180
          return self.src_dir
6b96c1a1c   Joe Hershberger   tools: moveconfig...
1181

b134bc135   Masahiro Yamada   tools: moveconfig...
1182
  def move_config(configs, options):
5a27c7343   Masahiro Yamada   tools: moveconfig...
1183
1184
1185
      """Move config options to defconfig files.
  
      Arguments:
b134bc135   Masahiro Yamada   tools: moveconfig...
1186
        configs: A list of CONFIGs to move.
5a27c7343   Masahiro Yamada   tools: moveconfig...
1187
1188
        options: option flags
      """
b134bc135   Masahiro Yamada   tools: moveconfig...
1189
      if len(configs) == 0:
6a9f79f71   Masahiro Yamada   tools: moveconfig...
1190
1191
1192
1193
1194
1195
1196
1197
          if options.force_sync:
              print 'No CONFIG is specified. You are probably syncing defconfigs.',
          else:
              print 'Neither CONFIG nor --force-sync is specified. Nothing will happen.',
      else:
          print 'Move ' + ', '.join(configs),
      print '(jobs: %d)
  ' % options.jobs
5a27c7343   Masahiro Yamada   tools: moveconfig...
1198

6b96c1a1c   Joe Hershberger   tools: moveconfig...
1199
      if options.git_ref:
5cc42a518   Masahiro Yamada   tools: moveconfig...
1200
1201
1202
          reference_src = ReferenceSource(options.git_ref)
          reference_src_dir = reference_src.get_dir()
      else:
f432c33f2   Masahiro Yamada   tools: moveconfig...
1203
          reference_src_dir = None
6b96c1a1c   Joe Hershberger   tools: moveconfig...
1204

91040e853   Joe Hershberger   moveconfig: Add a...
1205
      if options.defconfigs:
0dbc9b591   Masahiro Yamada   tools: moveconfig...
1206
          defconfigs = get_matched_defconfigs(options.defconfigs)
91040e853   Joe Hershberger   moveconfig: Add a...
1207
      else:
684c306ec   Masahiro Yamada   tools: moveconfig...
1208
          defconfigs = get_all_defconfigs()
5a27c7343   Masahiro Yamada   tools: moveconfig...
1209

c5e60fd49   Masahiro Yamada   tools: moveconfig...
1210
      progress = Progress(len(defconfigs))
6b96c1a1c   Joe Hershberger   tools: moveconfig...
1211
      slots = Slots(configs, options, progress, reference_src_dir)
5a27c7343   Masahiro Yamada   tools: moveconfig...
1212
1213
1214
1215
  
      # Main loop to process defconfig files:
      #  Add a new subprocess into a vacant slot.
      #  Sleep if there is no available slot.
c5e60fd49   Masahiro Yamada   tools: moveconfig...
1216
1217
      for defconfig in defconfigs:
          while not slots.add(defconfig):
5a27c7343   Masahiro Yamada   tools: moveconfig...
1218
1219
1220
1221
1222
1223
1224
              while not slots.available():
                  # No available slot: sleep for a while
                  time.sleep(SLEEP_TIME)
  
      # wait until all the subprocesses finish
      while not slots.empty():
          time.sleep(SLEEP_TIME)
2e2ce6c0c   Joe Hershberger   moveconfig: Print...
1225
      print ''
5a27c7343   Masahiro Yamada   tools: moveconfig...
1226
      slots.show_failed_boards()
fc2661eeb   Masahiro Yamada   tools: moveconfig...
1227
      slots.show_suspicious_boards()
5a27c7343   Masahiro Yamada   tools: moveconfig...
1228

5a27c7343   Masahiro Yamada   tools: moveconfig...
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
  def main():
      try:
          cpu_count = multiprocessing.cpu_count()
      except NotImplementedError:
          cpu_count = 1
  
      parser = optparse.OptionParser()
      # Add options here
      parser.add_option('-c', '--color', action='store_true', default=False,
                        help='display the log in color')
9ede21234   Simon Glass   moveconfig: Add a...
1239
1240
      parser.add_option('-C', '--commit', action='store_true', default=False,
                        help='Create a git commit for the operation')
91040e853   Joe Hershberger   moveconfig: Add a...
1241
1242
      parser.add_option('-d', '--defconfigs', type='string',
                        help='a file containing a list of defconfigs to move')
5a27c7343   Masahiro Yamada   tools: moveconfig...
1243
1244
1245
1246
1247
      parser.add_option('-n', '--dry-run', action='store_true', default=False,
                        help='perform a trial run (show log with no changes)')
      parser.add_option('-e', '--exit-on-error', action='store_true',
                        default=False,
                        help='exit immediately on any error')
8513dc048   Masahiro Yamada   tools: moveconfig...
1248
1249
      parser.add_option('-s', '--force-sync', action='store_true', default=False,
                        help='force sync by savedefconfig')
07913d1e4   Masahiro Yamada   tools: moveconfig...
1250
1251
      parser.add_option('-S', '--spl', action='store_true', default=False,
                        help='parse config options defined for SPL build')
2144f8804   Joe Hershberger   moveconfig: Add a...
1252
1253
1254
      parser.add_option('-H', '--headers-only', dest='cleanup_headers_only',
                        action='store_true', default=False,
                        help='only cleanup the headers')
5a27c7343   Masahiro Yamada   tools: moveconfig...
1255
1256
      parser.add_option('-j', '--jobs', type='int', default=cpu_count,
                        help='the number of jobs to run simultaneously')
6b96c1a1c   Joe Hershberger   tools: moveconfig...
1257
1258
      parser.add_option('-r', '--git-ref', type='string',
                        help='the git ref to clone for building the autoconf.mk')
6b403dfd2   Simon Glass   moveconfig: Add a...
1259
1260
      parser.add_option('-y', '--yes', action='store_true', default=False,
                        help="respond 'yes' to any prompts")
95bf9c7e3   Joe Hershberger   moveconfig: Add a...
1261
1262
      parser.add_option('-v', '--verbose', action='store_true', default=False,
                        help='show any build errors as boards are built')
b6ef393ad   Masahiro Yamada   tools: moveconfig...
1263
      parser.usage += ' CONFIG ...'
5a27c7343   Masahiro Yamada   tools: moveconfig...
1264

b6ef393ad   Masahiro Yamada   tools: moveconfig...
1265
      (options, configs) = parser.parse_args()
5a27c7343   Masahiro Yamada   tools: moveconfig...
1266

6a9f79f71   Masahiro Yamada   tools: moveconfig...
1267
      if len(configs) == 0 and not options.force_sync:
5a27c7343   Masahiro Yamada   tools: moveconfig...
1268
1269
          parser.print_usage()
          sys.exit(1)
b6ef393ad   Masahiro Yamada   tools: moveconfig...
1270
1271
1272
      # prefix the option name with CONFIG_ if missing
      configs = [ config if config.startswith('CONFIG_') else 'CONFIG_' + config
                  for config in configs ]
5a27c7343   Masahiro Yamada   tools: moveconfig...
1273

2144f8804   Joe Hershberger   moveconfig: Add a...
1274
1275
1276
      check_top_directory()
  
      if not options.cleanup_headers_only:
f7536f798   Masahiro Yamada   tools: moveconfig...
1277
1278
          check_clean_directory()
          update_cross_compile(options.color)
b134bc135   Masahiro Yamada   tools: moveconfig...
1279
          move_config(configs, options)
2144f8804   Joe Hershberger   moveconfig: Add a...
1280

6a9f79f71   Masahiro Yamada   tools: moveconfig...
1281
      if configs:
e9ea12215   Masahiro Yamada   tools: moveconfig...
1282
          cleanup_headers(configs, options)
9ab0296a8   Masahiro Yamada   tools: moveconfig...
1283
          cleanup_extra_options(configs, options)
5a27c7343   Masahiro Yamada   tools: moveconfig...
1284

9ede21234   Simon Glass   moveconfig: Add a...
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
      if options.commit:
          subprocess.call(['git', 'add', '-u'])
          if configs:
              msg = 'Convert %s %sto Kconfig' % (configs[0],
                      'et al ' if len(configs) > 1 else '')
              msg += ('
  
  This converts the following to Kconfig:
     %s
  ' %
                      '
     '.join(configs))
          else:
              msg = 'configs: Resync with savedefconfig'
              msg += '
  
  Rsync all defconfig files using moveconfig.py'
          subprocess.call(['git', 'commit', '-s', '-m', msg])
5a27c7343   Masahiro Yamada   tools: moveconfig...
1303
1304
  if __name__ == '__main__':
      main()