Skip to content

Commit

Permalink
[nrfconnect] Fixed nrfconnect flashing after NCS 2.7.0 update (#34480)
Browse files Browse the repository at this point in the history
The flashing script used by cloudbuild stopped to work after
NCS update to 2.7.0, due to the path and files location
changes.
  • Loading branch information
kkasperczyk-no authored and pull[bot] committed Aug 23, 2024
1 parent b001c3d commit 1090846
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions config/nrfconnect/app/flashing.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ add_custom_command(OUTPUT "${FLASHBUNDLE_FLASHER_PLATFORM}"
VERBATIM)

if (merged_hex_to_flash)
set(flashbundle_hex_to_copy "zephyr/${merged_hex_to_flash}")
set(flashbundle_hex_to_copy "${merged_hex_to_flash}")
else()
set(flashbundle_hex_to_copy "zephyr/${KERNEL_HEX_NAME}")
set(flashbundle_hex_to_copy "../merged.hex")
endif()

add_custom_command(OUTPUT "${FLASHBUNDLE_FIRMWARE}"
Expand Down
6 changes: 3 additions & 3 deletions scripts/build/builders/nrf.py
Original file line number Diff line number Diff line change
Expand Up @@ -224,16 +224,16 @@ def _build(self):
def _bundle(self):
logging.info(f'Generating flashbundle at {self.output_dir}')

self._Execute(['ninja', '-C', self.output_dir, 'flashing_script'],
self._Execute(['ninja', '-C', os.path.join(self.output_dir, 'nrfconnect'), 'flashing_script'],
title='Generating flashable files of ' + self.identifier)

def build_outputs(self):
yield BuilderOutput(
os.path.join(self.output_dir, 'zephyr', 'zephyr.elf'),
os.path.join(self.output_dir, 'nrfconnect', 'zephyr', 'zephyr.elf'),
'%s.elf' % self.app.AppNamePrefix())
if self.options.enable_link_map_file:
yield BuilderOutput(
os.path.join(self.output_dir, 'zephyr', 'zephyr.map'),
os.path.join(self.output_dir, 'nrfconnect', 'zephyr', 'zephyr.map'),
'%s.map' % self.app.AppNamePrefix())

def bundle_outputs(self):
Expand Down

0 comments on commit 1090846

Please sign in to comment.