|
19 | 19 | FIND_BUILD_DIR_DESCRIPTION |
20 | 20 | from runners.core import BuildConfiguration |
21 | 21 | from zcmake import CMakeCache |
22 | | -from zephyr_ext_common import Forceable, load_dot_config, \ |
23 | | - ZEPHYR_SCRIPTS |
| 22 | +from zephyr_ext_common import Forceable, ZEPHYR_SCRIPTS |
24 | 23 |
|
25 | 24 | # This is needed to load edt.pickle files. |
26 | 25 | sys.path.append(str(ZEPHYR_SCRIPTS / 'dts' / 'python-devicetree' / 'src')) |
@@ -222,17 +221,11 @@ def sign(self, command, build_dir, bcfg, formats): |
222 | 221 | flash = self.edt_flash_node(b, args.quiet) |
223 | 222 | align, addr, size = self.edt_flash_params(flash) |
224 | 223 |
|
225 | | - dot_config_file = b / 'zephyr' / '.config' |
226 | | - if not dot_config_file.is_file(): |
227 | | - log.die(f"no .config found at {dot_config_file}") |
228 | | - |
229 | | - dot_config = load_dot_config(dot_config_file) |
230 | | - |
231 | | - if dot_config.get('CONFIG_BOOTLOADER_MCUBOOT', 'n') != 'y': |
| 224 | + if bcfg.get('CONFIG_BOOTLOADER_MCUBOOT', 'n') != 'y': |
232 | 225 | log.wrn("CONFIG_BOOTLOADER_MCUBOOT is not set to y in " |
233 | | - f"{dot_config_file}; this probably won't work") |
| 226 | + f"{bcfg.path}; this probably won't work") |
234 | 227 |
|
235 | | - kernel = dot_config.get('CONFIG_KERNEL_BIN_NAME', 'zephyr') |
| 228 | + kernel = bcfg.get('CONFIG_KERNEL_BIN_NAME', 'zephyr') |
236 | 229 |
|
237 | 230 | if 'bin' in formats: |
238 | 231 | in_bin = b / 'zephyr' / f'{kernel}.bin' |
|
0 commit comments