Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

manifest: Update sdk-zephyr revision #15530

Merged
merged 7 commits into from
Jun 15, 2024
Merged

manifest: Update sdk-zephyr revision #15530

merged 7 commits into from
Jun 15, 2024
+62 −48

Commits on Jun 14, 2024

  1. cmake: use APPLICATION_BINARY_DIR in fast_pair.cmake for pm.config 

    partition_manager.cmake generates the pm.config files under the
APPLICATION_BINARY_DIR folder.
Update fast_pair.cmake to use APPLICATION_BINARY_DIR instead of
CMAKE_BINARY_DIR so that location in fast_pair.cmake is aligned
to the location used in partition_manager.cmake.

Signed-off-by: Torsten Rasmussen <[email protected]>
    @tejlmand
    tejlmand committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    a051c3c View commit details
    Browse the repository at this point in the history

  2. cmake: update zip.cmake and [b0]_packaging.cmake to use absolute path 

    Update zip.cmake, packaging.cmake and b0_packaging.cmake to reference
bin files using absolute paths. Also update the location of the
dfu_application.zip to be at the CMAKE_BINARY_DIR instead of the
PROJECT_BINARY_DIR for images' bin-files.

Using CMAKE_BINARY_DIR ensures that the zip file is always placed at the
toplevel in the build directory.

Use CMAKE_BINARY_DIR for signed_by bin-files to align the absolute
path and ensure b0_mcuboot_signing.cmake uses same path.

Signed-off-by: Torsten Rasmussen <[email protected]>
    @tejlmand
    tejlmand committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    ba7fd60 View commit details
    Browse the repository at this point in the history

  3. cmake: reference the application's .config using absolute path 

    Update provision_hex.cmake and sign.cmake to use absolute path to the
application's .config file to ensure correct dependency handling.

Signed-off-by: Torsten Rasmussen <[email protected]>
    @tejlmand
    tejlmand committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    048e67f View commit details
    Browse the repository at this point in the history

  4. cmake: align reference to .config in suit.cmake 

    kconfig.cmake generates `.config` as `${PROJECT_BINARY_DIR}/.config`.
Adjust `${CMAKE_BINARY_DIR}/zephyr/.config` to
`${PROJECT_BINARY_DIR}/.config`.

Signed-off-by: Torsten Rasmussen <[email protected]>
    @tejlmand
    tejlmand committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    3fcbec1 View commit details
    Browse the repository at this point in the history

  5. cmake: place merged.hex CMAKE_BINARY_DIR 

    partition_manager.cmake creates `merged.hex` as
`${PROJECT_BINARY_DIR}/merged.hex`.

Adjust `${PROJECT_BINARY_DIR}/merged.hex` to
`${CMAKE_BINARY_DIR}/merged.hex` so that external tools / tests / etc.
which looks for `merged.hex` at top-level build folder can still find
it.

Signed-off-by: Torsten Rasmussen <[email protected]>
    @tejlmand
    tejlmand committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    c84b03a View commit details
    Browse the repository at this point in the history

  6. cmake: update sign.cmake and debug_keys.cmake to use CMAKE_BINARY_DIR 

    Update sign.cmake and debug_keys.cmake to use CMAKE_BINARY_DIR instead
of PROJECT_BINARY_DIR.

Using CMAKE_BINARY_DIR ensures that the pem files are always placed at
the toplevel in the build directory.

Signed-off-by: Torsten Rasmussen <[email protected]>
    @tejlmand
    tejlmand committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    5eedca5 View commit details
    Browse the repository at this point in the history

  7. manifest: Update sdk-zephyr revision 

    Update sdk-zephyr to pull in APPLICATION_CONFIG_DIR support in sysbuild.

Signed-off-by: Torsten Rasmussen <[email protected]>
    @tejlmand
    tejlmand committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    21a187b View commit details
    Browse the repository at this point in the history