buildman: Refactor target handling in Boards.scan()

Move the assert to the top of the function and provide an explicit
variables for the target name and base name.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2023-07-19 17:48:20 -06:00
parent bc12d03493
commit f99f34b14b

View file

@ -231,6 +231,10 @@ class KconfigScanner:
'config': <config_header_name>,
}
"""
leaf = os.path.basename(defconfig)
expect_target, match, rear = leaf.partition('_defconfig')
assert match and not rear, f'{leaf} : invalid defconfig'
self._conf.load_config(defconfig)
self._tmpfile = None
@ -245,9 +249,7 @@ class KconfigScanner:
else:
params[key] = '-'
defconfig = os.path.basename(defconfig)
params['target'], match, rear = defconfig.partition('_defconfig')
assert match and not rear, f'{defconfig} : invalid defconfig'
params['target'] = expect_target
# fix-up for aarch64
if params['arch'] == 'arm' and params['cpu'] == 'armv8':