Blame view

tools/moveconfig.py 67.5 KB
793dca34c   Simon Glass   move_config: Conv...
1
  #!/usr/bin/env python3
83d290c56   Tom Rini   SPDX: Convert all...
2
  # SPDX-License-Identifier: GPL-2.0+
5a27c7343   Masahiro Yamada   tools: moveconfig...
3
4
5
  #
  # Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  #
5a27c7343   Masahiro Yamada   tools: moveconfig...
6
7
8
9
10
11
12
13
14
15
16
17
  
  """
  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...
18
  First, you must edit the Kconfig to add the menu entries for the configs
96464badc   Joe Hershberger   moveconfig: Alway...
19
  you are moving.
b6ef393ad   Masahiro Yamada   tools: moveconfig...
20
21
22
  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...
23

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

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

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

1d085568b   Masahiro Yamada   tools: moveconfig...
37
38
39
  <defconfig_name> is the name of the defconfig.
  
  <action*> shows what the tool did for that defconfig.
c21fc7e22   Masahiro Yamada   treewide: fix "fo...
40
  It looks like one of the following:
5a27c7343   Masahiro Yamada   tools: moveconfig...
41
42
43
  
   - Move 'CONFIG_... '
     This config option was moved to the defconfig
cc008299f   Masahiro Yamada   tools: moveconfig...
44
   - CONFIG_... is not defined in Kconfig.  Do nothing.
916224c38   Masahiro Yamada   tools: moveconfig...
45
46
47
48
49
50
     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...
51
52
53
54
     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...
55
56
     The tool does not know if the result is reasonable, so please check it
     manually.
cc008299f   Masahiro Yamada   tools: moveconfig...
57
58
59
60
  
   - '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...
61

90ed6cba5   Masahiro Yamada   tools: moveconfig...
62
63
64
65
66
67
   - 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...
68
69
70
71
72
73
74
75
76
     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...
77
78
  How does it work?
  -----------------
5a27c7343   Masahiro Yamada   tools: moveconfig...
79
80
81
82
83
84
  
  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...
85
86
87
88
89
  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...
90
91
92
93
94
95
96
97
98
99
100
101
102
  
  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
6821a7457   Simon Glass   RFC: moveconfig: ...
103
104
  at the kernel.org site, some are not provided by kernel.org. This tool uses
  the same tools as buildman, so see that tool for setup (e.g. --fetch-arch).
5a27c7343   Masahiro Yamada   tools: moveconfig...
105

ddf91c642   Simon Glass   moveconfig: Tidy ...
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
  Tips and trips
  --------------
  
  To sync only X86 defconfigs:
  
     ./tools/moveconfig.py -s -d <(grep -l X86 configs/*)
  
  or:
  
     grep -l X86 configs/* | ./tools/moveconfig.py -s -d -
  
  To process CONFIG_CMD_FPGAD only for a subset of configs based on path match:
  
     ls configs/{hrcon*,iocon*,strider*} | \
         ./tools/moveconfig.py -Cy CONFIG_CMD_FPGAD -d -
99b66605f   Simon Glass   moveconfig: Suppo...
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
  Finding implied CONFIGs
  -----------------------
  
  Some CONFIG options can be implied by others and this can help to reduce
  the size of the defconfig files. For example, CONFIG_X86 implies
  CONFIG_CMD_IRQ, so we can put 'imply CMD_IRQ' under 'config X86' and
  all x86 boards will have that option, avoiding adding CONFIG_CMD_IRQ to
  each of the x86 defconfig files.
  
  This tool can help find such configs. To use it, first build a database:
  
      ./tools/moveconfig.py -b
  
  Then try to query it:
  
      ./tools/moveconfig.py -i CONFIG_CMD_IRQ
      CONFIG_CMD_IRQ found in 311/2384 defconfigs
      44 : CONFIG_SYS_FSL_ERRATUM_IFC_A002769
      41 : CONFIG_SYS_FSL_ERRATUM_A007075
      31 : CONFIG_SYS_FSL_DDR_VER_44
      28 : CONFIG_ARCH_P1010
      28 : CONFIG_SYS_FSL_ERRATUM_P1010_A003549
      28 : CONFIG_SYS_FSL_ERRATUM_SEC_A003571
      28 : CONFIG_SYS_FSL_ERRATUM_IFC_A003399
      25 : CONFIG_SYS_FSL_ERRATUM_A008044
      22 : CONFIG_ARCH_P1020
      21 : CONFIG_SYS_FSL_DDR_VER_46
      20 : CONFIG_MAX_PIRQ_LINKS
      20 : CONFIG_HPET_ADDRESS
      20 : CONFIG_X86
      20 : CONFIG_PCIE_ECAM_SIZE
      20 : CONFIG_IRQ_SLOT_COUNT
      20 : CONFIG_I8259_PIC
      20 : CONFIG_CPU_ADDR_BITS
      20 : CONFIG_RAMBASE
      20 : CONFIG_SYS_FSL_ERRATUM_A005871
      20 : CONFIG_PCIE_ECAM_BASE
      20 : CONFIG_X86_TSC_TIMER
      20 : CONFIG_I8254_TIMER
      20 : CONFIG_CMD_GETTIME
      19 : CONFIG_SYS_FSL_ERRATUM_A005812
      18 : CONFIG_X86_RUN_32BIT
      17 : CONFIG_CMD_CHIP_CONFIG
      ...
  
  This shows a list of config options which might imply CONFIG_CMD_EEPROM along
  with how many defconfigs they cover. From this you can see that CONFIG_X86
  implies CONFIG_CMD_EEPROM. Therefore, instead of adding CONFIG_CMD_EEPROM to
  the defconfig of every x86 board, you could add a single imply line to the
  Kconfig file:
  
      config X86
          bool "x86 architecture"
          ...
          imply CMD_EEPROM
  
  That will cover 20 defconfigs. Many of the options listed are not suitable as
  they are not related. E.g. it would be odd for CONFIG_CMD_GETTIME to imply
  CMD_EEPROM.
  
  Using this search you can reduce the size of moveconfig patches.
cb008830a   Simon Glass   moveconfig: Allow...
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
  You can automatically add 'imply' statements in the Kconfig with the -a
  option:
  
      ./tools/moveconfig.py -s -i CONFIG_SCSI \
              -a CONFIG_ARCH_LS1021A,CONFIG_ARCH_LS1043A
  
  This will add 'imply SCSI' to the two CONFIG options mentioned, assuming that
  the database indicates that they do actually imply CONFIG_SCSI and do not
  already have an 'imply SCSI'.
  
  The output shows where the imply is added:
  
     18 : CONFIG_ARCH_LS1021A       arch/arm/cpu/armv7/ls102xa/Kconfig:1
     13 : CONFIG_ARCH_LS1043A       arch/arm/cpu/armv8/fsl-layerscape/Kconfig:11
     12 : CONFIG_ARCH_LS1046A       arch/arm/cpu/armv8/fsl-layerscape/Kconfig:31
  
  The first number is the number of boards which can avoid having a special
  CONFIG_SCSI option in their defconfig file if this 'imply' is added.
  The location at the right is the Kconfig file and line number where the config
  appears. For example, adding 'imply CONFIG_SCSI' to the 'config ARCH_LS1021A'
  in arch/arm/cpu/armv7/ls102xa/Kconfig at line 1 will help 18 boards to reduce
  the size of their defconfig files.
  
  If you want to add an 'imply' to every imply config in the list, you can use
  
      ./tools/moveconfig.py -s -i CONFIG_SCSI -a all
  
  To control which ones are displayed, use -I <list> where list is a list of
  options (use '-I help' to see possible options and their meaning).
  
  To skip showing you options that already have an 'imply' attached, use -A.
  
  When you have finished adding 'imply' options you can regenerate the
  defconfig files for affected boards with something like:
  
      git show --stat | ./tools/moveconfig.py -s -d -
  
  This will regenerate only those defconfigs changed in the current commit.
  If you start with (say) 100 defconfigs being changed in the commit, and add
  a few 'imply' options as above, then regenerate, hopefully you can reduce the
  number of defconfigs changed in the commit.
99b66605f   Simon Glass   moveconfig: Suppo...
223

5a27c7343   Masahiro Yamada   tools: moveconfig...
224
225
226
227
228
229
  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...
230
231
232
   -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...
233
   -d, --defconfigs
0dbc9b591   Masahiro Yamada   tools: moveconfig...
234
    Specify a file containing a list of defconfigs to move.  The defconfig
ddf91c642   Simon Glass   moveconfig: Tidy ...
235
    files can be given with shell-style wildcards. Use '-' to read from stdin.
91040e853   Joe Hershberger   moveconfig: Add a...
236

5a27c7343   Masahiro Yamada   tools: moveconfig...
237
   -n, --dry-run
b6ef393ad   Masahiro Yamada   tools: moveconfig...
238
     Perform a trial run that does not make any changes.  It is useful to
5a27c7343   Masahiro Yamada   tools: moveconfig...
239
240
241
242
243
     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...
244
245
246
247
   -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...
248
249
250
251
252
   -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...
253
254
   -H, --headers-only
     Only cleanup the headers; skip the defconfig processing
5a27c7343   Masahiro Yamada   tools: moveconfig...
255
256
257
   -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...
258
259
260
261
262
263
264
   -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...
265
266
   -v, --verbose
     Show any build errors as boards are built
6b403dfd2   Simon Glass   moveconfig: Add a...
267
268
   -y, --yes
     Instead of prompting, automatically go ahead with all operations. This
ddf91c642   Simon Glass   moveconfig: Tidy ...
269
270
     includes cleaning up headers, CONFIG_SYS_EXTRA_OPTIONS, the config whitelist
     and the README.
6b403dfd2   Simon Glass   moveconfig: Add a...
271

5a27c7343   Masahiro Yamada   tools: moveconfig...
272
273
274
275
276
  To see the complete list of supported options, run
  
    $ tools/moveconfig.py -h
  
  """
b3192f48c   Markus Klotzbuecher   moveconfig: repla...
277
  import asteval
99b66605f   Simon Glass   moveconfig: Suppo...
278
  import collections
