From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joe Hershberger Date: Wed, 13 May 2015 17:28:49 -0500 Subject: [U-Boot] [PATCH v3 03/10] moveconfig: Error if missing the include/autoconf.mk In-Reply-To: <1431556137-8426-1-git-send-email-joe.hershberger@ni.com> References: <1431364998-2905-1-git-send-email-joe.hershberger@ni.com> <1431556137-8426-1-git-send-email-joe.hershberger@ni.com> Message-ID: <1431556137-8426-3-git-send-email-joe.hershberger@ni.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de The main image autoconf.mk certainly had better exist or this tool won't function at all. Check for this and error if missing. The SPL and TPL don't even exist as separate .config files any more. Signed-off-by: Joe Hershberger --- Changes in v3: None Changes in v2: None tools/moveconfig.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/moveconfig.py b/tools/moveconfig.py index d9ae859..b4ee0e3 100755 --- a/tools/moveconfig.py +++ b/tools/moveconfig.py @@ -183,6 +183,8 @@ class KconfigParser: 'autoconf.mk') if not os.path.exists(autoconf): + if img == '.': + return True values.append('') continue @@ -227,6 +229,7 @@ class KconfigParser: if prefixes[line] != '+': line = prefixes[line] + ':' + line f.write(line + '\n') + return False class Slot: @@ -307,7 +310,8 @@ class Slot: return True if self.state == STATE_SILENTOLDCONFIG: - self.parser.update_defconfig(self.defconfig) + if self.parser.update_defconfig(self.defconfig): + self.defconfig_error('ERROR - autoconf.mk not found') self.state = STATE_IDLE return True -- 1.7.11.5