提交 f3b8e647 编写于 作者: S Simon Glass

moveconfig: Add a constant for auto.conf

This filename is used a few times. Move it to a constant before adding
further uses.
Signed-off-by: NSimon Glass <sjg@chromium.org>
上级 ddf91c64
...@@ -262,6 +262,9 @@ COLOR_LIGHT_PURPLE = '1;35' ...@@ -262,6 +262,9 @@ COLOR_LIGHT_PURPLE = '1;35'
COLOR_LIGHT_CYAN = '1;36' COLOR_LIGHT_CYAN = '1;36'
COLOR_WHITE = '1;37' COLOR_WHITE = '1;37'
AUTO_CONF_PATH = 'include/config/auto.conf'
### helper functions ### ### helper functions ###
def get_devnull(): def get_devnull():
"""Get the file object of '/dev/null' device.""" """Get the file object of '/dev/null' device."""
...@@ -751,8 +754,7 @@ class KconfigParser: ...@@ -751,8 +754,7 @@ class KconfigParser:
self.autoconf = os.path.join(build_dir, 'include', 'autoconf.mk') self.autoconf = os.path.join(build_dir, 'include', 'autoconf.mk')
self.spl_autoconf = os.path.join(build_dir, 'spl', 'include', self.spl_autoconf = os.path.join(build_dir, 'spl', 'include',
'autoconf.mk') 'autoconf.mk')
self.config_autoconf = os.path.join(build_dir, 'include', 'config', self.config_autoconf = os.path.join(build_dir, AUTO_CONF_PATH)
'auto.conf')
self.defconfig = os.path.join(build_dir, 'defconfig') self.defconfig = os.path.join(build_dir, 'defconfig')
def get_cross_compile(self): def get_cross_compile(self):
...@@ -1070,7 +1072,7 @@ class Slot: ...@@ -1070,7 +1072,7 @@ class Slot:
self.state = STATE_DEFCONFIG self.state = STATE_DEFCONFIG
def do_autoconf(self): def do_autoconf(self):
"""Run 'make include/config/auto.conf'.""" """Run 'make AUTO_CONF_PATH'."""
self.cross_compile = self.parser.get_cross_compile() self.cross_compile = self.parser.get_cross_compile()
if self.cross_compile is None: if self.cross_compile is None:
...@@ -1083,7 +1085,7 @@ class Slot: ...@@ -1083,7 +1085,7 @@ class Slot:
if self.cross_compile: if self.cross_compile:
cmd.append('CROSS_COMPILE=%s' % self.cross_compile) cmd.append('CROSS_COMPILE=%s' % self.cross_compile)
cmd.append('KCONFIG_IGNORE_DUPLICATES=1') 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, self.ps = subprocess.Popen(cmd, stdout=self.devnull,
stderr=subprocess.PIPE, stderr=subprocess.PIPE,
cwd=self.current_src_dir) cwd=self.current_src_dir)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册