8ba1f5de4   Masahiro Yamada   tools: moveconfig...
279
  import copy
f2f6981a1   Masahiro Yamada   tools: moveconfig...
280
  import difflib
c8e1b10d0   Masahiro Yamada   tools: moveconfig...
281
  import filecmp
5a27c7343   Masahiro Yamada   tools: moveconfig...
282
  import fnmatch
0dbc9b591   Masahiro Yamada   tools: moveconfig...
283
  import glob
5a27c7343   Masahiro Yamada   tools: moveconfig...
284
285
286
  import multiprocessing
  import optparse
  import os
793dca34c   Simon Glass   move_config: Conv...
287
  import queue
5a27c7343   Masahiro Yamada   tools: moveconfig...
288
289
290
291
292
  import re
  import shutil
  import subprocess
  import sys
  import tempfile
d73fcb12e   Simon Glass   moveconfig: Suppo...
293
  import threading
5a27c7343   Masahiro Yamada   tools: moveconfig...
294
  import time
cb008830a   Simon Glass   moveconfig: Allow...
295
  sys.path.append(os.path.join(os.path.dirname(__file__), 'buildman'))
6821a7457   Simon Glass   RFC: moveconfig: ...
296
297
  sys.path.append(os.path.join(os.path.dirname(__file__), 'patman'))
  import bsettings
cb008830a   Simon Glass   moveconfig: Allow...
298
  import kconfiglib
6821a7457   Simon Glass   RFC: moveconfig: ...
299
  import toolchain
cb008830a   Simon Glass   moveconfig: Allow...
300

5a27c7343   Masahiro Yamada   tools: moveconfig...
301
302
  SHOW_GNU_MAKE = 'scripts/show-gnu-make'
  SLEEP_TIME=0.03
5a27c7343   Masahiro Yamada   tools: moveconfig...
303
304
305
  STATE_IDLE = 0
  STATE_DEFCONFIG = 1
  STATE_AUTOCONF = 2
96464badc   Joe Hershberger   moveconfig: Alway...
306
  STATE_SAVEDEFCONFIG = 3
5a27c7343   Masahiro Yamada   tools: moveconfig...
307
308
  
  ACTION_MOVE = 0
cc008299f   Masahiro Yamada   tools: moveconfig...
309
  ACTION_NO_ENTRY = 1
916224c38   Masahiro Yamada   tools: moveconfig...
310
311
  ACTION_NO_ENTRY_WARN = 2
  ACTION_NO_CHANGE = 3
5a27c7343   Masahiro Yamada   tools: moveconfig...
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
  
  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'
f3b8e6470   Simon Glass   moveconfig: Add a...
329
  AUTO_CONF_PATH = 'include/config/auto.conf'
d73fcb12e   Simon Glass   moveconfig: Suppo...
330
  CONFIG_DATABASE = 'moveconfig.db'
f3b8e6470   Simon Glass   moveconfig: Add a...
331

cb008830a   Simon Glass   moveconfig: Allow...
332
  CONFIG_LEN = len('CONFIG_')
f3b8e6470   Simon Glass   moveconfig: Add a...
333

b237d358b   Markus Klotzbuecher   moveconfig: expan...
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
  SIZES = {
      "SZ_1":    0x00000001, "SZ_2":    0x00000002,
      "SZ_4":    0x00000004, "SZ_8":    0x00000008,
      "SZ_16":   0x00000010, "SZ_32":   0x00000020,
      "SZ_64":   0x00000040, "SZ_128":  0x00000080,
      "SZ_256":  0x00000100, "SZ_512":  0x00000200,
      "SZ_1K":   0x00000400, "SZ_2K":   0x00000800,
      "SZ_4K":   0x00001000, "SZ_8K":   0x00002000,
      "SZ_16K":  0x00004000, "SZ_32K":  0x00008000,
      "SZ_64K":  0x00010000, "SZ_128K": 0x00020000,
      "SZ_256K": 0x00040000, "SZ_512K": 0x00080000,
      "SZ_1M":   0x00100000, "SZ_2M":   0x00200000,
      "SZ_4M":   0x00400000, "SZ_8M":   0x00800000,
      "SZ_16M":  0x01000000, "SZ_32M":  0x02000000,
      "SZ_64M":  0x04000000, "SZ_128M": 0x08000000,
      "SZ_256M": 0x10000000, "SZ_512M": 0x20000000,
      "SZ_1G":   0x40000000, "SZ_2G":   0x80000000,
      "SZ_4G":  0x100000000
  }
5a27c7343   Masahiro Yamada   tools: moveconfig...
353
354
355
356
357
358
359
360
361
362
363
364
365
366
  ### 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...
367
368
369
370
371
  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...
372
373
374
375
376
377
378
379
380
381
382
383
  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()
25f978cb1   Simon Glass   moveconfig: Suppo...
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
  def get_matched_defconfig(line):
      """Get the defconfig files that match a pattern
  
      Args:
          line: Path or filename to match, e.g. 'configs/snow_defconfig' or
              'k2*_defconfig'. If no directory is provided, 'configs/' is
              prepended
  
      Returns:
          a list of matching defconfig files
      """
      dirname = os.path.dirname(line)
      if dirname:
          pattern = line
      else:
          pattern = os.path.join('configs', line)
      return glob.glob(pattern) + glob.glob(pattern + '_defconfig')
0dbc9b591   Masahiro Yamada   tools: moveconfig...
401
  def get_matched_defconfigs(defconfigs_file):
ee4e61bda   Simon Glass   moveconfig: Allow...
402
403
404
405
406
407
408
409
410
      """Get all the defconfig files that match the patterns in a file.
  
      Args:
          defconfigs_file: File containing a list of defconfigs to process, or
              '-' to read the list from stdin
  
      Returns:
          A list of paths to defconfig files, with no duplicates
      """
0dbc9b591   Masahiro Yamada   tools: moveconfig...
411
      defconfigs = []
ee4e61bda   Simon Glass   moveconfig: Allow...
412
413
414
415
416
417
      if defconfigs_file == '-':
          fd = sys.stdin
          defconfigs_file = 'stdin'
      else:
          fd = open(defconfigs_file)
      for i, line in enumerate(fd):
0dbc9b591   Masahiro Yamada   tools: moveconfig...
418
419
420
          line = line.strip()
          if not line:
              continue # skip blank lines silently
2ddd85dc3   Simon Glass   moveconfig: Allow...
421
422
          if ' ' in line:
              line = line.split(' ')[0]  # handle 'git log' input
25f978cb1   Simon Glass   moveconfig: Suppo...
423
          matched = get_matched_defconfig(line)
0dbc9b591   Masahiro Yamada   tools: moveconfig...
424
          if not matched:
793dca34c   Simon Glass   move_config: Conv...
425
426
              print("warning: %s:%d: no defconfig matched '%s'" % \
                                                   (defconfigs_file, i + 1, line), file=sys.stderr)
0dbc9b591   Masahiro Yamada   tools: moveconfig...
427
428
429
430
431
  
          defconfigs += matched
  
      # use set() to drop multiple matching
      return [ defconfig[len('configs') + 1:]  for defconfig in set(defconfigs) ]
684c306ec   Masahiro Yamada   tools: moveconfig...
432
433
434
435
436
437
438
439
440
  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...
441
442
443
  def color_text(color_enabled, color, string):
      """Return colored string."""
      if color_enabled:
1d085568b   Masahiro Yamada   tools: moveconfig...
444
445
446
447
448
449
          # 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...
450
451
      else:
          return string
e9ea12215   Masahiro Yamada   tools: moveconfig...
452
  def show_diff(a, b, file_path, color_enabled):
f2f6981a1   Masahiro Yamada   tools: moveconfig...
453
454
455
456
457
458
      """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...
459
        color_enabled: Display the diff in color
f2f6981a1   Masahiro Yamada   tools: moveconfig...
460
461
462
463
464
465
466
      """
  
      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...
467
          if line[0] == '-' and line[1] != '-':
793dca34c   Simon Glass   move_config: Conv...
468
              print(color_text(color_enabled, COLOR_RED, line), end=' ')
e9ea12215   Masahiro Yamada   tools: moveconfig...
469
          elif line[0] == '+' and line[1] != '+':
793dca34c   Simon Glass   move_config: Conv...
470
              print(color_text(color_enabled, COLOR_GREEN, line), end=' ')
e9ea12215   Masahiro Yamada   tools: moveconfig...
471
          else:
793dca34c   Simon Glass   move_config: Conv...
472
              print(line, end=' ')
f2f6981a1   Masahiro Yamada   tools: moveconfig...
473

8ba1f5de4   Masahiro Yamada   tools: moveconfig...
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
  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()
85edfc1f6   Chris Packham   tools: moveconfig...
524
525
526
  def confirm(options, prompt):
      if not options.yes:
          while True:
793dca34c   Simon Glass   move_config: Conv...
527
              choice = input('{} [y/n]: '.format(prompt))
85edfc1f6   Chris Packham   tools: moveconfig...
528
              choice = choice.lower()
793dca34c   Simon Glass   move_config: Conv...
529
              print(choice)
85edfc1f6   Chris Packham   tools: moveconfig...
530
531
532
533
534
535
536
              if choice == 'y' or choice == 'n':
                  break
  
          if choice == 'n':
              return False
  
      return True
