[U-Boot] [PATCH 4/6] moveconfig: Add a constant for auto.conf

Simon Glass
2017-05-15T11:47:34Z

This filename is used a few times. Move it to a constant before adding
further uses.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

tools/moveconfig.py | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tools/moveconfig.py b/tools/moveconfig.py
index 059abb8858..ba40c33521 100755
--- a/tools/moveconfig.py
+++ b/tools/moveconfig.py
@@ -259,6 +259,9 @@ COLOR_LIGHT_PURPLE = '1;35'
COLOR_LIGHT_CYAN = '1;36'
COLOR_WHITE = '1;37'

+AUTO_CONF_PATH = 'include/config/auto.conf'
+
+
### helper functions ###
def get_devnull():
"""Get the file object of '/dev/null' device."""
@@ -748,8 +751,7 @@ class KconfigParser:
self.autoconf = os.path.join(build_dir, 'include', 'autoconf.mk')
self.spl_autoconf = os.path.join(build_dir, 'spl', 'include',
'autoconf.mk')
- self.config_autoconf = os.path.join(build_dir, 'include', 'config',
- 'auto.conf')
+ self.config_autoconf = os.path.join(build_dir, AUTO_CONF_PATH)
self.defconfig = os.path.join(build_dir, 'defconfig')

def get_cross_compile(self):
@@ -1067,7 +1069,7 @@ class Slot:
self.state = STATE_DEFCONFIG

def do_autoconf(self):
- """Run 'make include/config/auto.conf'."""
+ """Run 'make AUTO_CONF_PATH'."""

self.cross_compile = self.parser.get_cross_compile()
if self.cross_compile is None:
@@ -1080,7 +1082,7 @@ class Slot:
if self.cross_compile:
cmd.append('CROSS_COMPILE=%s' % self.cross_compile)
cmd.append('KCONFIG_IGNORE_DUPLICATES=1')
- cmd.append('include/config/auto.conf')
+ cmd.append(AUTO_CONF_PATH)
self.ps = subprocess.Popen(cmd, stdout=self.devnull,
stderr=subprocess.PIPE,
cwd=self.current_src_dir)
--
2.13.0.rc2.291.g57267f2277-goog