4d9dbb1fb   Chris Packham   moveconfig: add a...
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
  def cleanup_empty_blocks(header_path, options):
      """Clean up empty conditional blocks
  
      Arguments:
        header_path: path to the cleaned file.
        options: option flags.
      """
      pattern = re.compile(r'^\s*#\s*if.*$
  ^\s*#\s*endif.*$
  *', flags=re.M)
      with open(header_path) as f:
          data = f.read()
  
      new_data = pattern.sub('
  ', data)
  
      show_diff(data.splitlines(True), new_data.splitlines(True), header_path,
                options.color)
  
      if options.dry_run:
          return
  
      with open(header_path, 'w') as f:
          f.write(new_data)
e9ea12215   Masahiro Yamada   tools: moveconfig...
561
  def cleanup_one_header(header_path, patterns, options):
5a27c7343   Masahiro Yamada   tools: moveconfig...
562
563
564
565
566
567
      """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...
568
        options: option flags.
5a27c7343   Masahiro Yamada   tools: moveconfig...
569
570
571
572
573
574
      """
      with open(header_path) as f:
          lines = f.readlines()
  
      matched = []
      for i, line in enumerate(lines):
a3a779f7f   Masahiro Yamada   tools: moveconfig...
575
576
577
578
          if i - 1 in matched and lines[i - 1][-2:] == '\\
  ':
              matched.append(i)
              continue
5a27c7343   Masahiro Yamada   tools: moveconfig...
579
          for pattern in patterns:
8ba1f5de4   Masahiro Yamada   tools: moveconfig...
580
              if pattern.search(line):
5a27c7343   Masahiro Yamada   tools: moveconfig...
581
582
                  matched.append(i)
                  break
8ba1f5de4   Masahiro Yamada   tools: moveconfig...
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
      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...
606
607
608
609
      tolines = copy.copy(lines)
  
      for i in reversed(matched):
          tolines.pop(i)
e9ea12215   Masahiro Yamada   tools: moveconfig...
610
      show_diff(lines, tolines, header_path, options.color)
8ba1f5de4   Masahiro Yamada   tools: moveconfig...
611

e9ea12215   Masahiro Yamada   tools: moveconfig...
612
      if options.dry_run:
5a27c7343   Masahiro Yamada   tools: moveconfig...
613
614
615
          return
  
      with open(header_path, 'w') as f:
f2f6981a1   Masahiro Yamada   tools: moveconfig...
616
617
          for line in tolines:
              f.write(line)
5a27c7343   Masahiro Yamada   tools: moveconfig...
618

e9ea12215   Masahiro Yamada   tools: moveconfig...
619
  def cleanup_headers(configs, options):
5a27c7343   Masahiro Yamada   tools: moveconfig...
620
621
622
      """Delete config defines from board headers.
  
      Arguments:
b134bc135   Masahiro Yamada   tools: moveconfig...
623
        configs: A list of CONFIGs to remove.
e9ea12215   Masahiro Yamada   tools: moveconfig...
624
        options: option flags.
5a27c7343   Masahiro Yamada   tools: moveconfig...
625
      """
85edfc1f6   Chris Packham   tools: moveconfig...
626
627
      if not confirm(options, 'Clean up headers?'):
          return
5a27c7343   Masahiro Yamada   tools: moveconfig...
628
629
  
      patterns = []
b134bc135   Masahiro Yamada   tools: moveconfig...
630
      for config in configs:
5a27c7343   Masahiro Yamada   tools: moveconfig...
631
632
          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...
633
634
      for dir in 'include', 'arch', 'board':
          for (dirpath, dirnames, filenames) in os.walk(dir):
dc6de50bd   Masahiro Yamada   tools: moveconfig...
635
636
              if dirpath == os.path.join('include', 'generated'):
                  continue
60727f514   Joe Hershberger   moveconfig: Clean...
637
              for filename in filenames:
02b5670e6   Tom Rini   moveconfig.py: Fi...
638
                  if not filename.endswith(('~', '.dts', '.dtsi')):
4d9dbb1fb   Chris Packham   moveconfig: add a...
639
                      header_path = os.path.join(dirpath, filename)
02b5670e6   Tom Rini   moveconfig.py: Fi...
640
641
642
                      # This file contains UTF-16 data and no CONFIG symbols
                      if header_path == 'include/video_font_data.h':
                          continue
4d9dbb1fb   Chris Packham   moveconfig: add a...
643
644
                      cleanup_one_header(header_path, patterns, options)
                      cleanup_empty_blocks(header_path, options)
5a27c7343   Masahiro Yamada   tools: moveconfig...
645

9ab0296a8   Masahiro Yamada   tools: moveconfig...
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
  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.
      """
85edfc1f6   Chris Packham   tools: moveconfig...
703
704
      if not confirm(options, 'Clean up CONFIG_SYS_EXTRA_OPTIONS?'):
          return
9ab0296a8   Masahiro Yamada   tools: moveconfig...
705
706
707
708
709
710
711
712
  
      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)
ca43834d6   Chris Packham   tools: moveconfig...
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
  def cleanup_whitelist(configs, options):
      """Delete config whitelist entries
  
      Arguments:
        configs: A list of CONFIGs to remove.
        options: option flags.
      """
      if not confirm(options, 'Clean up whitelist entries?'):
          return
  
      with open(os.path.join('scripts', 'config_whitelist.txt')) as f:
          lines = f.readlines()
  
      lines = [x for x in lines if x.strip() not in configs]
  
      with open(os.path.join('scripts', 'config_whitelist.txt'), 'w') as f:
          f.write(''.join(lines))
f90df596a   Chris Packham   tools: moveconfig...
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
  def find_matching(patterns, line):
      for pat in patterns:
          if pat.search(line):
              return True
      return False
  
  def cleanup_readme(configs, options):
      """Delete config description in README
  
      Arguments:
        configs: A list of CONFIGs to remove.
        options: option flags.
      """
      if not confirm(options, 'Clean up README?'):
          return
  
      patterns = []
      for config in configs:
          patterns.append(re.compile(r'^\s+%s' % config))
  
      with open('README') as f:
          lines = f.readlines()
  
      found = False
      newlines = []
      for line in lines:
          if not found:
              found = find_matching(patterns, line)
              if found:
                  continue
  
          if found and re.search(r'^\s+CONFIG', line):
              found = False
  
          if not found:
              newlines.append(line)
  
      with open('README', 'w') as f:
          f.write(''.join(newlines))
b237d358b   Markus Klotzbuecher   moveconfig: expan...
769
770
771
772
773
774
775
776
  def try_expand(line):
      """If value looks like an expression, try expanding it
      Otherwise just return the existing value
      """
      if line.find('=') == -1:
          return line
  
      try:
b3192f48c   Markus Klotzbuecher   moveconfig: repla...
777
          aeval = asteval.Interpreter( usersyms=SIZES, minimal=True )
b237d358b   Markus Klotzbuecher   moveconfig: expan...
778
779
780
          cfg, val = re.split("=", line)
          val= val.strip('\"')
          if re.search("[*+-/]|<<|SZ_+|\(([^\)]+)\)", val):
b3192f48c   Markus Klotzbuecher   moveconfig: repla...
781
              newval = hex(aeval(val))
793dca34c   Simon Glass   move_config: Conv...
782
              print("\tExpanded expression %s to %s" % (val, newval))
b237d358b   Markus Klotzbuecher   moveconfig: expan...
783
784
              return cfg+'='+newval
      except:
793dca34c   Simon Glass   move_config: Conv...
785
          print("\tFailed to expand expression in %s" % line)
b237d358b   Markus Klotzbuecher   moveconfig: expan...
786
787
  
      return line
ca43834d6   Chris Packham   tools: moveconfig...
788

5a27c7343   Masahiro Yamada   tools: moveconfig...
789
  ### classes ###
c5e60fd49   Masahiro Yamada   tools: moveconfig...
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
  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."""
793dca34c   Simon Glass   move_config: Conv...
810
          print(' %d defconfigs out of %d\r' % (self.current, self.total), end=' ')
c5e60fd49   Masahiro Yamada   tools: moveconfig...
811
          sys.stdout.flush()
cb008830a   Simon Glass   moveconfig: Allow...
812
813
814
815
816
817
818
819
820
821
  
  class KconfigScanner:
      """Kconfig scanner."""
  
      def __init__(self):
          """Scan all the Kconfig files and create a Config object."""
          # Define environment variables referenced from Kconfig
          os.environ['srctree'] = os.getcwd()
          os.environ['UBOOTVERSION'] = 'dummy'
          os.environ['KCONFIG_OBJDIR'] = ''
65e05ddc1   Tom Rini   kconfiglib: Updat...
822
          self.conf = kconfiglib.Kconfig()
cb008830a   Simon Glass   moveconfig: Allow...
823

5a27c7343   Masahiro Yamada   tools: moveconfig...
824
825
826
827
828
829
  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...
830
      def __init__(self, configs, options, build_dir):
5a27c7343   Masahiro Yamada   tools: moveconfig...
831
832
833
          """Create a new parser.
  
          Arguments:
b134bc135   Masahiro Yamada   tools: moveconfig...
834
            configs: A list of CONFIGs to move.
5a27c7343   Masahiro Yamada   tools: moveconfig...
835
836
837
            options: option flags.
            build_dir: Build directory.
          """
b134bc135   Masahiro Yamada   tools: moveconfig...
838
          self.configs = configs
5a27c7343   Masahiro Yamada   tools: moveconfig...
839
          self.options = options
1f16992ee   Masahiro Yamada   tools: moveconfig...
840
841
          self.dotconfig = os.path.join(build_dir, '.config')
          self.autoconf = os.path.join(build_dir, 'include', 'autoconf.mk')
07913d1e4   Masahiro Yamada   tools: moveconfig...
842
843
          self.spl_autoconf = os.path.join(build_dir, 'spl', 'include',
                                           'autoconf.mk')
f3b8e6470   Simon Glass   moveconfig: Add a...
844
          self.config_autoconf = os.path.join(build_dir, AUTO_CONF_PATH)
5da4f857b   Masahiro Yamada   tools: moveconfig...
845
          self.defconfig = os.path.join(build_dir, 'defconfig')
5a27c7343   Masahiro Yamada   tools: moveconfig...
846

6821a7457   Simon Glass   RFC: moveconfig: ...
847
848
      def get_arch(self):
          """Parse .config file and return the architecture.
5a27c7343   Masahiro Yamada   tools: moveconfig...
849
850
  
          Returns:
6821a7457   Simon Glass   RFC: moveconfig: ...
851
            Architecture name (e.g. 'arm').
5a27c7343   Masahiro Yamada   tools: moveconfig...
852
853
854
          """
          arch = ''
          cpu = ''
1f16992ee   Masahiro Yamada   tools: moveconfig...
855
          for line in open(self.dotconfig):
5a27c7343   Masahiro Yamada   tools: moveconfig...
856
857
858
859
860
861
862
              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...
863
864
          if not arch:
              return None
5a27c7343   Masahiro Yamada   tools: moveconfig...
865
866
867
868
  
          # fix-up for aarch64
          if arch == 'arm' and cpu == 'armv8':
              arch = 'aarch64'
6821a7457   Simon Glass   RFC: moveconfig: ...
869
          return arch
5a27c7343   Masahiro Yamada   tools: moveconfig...
870

b134bc135   Masahiro Yamada   tools: moveconfig...
871
      def parse_one_config(self, config, dotconfig_lines, autoconf_lines):
5a27c7343   Masahiro Yamada   tools: moveconfig...
872
873
874
875
876
877
878
          """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...
879
            config: CONFIG name to parse.
cc008299f   Masahiro Yamada   tools: moveconfig...
880
            dotconfig_lines: lines from the .config file.
5a27c7343   Masahiro Yamada   tools: moveconfig...
881
882
883
884
885
886
            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...
887
          not_set = '# %s is not set' % config
5a27c7343   Masahiro Yamada   tools: moveconfig...
888
889
890
          for line in autoconf_lines:
              line = line.rstrip()
              if line.startswith(config + '='):
cc008299f   Masahiro Yamada   tools: moveconfig...
891
                  new_val = line
5a27c7343   Masahiro Yamada   tools: moveconfig...
892
                  break
5a27c7343   Masahiro Yamada   tools: moveconfig...
893
          else:
cc008299f   Masahiro Yamada   tools: moveconfig...
894
              new_val = not_set
b237d358b   Markus Klotzbuecher   moveconfig: expan...
895
          new_val = try_expand(new_val)
916224c38   Masahiro Yamada   tools: moveconfig...
896
897
898
899
900
901
902
903
904
905
          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...
906
907
908
909
910
911
912
          # 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...
913

5030159e2   Masahiro Yamada   tools: moveconfig...
914
915
          return (ACTION_NO_CHANGE if old_val == new_val else ACTION_MOVE,
                  new_val)
5a27c7343   Masahiro Yamada   tools: moveconfig...
916

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

cc008299f   Masahiro Yamada   tools: moveconfig...
920
921
          This function parses the generated .config and include/autoconf.mk
          searching the target options.
6ff36d217   Masahiro Yamada   tools: moveconfig...
922
          Move the config option(s) to the .config as needed.
5a27c7343   Masahiro Yamada   tools: moveconfig...
923
924
925
  
          Arguments:
            defconfig: defconfig name.
522e8dcb4   Masahiro Yamada   tools: moveconfig...
926
927
  
          Returns:
7fb0bacd3   Masahiro Yamada   tools: moveconfig...
928
929
930
            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...
931
          """
5a27c7343   Masahiro Yamada   tools: moveconfig...
932
          results = []
7fb0bacd3   Masahiro Yamada   tools: moveconfig...
933
          updated = False
916224c38   Masahiro Yamada   tools: moveconfig...
934
          suspicious = False
07913d1e4   Masahiro Yamada   tools: moveconfig...
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
          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...
950

1f16992ee   Masahiro Yamada   tools: moveconfig...
951
          with open(self.dotconfig) as f:
cc008299f   Masahiro Yamada   tools: moveconfig...
952
              dotconfig_lines = f.readlines()
5a27c7343   Masahiro Yamada   tools: moveconfig...
953

07913d1e4   Masahiro Yamada   tools: moveconfig...
954
          with open(autoconf_path) as f:
5a27c7343   Masahiro Yamada   tools: moveconfig...
955
              autoconf_lines = f.readlines()
b134bc135   Masahiro Yamada   tools: moveconfig...
956
957
          for config in self.configs:
              result = self.parse_one_config(config, dotconfig_lines,
96464badc   Joe Hershberger   moveconfig: Alway...
958
                                             autoconf_lines)
5a27c7343   Masahiro Yamada   tools: moveconfig...
959
960
961
962
963
964
965
966
              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...
967
968
              elif action == ACTION_NO_ENTRY:
                  actlog = "%s is not defined in Kconfig.  Do nothing." % value
5a27c7343   Masahiro Yamada   tools: moveconfig...
969
                  log_color = COLOR_LIGHT_BLUE
916224c38   Masahiro Yamada   tools: moveconfig...
970
971
972
973
              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...
974
975
976
              elif action == ACTION_NO_CHANGE:
                  actlog = "'%s' is the same as the define in Kconfig.  Do nothing." \
                           % value
5a27c7343   Masahiro Yamada   tools: moveconfig...
977
                  log_color = COLOR_LIGHT_PURPLE
07913d1e4   Masahiro Yamada   tools: moveconfig...
978
979
980
              elif action == ACTION_SPL_NOT_EXIST:
                  actlog = "SPL is not enabled for this defconfig.  Skip."
                  log_color = COLOR_PURPLE
5a27c7343   Masahiro Yamada   tools: moveconfig...
981
982
              else:
                  sys.exit("Internal Error. This should not happen.")
1d085568b   Masahiro Yamada   tools: moveconfig...
983
984
              log += color_text(self.options.color, log_color, actlog) + '
  '
5a27c7343   Masahiro Yamada   tools: moveconfig...
985

1f16992ee   Masahiro Yamada   tools: moveconfig...
986
          with open(self.dotconfig, 'a') as f:
e423d17fc   Masahiro Yamada   tools: moveconfig...
987
988
989
990
              for (action, value) in results:
                  if action == ACTION_MOVE:
                      f.write(value + '
  ')
7fb0bacd3   Masahiro Yamada   tools: moveconfig...
991
                      updated = True
5a27c7343   Masahiro Yamada   tools: moveconfig...
992

5da4f857b   Masahiro Yamada   tools: moveconfig...
993
          self.results = results
07913d1e4   Masahiro Yamada   tools: moveconfig...
994
995
          for f in rm_files:
              os.remove(f)
5a27c7343   Masahiro Yamada   tools: moveconfig...
996

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

5da4f857b   Masahiro Yamada   tools: moveconfig...
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
      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
d73fcb12e   Simon Glass   moveconfig: Suppo...
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
  
  class DatabaseThread(threading.Thread):
      """This thread processes results from Slot threads.
  
      It collects the data in the master config directary. There is only one
      result thread, and this helps to serialise the build output.
      """
      def __init__(self, config_db, db_queue):
          """Set up a new result thread
  
          Args:
              builder: Builder which will be sent each result
          """
          threading.Thread.__init__(self)
          self.config_db = config_db
          self.db_queue= db_queue
  
      def run(self):
          """Called to start up the result thread.
  
          We collect the next result job and pass it on to the build.
          """
          while True:
              defconfig, configs = self.db_queue.get()
              self.config_db[defconfig] = configs
              self.db_queue.task_done()
5a27c7343   Masahiro Yamada   tools: moveconfig...
1049
1050
1051
1052
1053
1054
1055
1056
  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.
      """
6821a7457   Simon Glass   RFC: moveconfig: ...
1057
1058
      def __init__(self, toolchains, configs, options, progress, devnull,
  		 make_cmd, reference_src_dir, db_queue):
5a27c7343   Masahiro Yamada   tools: moveconfig...
1059
1060
1061
          """Create a new process slot.
  
          Arguments:
6821a7457   Simon Glass   RFC: moveconfig: ...
1062
            toolchains: Toolchains object containing toolchains.
b134bc135   Masahiro Yamada   tools: moveconfig...
1063
            configs: A list of CONFIGs to move.
5a27c7343   Masahiro Yamada   tools: moveconfig...
1064
            options: option flags.
c5e60fd49   Masahiro Yamada   tools: moveconfig...
1065
            progress: A progress indicator.
5a27c7343   Masahiro Yamada   tools: moveconfig...
1066
1067
            devnull: A file object of '/dev/null'.
            make_cmd: command name of GNU Make.
6b96c1a1c   Joe Hershberger   tools: moveconfig...
1068
1069
            reference_src_dir: Determine the true starting config state from this
                               source tree.
d73fcb12e   Simon Glass   moveconfig: Suppo...
1070
            db_queue: output queue to write config info for the database
5a27c7343   Masahiro Yamada   tools: moveconfig...
1071
          """
6821a7457   Simon Glass   RFC: moveconfig: ...
1072
          self.toolchains = toolchains
5a27c7343   Masahiro Yamada   tools: moveconfig...
1073
          self.options = options
c5e60fd49   Masahiro Yamada   tools: moveconfig...
1074
          self.progress = progress
5a27c7343   Masahiro Yamada   tools: moveconfig...
1075
1076
1077
          self.build_dir = tempfile.mkdtemp()
          self.devnull = devnull
          self.make_cmd = (make_cmd, 'O=' + self.build_dir)
6b96c1a1c   Joe Hershberger   tools: moveconfig...
1078
          self.reference_src_dir = reference_src_dir
d73fcb12e   Simon Glass   moveconfig: Suppo...
1079
          self.db_queue = db_queue
522e8dcb4   Masahiro Yamada   tools: moveconfig...
1080
          self.parser = KconfigParser(configs, options, self.build_dir)
5a27c7343   Masahiro Yamada   tools: moveconfig...
1081
          self.state = STATE_IDLE
09c6c0668   Masahiro Yamada   tools: moveconfig...
1082
1083
          self.failed_boards = set()
          self.suspicious_boards = set()
5a27c7343   Masahiro Yamada   tools: moveconfig...
1084
1085
1086
1087
1088
1089
  
      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...
1090
          because it is guaranteed the destructor is always invoked when the
5a27c7343   Masahiro Yamada   tools: moveconfig...
1091
1092
1093
1094
1095
1096
1097
1098
          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...
1099
      def add(self, defconfig):
5a27c7343   Masahiro Yamada   tools: moveconfig...
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
          """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...
1114

5a27c7343   Masahiro Yamada   tools: moveconfig...
1115
          self.defconfig = defconfig
1d085568b   Masahiro Yamada   tools: moveconfig...
1116
          self.log = ''
f432c33f2   Masahiro Yamada   tools: moveconfig...
1117
          self.current_src_dir = self.reference_src_dir
e307fa9d8   Masahiro Yamada   tools: moveconfig...
1118
          self.do_defconfig()
5a27c7343   Masahiro Yamada   tools: moveconfig...
1119
1120
1121
1122
1123
1124
1125
1126
1127
          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...
1128
1129
1130
1131
1132
          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...
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
  
          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...
1144
1145
              self.handle_error()
          elif self.state == STATE_DEFCONFIG:
f432c33f2   Masahiro Yamada   tools: moveconfig...
1146
              if self.reference_src_dir and not self.current_src_dir:
6b96c1a1c   Joe Hershberger   tools: moveconfig...
1147
1148
1149
                  self.do_savedefconfig()
              else:
                  self.do_autoconf()
e307fa9d8   Masahiro Yamada   tools: moveconfig...
1150
          elif self.state == STATE_AUTOCONF:
f432c33f2   Masahiro Yamada   tools: moveconfig...
1151
1152
              if self.current_src_dir:
                  self.current_src_dir = None
6b96c1a1c   Joe Hershberger   tools: moveconfig...
1153
                  self.do_defconfig()
d73fcb12e   Simon Glass   moveconfig: Suppo...
1154
1155
              elif self.options.build_db:
                  self.do_build_db()
6b96c1a1c   Joe Hershberger   tools: moveconfig...
1156
1157
              else:
                  self.do_savedefconfig()
e307fa9d8   Masahiro Yamada   tools: moveconfig...
1158
1159
1160
1161
          elif self.state == STATE_SAVEDEFCONFIG:
              self.update_defconfig()
          else:
              sys.exit("Internal Error. This should not happen.")
5a27c7343   Masahiro Yamada   tools: moveconfig...
1162

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

e307fa9d8   Masahiro Yamada   tools: moveconfig...
1165
1166
      def handle_error(self):
          """Handle error cases."""
8513dc048   Masahiro Yamada   tools: moveconfig...
1167

e307fa9d8   Masahiro Yamada   tools: moveconfig...
1168
1169
1170
1171
1172
          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,
4f5c5e99b   Markus Klotzbuecher   moveconfig: conve...
1173
                                     self.ps.stderr.read().decode())
e307fa9d8   Masahiro Yamada   tools: moveconfig...
1174
          self.finish(False)
96464badc   Joe Hershberger   moveconfig: Alway...
1175

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

e307fa9d8   Masahiro Yamada   tools: moveconfig...
1179
1180
1181
          cmd = list(self.make_cmd)
          cmd.append(self.defconfig)
          self.ps = subprocess.Popen(cmd, stdout=self.devnull,
f432c33f2   Masahiro Yamada   tools: moveconfig...
1182
1183
                                     stderr=subprocess.PIPE,
                                     cwd=self.current_src_dir)
e307fa9d8   Masahiro Yamada   tools: moveconfig...
1184
          self.state = STATE_DEFCONFIG
c8e1b10d0   Masahiro Yamada   tools: moveconfig...
1185

e307fa9d8   Masahiro Yamada   tools: moveconfig...
1186
      def do_autoconf(self):
f3b8e6470   Simon Glass   moveconfig: Add a...
1187
          """Run 'make AUTO_CONF_PATH'."""
5a27c7343   Masahiro Yamada   tools: moveconfig...
1188

6821a7457   Simon Glass   RFC: moveconfig: ...
1189
1190
1191
1192
          arch = self.parser.get_arch()
          try:
              toolchain = self.toolchains.Select(arch)
          except ValueError:
1d085568b   Masahiro Yamada   tools: moveconfig...
1193
              self.log += color_text(self.options.color, COLOR_YELLOW,
ce3ba458a   Chris Packham   moveconfig: fix e...
1194
1195
                      "Tool chain for '%s' is missing.  Do nothing.
  " % arch)
4efef998c   Masahiro Yamada   tools: moveconfig...
1196
              self.finish(False)
e307fa9d8   Masahiro Yamada   tools: moveconfig...
1197
              return
793dca34c   Simon Glass   move_config: Conv...
1198
          env = toolchain.MakeEnvironment(False)
90ed6cba5   Masahiro Yamada   tools: moveconfig...
1199

5a27c7343   Masahiro Yamada   tools: moveconfig...
1200
          cmd = list(self.make_cmd)
7740f653e   Joe Hershberger   moveconfig: Ignor...
1201
          cmd.append('KCONFIG_IGNORE_DUPLICATES=1')
f3b8e6470   Simon Glass   moveconfig: Add a...
1202
          cmd.append(AUTO_CONF_PATH)
6821a7457   Simon Glass   RFC: moveconfig: ...
1203
          self.ps = subprocess.Popen(cmd, stdout=self.devnull, env=env,
f432c33f2   Masahiro Yamada   tools: moveconfig...
1204
1205
                                     stderr=subprocess.PIPE,
                                     cwd=self.current_src_dir)
5a27c7343   Masahiro Yamada   tools: moveconfig...
1206
          self.state = STATE_AUTOCONF
e307fa9d8   Masahiro Yamada   tools: moveconfig...
1207

d73fcb12e   Simon Glass   moveconfig: Suppo...
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
      def do_build_db(self):
          """Add the board to the database"""
          configs = {}
          with open(os.path.join(self.build_dir, AUTO_CONF_PATH)) as fd:
              for line in fd.readlines():
                  if line.startswith('CONFIG'):
                      config, value = line.split('=', 1)
                      configs[config] = value.rstrip()
          self.db_queue.put([self.defconfig, configs])
          self.finish(True)
e307fa9d8   Masahiro Yamada   tools: moveconfig...
1218
1219
      def do_savedefconfig(self):
          """Update the .config and run 'make savedefconfig'."""
916224c38   Masahiro Yamada   tools: moveconfig...
1220
1221
1222
          (updated, suspicious, log) = self.parser.update_dotconfig()
          if suspicious:
              self.suspicious_boards.add(self.defconfig)
e307fa9d8   Masahiro Yamada   tools: moveconfig...
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
          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...
1244
1245
          log = self.parser.check_defconfig()
          if log:
09c6c0668   Masahiro Yamada   tools: moveconfig...
1246
              self.suspicious_boards.add(self.defconfig)
fc2661eeb   Masahiro Yamada   tools: moveconfig...
1247
              self.log += log
e307fa9d8   Masahiro Yamada   tools: moveconfig...
1248
1249
1250
1251
1252
          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...
1253
              self.log += color_text(self.options.color, COLOR_LIGHT_BLUE,
e307fa9d8   Masahiro Yamada   tools: moveconfig...
1254
1255
1256
1257
1258
1259
                                     "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...
1260

4efef998c   Masahiro Yamada   tools: moveconfig...
1261
1262
      def finish(self, success):
          """Display log along with progress and go to the idle state.
1d085568b   Masahiro Yamada   tools: moveconfig...
1263
1264
  
          Arguments:
4efef998c   Masahiro Yamada   tools: moveconfig...
1265
1266
            success: Should be True when the defconfig was processed
                     successfully, or False when it fails.
1d085568b   Masahiro Yamada   tools: moveconfig...
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
          """
          # 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.
793dca34c   Simon Glass   move_config: Conv...
1277
          print(log, file=(sys.stdout if success else sys.stderr))
4efef998c   Masahiro Yamada   tools: moveconfig...
1278
1279
1280
1281
1282
1283
  
          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...
1284
              self.failed_boards.add(self.defconfig)
4efef998c   Masahiro Yamada   tools: moveconfig...
1285

1d085568b   Masahiro Yamada   tools: moveconfig...
1286
1287
          self.progress.inc()
          self.progress.show()
4efef998c   Masahiro Yamada   tools: moveconfig...
1288
          self.state = STATE_IDLE
1d085568b   Masahiro Yamada   tools: moveconfig...
1289

5a27c7343   Masahiro Yamada   tools: moveconfig...
1290
      def get_failed_boards(self):
09c6c0668   Masahiro Yamada   tools: moveconfig...
1291
          """Returns a set of failed boards (defconfigs) in this slot.
5a27c7343   Masahiro Yamada   tools: moveconfig...
1292
1293
          """
          return self.failed_boards
fc2661eeb   Masahiro Yamada   tools: moveconfig...
1294
      def get_suspicious_boards(self):
09c6c0668   Masahiro Yamada   tools: moveconfig...
1295
          """Returns a set of boards (defconfigs) with possible misconversion.
fc2661eeb   Masahiro Yamada   tools: moveconfig...
1296
          """
916224c38   Masahiro Yamada   tools: moveconfig...
1297
          return self.suspicious_boards - self.failed_boards
fc2661eeb   Masahiro Yamada   tools: moveconfig...
1298

5a27c7343   Masahiro Yamada   tools: moveconfig...
1299
1300
1301
  class Slots:
  
      """Controller of the array of subprocess slots."""
6821a7457   Simon Glass   RFC: moveconfig: ...
1302
1303
      def __init__(self, toolchains, configs, options, progress,
  		 reference_src_dir, db_queue):
5a27c7343   Masahiro Yamada   tools: moveconfig...
1304
1305
1306
          """Create a new slots controller.
  
          Arguments:
6821a7457   Simon Glass   RFC: moveconfig: ...
1307
            toolchains: Toolchains object containing toolchains.
b134bc135   Masahiro Yamada   tools: moveconfig...
1308
            configs: A list of CONFIGs to move.
5a27c7343   Masahiro Yamada   tools: moveconfig...
1309
            options: option flags.
c5e60fd49   Masahiro Yamada   tools: moveconfig...
1310
            progress: A progress indicator.
6b96c1a1c   Joe Hershberger   tools: moveconfig...
1311
1312
            reference_src_dir: Determine the true starting config state from this
                               source tree.
d73fcb12e   Simon Glass   moveconfig: Suppo...
1313
            db_queue: output queue to write config info for the database
5a27c7343   Masahiro Yamada   tools: moveconfig...
1314
1315
1316
1317
1318
1319
          """
          self.options = options
          self.slots = []
          devnull = get_devnull()
          make_cmd = get_make_cmd()
          for i in range(options.jobs):
6821a7457   Simon Glass   RFC: moveconfig: ...
1320
1321
1322
              self.slots.append(Slot(toolchains, configs, options, progress,
  				   devnull, make_cmd, reference_src_dir,
  				   db_queue))
5a27c7343   Masahiro Yamada   tools: moveconfig...
1323

c5e60fd49   Masahiro Yamada   tools: moveconfig...
1324
      def add(self, defconfig):
5a27c7343   Masahiro Yamada   tools: moveconfig...
1325
1326
1327
1328
1329
1330
1331
1332
1333
          """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...
1334
              if slot.add(defconfig):
5a27c7343   Masahiro Yamada   tools: moveconfig...
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
                  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...
1363
          boards = set()
96dccd976   Masahiro Yamada   tools: moveconfig...
1364
          output_file = 'moveconfig.failed'
5a27c7343   Masahiro Yamada   tools: moveconfig...
1365
1366
  
          for slot in self.slots:
09c6c0668   Masahiro Yamada   tools: moveconfig...
1367
              boards |= slot.get_failed_boards()
96dccd976   Masahiro Yamada   tools: moveconfig...
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
  
          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
793dca34c   Simon Glass   move_config: Conv...
1378
1379
              print(color_text(self.options.color, COLOR_LIGHT_RED,
                                              msg), file=sys.stderr)
96dccd976   Masahiro Yamada   tools: moveconfig...
1380
1381
1382
  
              with open(output_file, 'w') as f:
                  f.write(boards)
2559cd896   Joe Hershberger   moveconfig: Outpu...
1383

fc2661eeb   Masahiro Yamada   tools: moveconfig...
1384
1385
      def show_suspicious_boards(self):
          """Display all boards (defconfigs) with possible misconversion."""
09c6c0668   Masahiro Yamada   tools: moveconfig...
1386
          boards = set()
fc2661eeb   Masahiro Yamada   tools: moveconfig...
1387
1388
1389
          output_file = 'moveconfig.suspicious'
  
          for slot in self.slots:
09c6c0668   Masahiro Yamada   tools: moveconfig...
1390
              boards |= slot.get_suspicious_boards()
fc2661eeb   Masahiro Yamada   tools: moveconfig...
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
  
          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
793dca34c   Simon Glass   move_config: Conv...
1403
1404
              print(color_text(self.options.color, COLOR_YELLOW,
                                              msg), file=sys.stderr)
fc2661eeb   Masahiro Yamada   tools: moveconfig...
1405
1406
1407
  
              with open(output_file, 'w') as f:
                  f.write(boards)
5cc42a518   Masahiro Yamada   tools: moveconfig...
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
  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()
793dca34c   Simon Glass   move_config: Conv...
1419
          print("Cloning git repo to a separate work directory...")
5cc42a518   Masahiro Yamada   tools: moveconfig...
1420
1421
          subprocess.check_output(['git', 'clone', os.getcwd(), '.'],
                                  cwd=self.src_dir)
793dca34c   Simon Glass   move_config: Conv...
1422
1423
          print("Checkout '%s' to build the original autoconf.mk." % \
              subprocess.check_output(['git', 'rev-parse', '--short', commit]).strip())
5cc42a518   Masahiro Yamada   tools: moveconfig...
1424
1425
          subprocess.check_output(['git', 'checkout', commit],
                                  stderr=subprocess.STDOUT, cwd=self.src_dir)
6b96c1a1c   Joe Hershberger   tools: moveconfig...
1426
1427
  
      def __del__(self):
5cc42a518   Masahiro Yamada   tools: moveconfig...
1428
          """Delete the reference source directory
6b96c1a1c   Joe Hershberger   tools: moveconfig...
1429
1430
1431
1432
1433
1434
  
          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...
1435
1436
1437
1438
          shutil.rmtree(self.src_dir)
  
      def get_dir(self):
          """Return the absolute path to the reference source directory."""
6b96c1a1c   Joe Hershberger   tools: moveconfig...
1439

5cc42a518   Masahiro Yamada   tools: moveconfig...
1440
          return self.src_dir
6b96c1a1c   Joe Hershberger   tools: moveconfig...
1441

6821a7457   Simon Glass   RFC: moveconfig: ...
1442
  def move_config(toolchains, configs, options, db_queue):
5a27c7343   Masahiro Yamada   tools: moveconfig...
1443
1444
1445
      """Move config options to defconfig files.
  
      Arguments:
b134bc135   Masahiro Yamada   tools: moveconfig...
1446
        configs: A list of CONFIGs to move.
5a27c7343   Masahiro Yamada   tools: moveconfig...
1447
1448
        options: option flags
      """
b134bc135   Masahiro Yamada   tools: moveconfig...
1449
      if len(configs) == 0:
6a9f79f71   Masahiro Yamada   tools: moveconfig...
1450
          if options.force_sync:
793dca34c   Simon Glass   move_config: Conv...
1451
              print('No CONFIG is specified. You are probably syncing defconfigs.', end=' ')
d73fcb12e   Simon Glass   moveconfig: Suppo...
1452
          elif options.build_db:
793dca34c   Simon Glass   move_config: Conv...
1453
              print('Building %s database' % CONFIG_DATABASE)
6a9f79f71   Masahiro Yamada   tools: moveconfig...
1454
          else:
793dca34c   Simon Glass   move_config: Conv...
1455
              print('Neither CONFIG nor --force-sync is specified. Nothing will happen.', end=' ')
6a9f79f71   Masahiro Yamada   tools: moveconfig...
1456
      else:
793dca34c   Simon Glass   move_config: Conv...
1457
1458
1459
          print('Move ' + ', '.join(configs), end=' ')
      print('(jobs: %d)
  ' % options.jobs)
5a27c7343   Masahiro Yamada   tools: moveconfig...
1460

6b96c1a1c   Joe Hershberger   tools: moveconfig...
1461
      if options.git_ref:
5cc42a518   Masahiro Yamada   tools: moveconfig...
1462
1463
1464
          reference_src = ReferenceSource(options.git_ref)
          reference_src_dir = reference_src.get_dir()
      else:
f432c33f2   Masahiro Yamada   tools: moveconfig...
1465
          reference_src_dir = None
6b96c1a1c   Joe Hershberger   tools: moveconfig...
1466

91040e853   Joe Hershberger   moveconfig: Add a...
1467
      if options.defconfigs:
0dbc9b591   Masahiro Yamada   tools: moveconfig...
1468
          defconfigs = get_matched_defconfigs(options.defconfigs)
91040e853   Joe Hershberger   moveconfig: Add a...
1469
      else:
684c306ec   Masahiro Yamada   tools: moveconfig...
1470
          defconfigs = get_all_defconfigs()
5a27c7343   Masahiro Yamada   tools: moveconfig...
1471

c5e60fd49   Masahiro Yamada   tools: moveconfig...
1472
      progress = Progress(len(defconfigs))
6821a7457   Simon Glass   RFC: moveconfig: ...
1473
1474
      slots = Slots(toolchains, configs, options, progress, reference_src_dir,
  		  db_queue)
5a27c7343   Masahiro Yamada   tools: moveconfig...
1475
1476
1477
1478
  
      # 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...
1479
1480
      for defconfig in defconfigs:
          while not slots.add(defconfig):
5a27c7343   Masahiro Yamada   tools: moveconfig...
1481
1482
1483
1484
1485
1486
1487
              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)
793dca34c   Simon Glass   move_config: Conv...
1488
      print('')
5a27c7343   Masahiro Yamada   tools: moveconfig...
1489
      slots.show_failed_boards()
fc2661eeb   Masahiro Yamada   tools: moveconfig...
1490
      slots.show_suspicious_boards()
5a27c7343   Masahiro Yamada   tools: moveconfig...
1491

cb008830a   Simon Glass   moveconfig: Allow...
1492
1493
1494
1495
  def find_kconfig_rules(kconf, config, imply_config):
      """Check whether a config has a 'select' or 'imply' keyword
  
      Args:
65e05ddc1   Tom Rini   kconfiglib: Updat...
1496
          kconf: Kconfiglib.Kconfig object
cb008830a   Simon Glass   moveconfig: Allow...
1497
1498
1499
1500
1501
1502
1503
          config: Name of config to check (without CONFIG_ prefix)
          imply_config: Implying config (without CONFIG_ prefix) which may or
              may not have an 'imply' for 'config')
  
      Returns:
          Symbol object for 'config' if found, else None
      """
65e05ddc1   Tom Rini   kconfiglib: Updat...
1504
      sym = kconf.syms.get(imply_config)
cb008830a   Simon Glass   moveconfig: Allow...
1505
      if sym:
4e1102f6d   Ulf Magnusson   kconfiglib: updat...
1506
          for sel in sym.get_selected_symbols() | sym.get_implied_symbols():
cb008830a   Simon Glass   moveconfig: Allow...
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
              if sel.get_name() == config:
                  return sym
      return None
  
  def check_imply_rule(kconf, config, imply_config):
      """Check if we can add an 'imply' option
  
      This finds imply_config in the Kconfig and looks to see if it is possible
      to add an 'imply' for 'config' to that part of the Kconfig.
  
      Args:
65e05ddc1   Tom Rini   kconfiglib: Updat...
1518
          kconf: Kconfiglib.Kconfig object
cb008830a   Simon Glass   moveconfig: Allow...
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
          config: Name of config to check (without CONFIG_ prefix)
          imply_config: Implying config (without CONFIG_ prefix) which may or
              may not have an 'imply' for 'config')
  
      Returns:
          tuple:
              filename of Kconfig file containing imply_config, or None if none
              line number within the Kconfig file, or 0 if none
              message indicating the result
      """
65e05ddc1   Tom Rini   kconfiglib: Updat...
1529
      sym = kconf.syms.get(imply_config)
cb008830a   Simon Glass   moveconfig: Allow...
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
      if not sym:
          return 'cannot find sym'
      locs = sym.get_def_locations()
      if len(locs) != 1:
          return '%d locations' % len(locs)
      fname, linenum = locs[0]
      cwd = os.getcwd()
      if cwd and fname.startswith(cwd):
          fname = fname[len(cwd) + 1:]
      file_line = ' at %s:%d' % (fname, linenum)
      with open(fname) as fd:
          data = fd.read().splitlines()
      if data[linenum - 1] != 'config %s' % imply_config:
          return None, 0, 'bad sym format %s%s' % (data[linenum], file_line)
      return fname, linenum, 'adding%s' % file_line
  
  def add_imply_rule(config, fname, linenum):
      """Add a new 'imply' option to a Kconfig
  
      Args:
          config: config option to add an imply for (without CONFIG_ prefix)
          fname: Kconfig filename to update
          linenum: Line number to place the 'imply' before
  
      Returns:
          Message indicating the result
      """
      file_line = ' at %s:%d' % (fname, linenum)
      data = open(fname).read().splitlines()
      linenum -= 1
  
      for offset, line in enumerate(data[linenum:]):
          if line.strip().startswith('help') or not line:
              data.insert(linenum + offset, '\timply %s' % config)
              with open(fname, 'w') as fd:
                  fd.write('
  '.join(data) + '
  ')
              return 'added%s' % file_line
  
      return 'could not insert%s'
  
  (IMPLY_MIN_2, IMPLY_TARGET, IMPLY_CMD, IMPLY_NON_ARCH_BOARD) = (
      1, 2, 4, 8)
9b2a2e87d   Simon Glass   moveconfig: Allow...
1574
1575
1576
1577
1578
  
  IMPLY_FLAGS = {
      'min2': [IMPLY_MIN_2, 'Show options which imply >2 boards (normally >5)'],
      'target': [IMPLY_TARGET, 'Allow CONFIG_TARGET_... options to imply'],
      'cmd': [IMPLY_CMD, 'Allow CONFIG_CMD_... to imply'],
cb008830a   Simon Glass   moveconfig: Allow...
1579
1580
1581
      'non-arch-board': [
          IMPLY_NON_ARCH_BOARD,
          'Allow Kconfig options outside arch/ and /board/ to imply'],
9b2a2e87d   Simon Glass   moveconfig: Allow...
1582
  };
cb008830a   Simon Glass   moveconfig: Allow...
1583
1584
  def do_imply_config(config_list, add_imply, imply_flags, skip_added,
                      check_kconfig=True, find_superset=False):
99b66605f   Simon Glass   moveconfig: Suppo...
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
      """Find CONFIG options which imply those in the list
  
      Some CONFIG options can be implied by others and this can help to reduce
      the size of the defconfig files. For example, CONFIG_X86 implies
      CONFIG_CMD_IRQ, so we can put 'imply CMD_IRQ' under 'config X86' and
      all x86 boards will have that option, avoiding adding CONFIG_CMD_IRQ to
      each of the x86 defconfig files.
  
      This function uses the moveconfig database to find such options. It
      displays a list of things that could possibly imply those in the list.
      The algorithm ignores any that start with CONFIG_TARGET since these
      typically refer to only a few defconfigs (often one). It also does not
      display a config with less than 5 defconfigs.
  
      The algorithm works using sets. For each target config in config_list:
          - Get the set 'defconfigs' which use that target config
          - For each config (from a list of all configs):
              - Get the set 'imply_defconfig' of defconfigs which use that config
              -
              - If imply_defconfigs contains anything not in defconfigs then
                this config does not imply the target config
  
      Params:
          config_list: List of CONFIG options to check (each a string)
cb008830a   Simon Glass   moveconfig: Allow...
1609
          add_imply: Automatically add an 'imply' for each config.
9b2a2e87d   Simon Glass   moveconfig: Allow...
1610
1611
          imply_flags: Flags which control which implying configs are allowed
             (IMPLY_...)
cb008830a   Simon Glass   moveconfig: Allow...
1612
1613
1614
          skip_added: Don't show options which already have an imply added.
          check_kconfig: Check if implied symbols already have an 'imply' or
              'select' for the target config, and show this information if so.
99b66605f   Simon Glass   moveconfig: Suppo...
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
          find_superset: True to look for configs which are a superset of those
              already found. So for example if CONFIG_EXYNOS5 implies an option,
              but CONFIG_EXYNOS covers a larger set of defconfigs and also
              implies that option, this will drop the former in favour of the
              latter. In practice this option has not proved very used.
  
      Note the terminoloy:
          config - a CONFIG_XXX options (a string, e.g. 'CONFIG_CMD_EEPROM')
          defconfig - a defconfig file (a string, e.g. 'configs/snow_defconfig')
      """
cb008830a   Simon Glass   moveconfig: Allow...
1625
1626
1627
      kconf = KconfigScanner().conf if check_kconfig else None
      if add_imply and add_imply != 'all':
          add_imply = add_imply.split()
99b66605f   Simon Glass   moveconfig: Suppo...
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
      # key is defconfig name, value is dict of (CONFIG_xxx, value)
      config_db = {}
  
      # Holds a dict containing the set of defconfigs that contain each config
      # key is config, value is set of defconfigs using that config
      defconfig_db = collections.defaultdict(set)
  
      # Set of all config options we have seen
      all_configs = set()
  
      # Set of all defconfigs we have seen
      all_defconfigs = set()
  
      # Read in the database
      configs = {}
      with open(CONFIG_DATABASE) as fd:
          for line in fd.readlines():
              line = line.rstrip()
              if not line:  # Separator between defconfigs
                  config_db[defconfig] = configs
                  all_defconfigs.add(defconfig)
                  configs = {}
              elif line[0] == ' ':  # CONFIG line
                  config, value = line.strip().split('=', 1)
                  configs[config] = value
                  defconfig_db[config].add(defconfig)
                  all_configs.add(config)
              else:  # New defconfig
                  defconfig = line
  
      # Work through each target config option in tern, independently
      for config in config_list:
          defconfigs = defconfig_db.get(config)
          if not defconfigs:
793dca34c   Simon Glass   move_config: Conv...
1662
              print('%s not found in any defconfig' % config)
99b66605f   Simon Glass   moveconfig: Suppo...
1663
1664
1665
1666
1667
1668
              continue
  
          # Get the set of defconfigs without this one (since a config cannot
          # imply itself)
          non_defconfigs = all_defconfigs - defconfigs
          num_defconfigs = len(defconfigs)
793dca34c   Simon Glass   move_config: Conv...
1669
1670
          print('%s found in %d/%d defconfigs' % (config, num_defconfigs,
                                                  len(all_configs)))
99b66605f   Simon Glass   moveconfig: Suppo...
1671
1672
1673
1674
1675
1676
1677
  
          # This will hold the results: key=config, value=defconfigs containing it
          imply_configs = {}
          rest_configs = all_configs - set([config])
  
          # Look at every possible config, except the target one
          for imply_config in rest_configs:
9b2a2e87d   Simon Glass   moveconfig: Allow...
1678
              if 'ERRATUM' in imply_config:
99b66605f   Simon Glass   moveconfig: Suppo...
1679
                  continue
9b2a2e87d   Simon Glass   moveconfig: Allow...
1680
1681
1682
1683
1684
1685
              if not (imply_flags & IMPLY_CMD):
                  if 'CONFIG_CMD' in imply_config:
                      continue
              if not (imply_flags & IMPLY_TARGET):
                  if 'CONFIG_TARGET' in imply_config:
                      continue
99b66605f   Simon Glass   moveconfig: Suppo...
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
  
              # Find set of defconfigs that have this config
              imply_defconfig = defconfig_db[imply_config]
  
              # Get the intersection of this with defconfigs containing the
              # target config
              common_defconfigs = imply_defconfig & defconfigs
  
              # Get the set of defconfigs containing this config which DO NOT
              # also contain the taret config. If this set is non-empty it means
              # that this config affects other defconfigs as well as (possibly)
              # the ones affected by the target config. This means it implies
              # things we don't want to imply.
              not_common_defconfigs = imply_defconfig & non_defconfigs
              if not_common_defconfigs:
                  continue
  
              # If there are common defconfigs, imply_config may be useful
              if common_defconfigs:
                  skip = False
                  if find_superset:
793dca34c   Simon Glass   move_config: Conv...
1707
                      for prev in list(imply_configs.keys()):
99b66605f   Simon Glass   moveconfig: Suppo...
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
                          prev_count = len(imply_configs[prev])
                          count = len(common_defconfigs)
                          if (prev_count > count and
                              (imply_configs[prev] & common_defconfigs ==
                              common_defconfigs)):
                              # skip imply_config because prev is a superset
                              skip = True
                              break
                          elif count > prev_count:
                              # delete prev because imply_config is a superset
                              del imply_configs[prev]
                  if not skip:
                      imply_configs[imply_config] = common_defconfigs
  
          # Now we have a dict imply_configs of configs which imply each config
          # The value of each dict item is the set of defconfigs containing that
          # config. Rank them so that we print the configs that imply the largest
          # number of defconfigs first.
cb008830a   Simon Glass   moveconfig: Allow...
1726
          ranked_iconfigs = sorted(imply_configs,
99b66605f   Simon Glass   moveconfig: Suppo...
1727
                              key=lambda k: len(imply_configs[k]), reverse=True)
cb008830a   Simon Glass   moveconfig: Allow...
1728
1729
1730
1731
1732
          kconfig_info = ''
          cwd = os.getcwd()
          add_list = collections.defaultdict(list)
          for iconfig in ranked_iconfigs:
              num_common = len(imply_configs[iconfig])
99b66605f   Simon Glass   moveconfig: Suppo...
1733
1734
  
              # Don't bother if there are less than 5 defconfigs affected.
9b2a2e87d   Simon Glass   moveconfig: Allow...
1735
              if num_common < (2 if imply_flags & IMPLY_MIN_2 else 5):
99b66605f   Simon Glass   moveconfig: Suppo...
1736
                  continue
cb008830a   Simon Glass   moveconfig: Allow...
1737
              missing = defconfigs - imply_configs[iconfig]
99b66605f   Simon Glass   moveconfig: Suppo...
1738
1739
              missing_str = ', '.join(missing) if missing else 'all'
              missing_str = ''
cb008830a   Simon Glass   moveconfig: Allow...
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
              show = True
              if kconf:
                  sym = find_kconfig_rules(kconf, config[CONFIG_LEN:],
                                           iconfig[CONFIG_LEN:])
                  kconfig_info = ''
                  if sym:
                      locs = sym.get_def_locations()
                      if len(locs) == 1:
                          fname, linenum = locs[0]
                          if cwd and fname.startswith(cwd):
                              fname = fname[len(cwd) + 1:]
                          kconfig_info = '%s:%d' % (fname, linenum)
                          if skip_added:
                              show = False
                  else:
65e05ddc1   Tom Rini   kconfiglib: Updat...
1755
                      sym = kconf.syms.get(iconfig[CONFIG_LEN:])
cb008830a   Simon Glass   moveconfig: Allow...
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
                      fname = ''
                      if sym:
                          locs = sym.get_def_locations()
                          if len(locs) == 1:
                              fname, linenum = locs[0]
                              if cwd and fname.startswith(cwd):
                                  fname = fname[len(cwd) + 1:]
                      in_arch_board = not sym or (fname.startswith('arch') or
                                                  fname.startswith('board'))
                      if (not in_arch_board and
                          not (imply_flags & IMPLY_NON_ARCH_BOARD)):
                          continue
  
                      if add_imply and (add_imply == 'all' or
                                        iconfig in add_imply):
                          fname, linenum, kconfig_info = (check_imply_rule(kconf,
                                  config[CONFIG_LEN:], iconfig[CONFIG_LEN:]))
                          if fname:
                              add_list[fname].append(linenum)
  
              if show and kconfig_info != 'skip':
793dca34c   Simon Glass   move_config: Conv...
1777
1778
                  print('%5d : %-30s%-25s %s' % (num_common, iconfig.ljust(30),
                                                kconfig_info, missing_str))
cb008830a   Simon Glass   moveconfig: Allow...
1779
1780
1781
1782
1783
1784
  
          # Having collected a list of things to add, now we add them. We process
          # each file from the largest line number to the smallest so that
          # earlier additions do not affect our line numbers. E.g. if we added an
          # imply at line 20 it would change the position of each line after
          # that.
793dca34c   Simon Glass   move_config: Conv...
1785
          for fname, linenums in add_list.items():
cb008830a   Simon Glass   moveconfig: Allow...
1786
1787
              for linenum in sorted(linenums, reverse=True):
                  add_imply_rule(config[CONFIG_LEN:], fname, linenum)
99b66605f   Simon Glass   moveconfig: Suppo...
1788

5a27c7343   Masahiro Yamada   tools: moveconfig...
1789
1790
1791
1792
1793
1794
1795
1796
  def main():
      try:
          cpu_count = multiprocessing.cpu_count()
      except NotImplementedError:
          cpu_count = 1
  
      parser = optparse.OptionParser()
      # Add options here
cb008830a   Simon Glass   moveconfig: Allow...
1797
1798
1799
1800
1801
1802
      parser.add_option('-a', '--add-imply', type='string', default='',
                        help='comma-separated list of CONFIG options to add '
                        "an 'imply' statement to for the CONFIG in -i")
      parser.add_option('-A', '--skip-added', action='store_true', default=False,
                        help="don't show options which are already marked as "
                        'implying others')
d73fcb12e   Simon Glass   moveconfig: Suppo...
1803
1804
      parser.add_option('-b', '--build-db', action='store_true', default=False,
                        help='build a CONFIG database')
5a27c7343   Masahiro Yamada   tools: moveconfig...
1805
1806
      parser.add_option('-c', '--color', action='store_true', default=False,
                        help='display the log in color')
9ede21234   Simon Glass   moveconfig: Add a...
1807
1808
      parser.add_option('-C', '--commit', action='store_true', default=False,
                        help='Create a git commit for the operation')
91040e853   Joe Hershberger   moveconfig: Add a...
1809
      parser.add_option('-d', '--defconfigs', type='string',
ee4e61bda   Simon Glass   moveconfig: Allow...
1810
1811
1812
                        help='a file containing a list of defconfigs to move, '
                        "one per line (for example 'snow_defconfig') "
                        "or '-' to read from stdin")
99b66605f   Simon Glass   moveconfig: Suppo...
1813
1814
      parser.add_option('-i', '--imply', action='store_true', default=False,
                        help='find options which imply others')
9b2a2e87d   Simon Glass   moveconfig: Allow...
1815
1816
      parser.add_option('-I', '--imply-flags', type='string', default='',
                        help="control the -i option ('help' for help")
5a27c7343   Masahiro Yamada   tools: moveconfig...
1817
1818
1819
1820
1821
      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...
1822
1823
      parser.add_option('-s', '--force-sync', action='store_true', default=False,
                        help='force sync by savedefconfig')
07913d1e4   Masahiro Yamada   tools: moveconfig...
1824
1825
      parser.add_option('-S', '--spl', action='store_true', default=False,
                        help='parse config options defined for SPL build')
2144f8804   Joe Hershberger   moveconfig: Add a...
1826
1827
1828
      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...
1829
1830
      parser.add_option('-j', '--jobs', type='int', default=cpu_count,
                        help='the number of jobs to run simultaneously')
6b96c1a1c   Joe Hershberger   tools: moveconfig...
1831
1832
      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...
1833
1834
      parser.add_option('-y', '--yes', action='store_true', default=False,
                        help="respond 'yes' to any prompts")
95bf9c7e3   Joe Hershberger   moveconfig: Add a...
1835
1836
      parser.add_option('-v', '--verbose', action='store_true', default=False,
                        help='show any build errors as boards are built')
b6ef393ad   Masahiro Yamada   tools: moveconfig...
1837
      parser.usage += ' CONFIG ...'
5a27c7343   Masahiro Yamada   tools: moveconfig...
1838

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

99b66605f   Simon Glass   moveconfig: Suppo...
1841
1842
      if len(configs) == 0 and not any((options.force_sync, options.build_db,
                                        options.imply)):
5a27c7343   Masahiro Yamada   tools: moveconfig...
1843
1844
          parser.print_usage()
          sys.exit(1)
b6ef393ad   Masahiro Yamada   tools: moveconfig...
1845
1846
1847
      # 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...
1848

2144f8804   Joe Hershberger   moveconfig: Add a...
1849
      check_top_directory()
99b66605f   Simon Glass   moveconfig: Suppo...
1850
      if options.imply:
9b2a2e87d   Simon Glass   moveconfig: Allow...
1851
          imply_flags = 0
dee36c74e   Simon Glass   moveconfig: Tidy ...
1852
1853
1854
1855
1856
1857
1858
          if options.imply_flags == 'all':
              imply_flags = -1
  
          elif options.imply_flags:
              for flag in options.imply_flags.split(','):
                  bad = flag not in IMPLY_FLAGS
                  if bad:
793dca34c   Simon Glass   move_config: Conv...
1859
                      print("Invalid flag '%s'" % flag)
dee36c74e   Simon Glass   moveconfig: Tidy ...
1860
                  if flag == 'help' or bad:
793dca34c   Simon Glass   move_config: Conv...
1861
1862
1863
                      print("Imply flags: (separate with ',')")
                      for name, info in IMPLY_FLAGS.items():
                          print(' %-15s: %s' % (name, info[1]))
dee36c74e   Simon Glass   moveconfig: Tidy ...
1864
1865
1866
                      parser.print_usage()
                      sys.exit(1)
                  imply_flags |= IMPLY_FLAGS[flag][0]
9b2a2e87d   Simon Glass   moveconfig: Allow...
1867

cb008830a   Simon Glass   moveconfig: Allow...
1868
1869
          do_imply_config(configs, options.add_imply, imply_flags,
                          options.skip_added)
99b66605f   Simon Glass   moveconfig: Suppo...
1870
          return
d73fcb12e   Simon Glass   moveconfig: Suppo...
1871
      config_db = {}
793dca34c   Simon Glass   move_config: Conv...
1872
      db_queue = queue.Queue()
d73fcb12e   Simon Glass   moveconfig: Suppo...
1873
1874
1875
      t = DatabaseThread(config_db, db_queue)
      t.setDaemon(True)
      t.start()
2144f8804   Joe Hershberger   moveconfig: Add a...
1876
      if not options.cleanup_headers_only:
f7536f798   Masahiro Yamada   tools: moveconfig...
1877
          check_clean_directory()
793dca34c   Simon Glass   move_config: Conv...
1878
          bsettings.Setup('')
6821a7457   Simon Glass   RFC: moveconfig: ...
1879
1880
1881
1882
          toolchains = toolchain.Toolchains()
          toolchains.GetSettings()
          toolchains.Scan(verbose=False)
          move_config(toolchains, configs, options, db_queue)
d73fcb12e   Simon Glass   moveconfig: Suppo...
1883
          db_queue.join()
2144f8804   Joe Hershberger   moveconfig: Add a...
1884

6a9f79f71   Masahiro Yamada   tools: moveconfig...
1885
      if configs:
e9ea12215   Masahiro Yamada   tools: moveconfig...
1886
          cleanup_headers(configs, options)
9ab0296a8   Masahiro Yamada   tools: moveconfig...
1887
          cleanup_extra_options(configs, options)
ca43834d6   Chris Packham   tools: moveconfig...
1888
          cleanup_whitelist(configs, options)
f90df596a   Chris Packham   tools: moveconfig...
1889
          cleanup_readme(configs, options)
5a27c7343   Masahiro Yamada   tools: moveconfig...
1890

9ede21234   Simon Glass   moveconfig: Add a...
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
      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])
d73fcb12e   Simon Glass   moveconfig: Suppo...
1909
1910
      if options.build_db:
          with open(CONFIG_DATABASE, 'w') as fd:
793dca34c   Simon Glass   move_config: Conv...
1911
              for defconfig, configs in config_db.items():
c79d18c4b   Simon Glass   moveconfig: Use f...
1912
1913
                  fd.write('%s
  ' % defconfig)
d73fcb12e   Simon Glass   moveconfig: Suppo...
1914
                  for config in sorted(configs.keys()):
c79d18c4b   Simon Glass   moveconfig: Use f...
1915
1916
1917
1918
                      fd.write('   %s=%s
  ' % (config, configs[config]))
                  fd.write('
  ')
d73fcb12e   Simon Glass   moveconfig: Suppo...
1919

5a27c7343   Masahiro Yamada   tools: moveconfig...
1920
1921
  if __name__ == '__main__':
      main()