Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nrfconnect/sdk-zephyr
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: prestegaard/fw-nrfconnect-zephyr
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 20 commits
  • 36 files changed
  • 11 contributors

Commits on Feb 4, 2020

  1. [nrf noup] ci: Add Jenkins-based CI for zephyr

    This patch is a squash containing the Jenkins-based NCS CI patches for
    Zephyr thus far.
    
    Signed-off-by: Thomas Stilwell <[email protected]>
    Signed-off-by: Ulrich Myhre <[email protected]>
    Signed-off-by: Martí Bolívar <[email protected]>
    (cherry picked from commit 7ddb13d)
    thst-nordic authored and mbolivar-nordic committed Feb 4, 2020
    Configuration menu
    Copy the full SHA
    855c1d4 View commit details
    Browse the repository at this point in the history
  2. [nrf noup] codeowner: Add entry for .github and Jenkinsfile

    @thst-nordic
    github is where Github-Action configurations are kept
    
    Signed-off-by: Thomas Stilwell <[email protected]>
    (cherry picked from commit 647c406)
    thst-nordic authored and mbolivar-nordic committed Feb 4, 2020
    Configuration menu
    Copy the full SHA
    7931fe8 View commit details
    Browse the repository at this point in the history
  3. [nrf noup] ci: Adding Github-Actions:Backport-Bot

    Using NordicBuilder user and free-tier actions
    
    Signed-off-by: Thomas Stilwell <[email protected]>
    (cherry picked from commit eb4e78d)
    thst-nordic authored and mbolivar-nordic committed Feb 4, 2020
    Configuration menu
    Copy the full SHA
    bfa84cb View commit details
    Browse the repository at this point in the history
  4. [nrf noup] bluetooth: controller: default to SPLIT architecture

    Default the BLE Controller to the SPLIT architecture.
    
    Signed-off-by: Ioannis Glaropoulos <[email protected]>
    (cherry picked from commit 7b202cc)
    ioannisg authored and mbolivar-nordic committed Feb 4, 2020
    Configuration menu
    Copy the full SHA
    2e0abca View commit details
    Browse the repository at this point in the history
  5. [nrf noup] include: net: add nRF91 extensions

    Add some socket options and address family extensions to Zephyr
    headers, which will be useful for nRF91.
    
    - AF_LTE family
    - AF_LOCAL family
    - NPROTO_AT protocol
    - NPROTO_PDN protocol, to be used in conjuction with AF_LTE
    - NPROTO_DFU protocol to be used in conjuction with AF_LOCAL
    - SOCK_MGMT socket type, used in conjunction with AF_LTE
    - SO_RCVTIMEO socket option
    - SO_BINDTODEVICE socket option
    - SOL_PDN and SOL_DFU socket option levels, and associated socket
      option values: SO_PDN_CONTEXT_ID option for PDN sockets,
      SO_PDN_STATE option for PDN sockets to retrieve the state of the PDN
      connection
    - SOL_DFU protocol level and socket options. This includes a
      SO_DFU_ERROR socket option for DFU socket can be used when a
      operation on a DFU socket returns -ENOEXEC, indicating that the
      modem has rejected the operation, to retrieve the reason for the
      error.
    
    Signed-off-by: Håkon Alseth <[email protected]>
    Signed-off-by: Robert Lubos <[email protected]>
    Signed-off-by: Martí Bolívar <[email protected]>
    Signed-off-by: Glenn Ruben Bakke <[email protected]>
    Signed-off-by: Christopher Métrailler <[email protected]>
    Signed-off-by: Emanuele Di Santo <[email protected]>
    (cherry picked from commit 4c24a64)
    Rallare authored and mbolivar-nordic committed Feb 4, 2020
    Configuration menu
    Copy the full SHA
    b697fd1 View commit details
    Browse the repository at this point in the history
  6. [nrf temphack] boards: qemu_cortex_r5: Make the board non-default

    Remove the `default` key that is set for the board, so that it is
    not picked automatically by the sanitycheck script.
    This hack is needed until the zephyr-sdk is updated to 0.11.0,
    as this board currently requires testing on QEMU not available in
    version 0.10.3. See commit 59cb2ac.
    
    Signed-off-by: Andrzej Głąbek <[email protected]>
    (cherry picked from commit a32d8db)
    anangl authored and mbolivar-nordic committed Feb 4, 2020
    Configuration menu
    Copy the full SHA
    474388f View commit details
    Browse the repository at this point in the history
  7. [nrf noup] tree-wide: support NCS Partition Manager (PM) definitions

    Partition Manager (PM) is a component of the nRF Connect SDK (NCS)
    which uses yaml files to resolve flash partition placement with a
    holistic view of the entire device, including each firmware image
    present on the flash device, and various subsystems, such as settings
    and NFFS.
    
    When this NCS extension is used, various source files which would use
    partition information from devicetree in "vanilla" zephyr instead use
    defines generated by PM instead.
    
    This commit removes support for HEX_FILES_TO_MERGE, as it conflicts
    with PM.
    
    The settings subsystem pm.yml defines a partition 'settings_storage'.
    The nffs subsystem pm.yml defines 'nffs_storage'.
    
    Refer to the NCS documentation page for this feature for more details.
    
    Signed-off-by: Håkon Øye Amundsen <[email protected]>
    Signed-off-by: Øyvind Rønningstad <[email protected]>
    Signed-off-by: Sigvart Hovland <[email protected]>
    Signed-off-by: Sebastian Bøe <[email protected]>
    Signed-off-by: Andrzej Puzdrowski <[email protected]>
    Signed-off-by: Robert Lubos <[email protected]>
    Signed-off-by: Dominik Ermel <[email protected]>
    Signed-off-by: Torsten Rasmussen <[email protected]>
    Signed-off-by: Martí Bolívar <[email protected]>
    Signed-off-by: Thomas Stenersen <[email protected]>
    (cherry picked from commit 6bff2a9)
    Signed-off-by: Andrzej Głąbek <[email protected]>
    (cherry picked from commit 2ce2dd9)
    Signed-off-by: Robert Lubos <[email protected]>
    (cherry picked from commit 4ac07a9)
    (cherry picked from commit 48475c6)
    (cherry picked from commit 155cf11)
    (cherry picked from commit 634d8d6)
    (cherry picked from commit 5282bae)
    sigvartmh authored and mbolivar-nordic committed Feb 4, 2020
    Configuration menu
    Copy the full SHA
    3dacf91 View commit details
    Browse the repository at this point in the history
  8. [nrf noup] cmake: support CONFIG_MCUBOOT_BUILD_S1_VARIANT

    Support the nRF Connect SDK-specfic Kconfig option
    CONFIG_MCUBOOT_BUILD_S1_VARIANT. Note that this option is defined in
    the fw-nrfconnect-nrf repository in the NCS. The changes required to
    support it are being applied to the zephyr repository out of necessity
    rather than choice: specifically, it is non-trivial to add executable
    targets outside the zephyr/CMakeLists.txt. The problem is that most of
    the variables required for compiling/linking are only available
    here.
    
    Register in the parent image that the mcuboot child image will have
    s1_image.hex as a byproduct, this allows the parent image to know
    where the hex file comes from and create custom commands that sign it.
    Ensure that the 's1_image_hex' target is built when the ALL target is
    built so that multi-image builds work correctly.
    
    Signed-off-by: Håkon Øye Amundsen <[email protected]>
    Signed-off-by: Martí Bolívar <[email protected]>
    Signed-off-by: Robert Lubos <[email protected]>
    Signed-off-by: Dominik Ermel <[email protected]>
    Signed-off-by: Sebastian Bøe <[email protected]>
    (cherry picked from commit 599fe14)
    Signed-off-by: Andrzej Głąbek <[email protected]>
    (cherry picked from commit f8bca0c)
    Signed-off-by: Robert Lubos <[email protected]>
    (cherry picked from commit 5bbb007)
    hakonfam authored and mbolivar-nordic committed Feb 4, 2020
    Configuration menu
    Copy the full SHA
    06e0f4f View commit details
    Browse the repository at this point in the history
  9. [nrf fromtree] dts: bindings: qspi-nor: Replace tabs with spaces

    YAML doesn't support tabs, replace them with spaces.
    
    Signed-off-by: Carles Cufi <[email protected]>
    (cherry picked from commit cd1e9b8)
    carlescufi authored and mbolivar-nordic committed Feb 4, 2020
    Configuration menu
    Copy the full SHA
    9cdd7de View commit details
    Browse the repository at this point in the history
  10. [nrf fromlist] sockets: tls: Fix Kconfig mbedTLS dependencies

    Sort out mbedTLS dependencies in sockets Kconfig. mbedTLS will now
    be enabled when TLS sockets and native network stack are enabled.
    
    Upstream PR:
    zephyrproject-rtos/zephyr#22359
    
    Signed-off-by: Robert Lubos <[email protected]>
    (cherry picked from commit b30bf22)
    rlubos authored and mbolivar-nordic committed Feb 4, 2020
    Configuration menu
    Copy the full SHA
    72750b6 View commit details
    Browse the repository at this point in the history
  11. [nrf fromlist] Bluetooth: host: Fix app notified connected but no [...]

    connection exists
    
    Fix problem where application was notified about a new connection being
    established, but no connection has actually been made.
    This occurred because the LE Create Connection command failed directly
    from the API, in which case the state transition thinks the err is valid
    and always notifies the application.
    
    Introduced by:
    6c1f52d for bt_conn_create_le
    e9eebf0 for bt_conn_create_auto_le.
    
    Submitted upstream as:
    zephyrproject-rtos/zephyr#22374
    
    Signed-off-by: Joakim Andersson <[email protected]>
    (cherry picked from commit 429a037)
    joerchan authored and mbolivar-nordic committed Feb 4, 2020
    Configuration menu
    Copy the full SHA
    4f02065 View commit details
    Browse the repository at this point in the history
  12. [nrf fromlist] Bluetooth: host: Fix out of range parameters [...]

    provided to the controller
    
    Fix LE Create Connection command giving out of range parameters to the
    controller, this came back as 0x30 (Out of Range Parameters) status code
    on the command from the controller.
    This appears to be the min and max CE parameters in the command.
    Revert back memset from 137f704
    
    Submitted upstream as:
    zephyrproject-rtos/zephyr#22374
    
    Signed-off-by: Joakim Andersson <[email protected]>
    (cherry picked from commit 0cf9c61)
    joerchan authored and mbolivar-nordic committed Feb 4, 2020
    Configuration menu
    Copy the full SHA
    7f33c80 View commit details
    Browse the repository at this point in the history
  13. [nrf fromlist] dts: added cryptocell to the dts file for nRF9160

    This commit adds cryptocell definitions to the nRF9160 dts file.
    
    Signed-off-by: Torsten Rasmussen <[email protected]>
    (cherry picked from commit 43f55fa)
    tejlmand authored and mbolivar-nordic committed Feb 4, 2020
    Configuration menu
    Copy the full SHA
    381e998 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2020

  1. [nrf noup] ci: install python reqs from ci-tools before check_compliance

    Missing python-magic package
    
    Signed-off-by: Thomas Stilwell <[email protected]>
    thst-nordic committed Feb 11, 2020
    Configuration menu
    Copy the full SHA
    65ca139 View commit details
    Browse the repository at this point in the history
  2. [nrf noup] ci: fix mergeup detection logic

    This allows fw-nrfconnect-zephyr to be run as a downstream-job
    
    Signed-off-by: Thomas Stilwell <[email protected]>
    thst-nordic committed Feb 11, 2020
    Configuration menu
    Copy the full SHA
    6cf04cd View commit details
    Browse the repository at this point in the history
  3. [nrf noup] ci: lock python requirement versions

    sphinx==2.4.0 released yesterday with a bug that breaks the build
    
    setting sphinx !=2.4.0
    
    Signed-off-by: Thomas Stilwell <[email protected]>
    thst-nordic committed Feb 11, 2020
    Configuration menu
    Copy the full SHA
    870fc37 View commit details
    Browse the repository at this point in the history
  4. [nrf fromtree] bluetooth: host: fix RPMsg driver headroom configuration

    Corrected configuration of BT_HCI_RESERVE for the RPMsg HCI driver.
    This change fixes the following assert:
    [net_buf_simple_headroom(buf) >= len] @ ZEPHYR_BASE/subsys/net/buf.c:881
    
    Signed-off-by: Kamil Piszczek <[email protected]>
    kapi-no authored and carlescufi committed Feb 11, 2020
    Configuration menu
    Copy the full SHA
    ff214d6 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2020

  1. [nrf noup] cmake: move s1 patches to nrf repo

    This to minimize patches and simplify development
    
    Signed-off-by: Håkon Øye Amundsen <[email protected]>
    hakonfam authored and SebastianBoe committed Feb 18, 2020
    Configuration menu
    Copy the full SHA
    8a6e962 View commit details
    Browse the repository at this point in the history
  2. [nrf noup] cmake: include nrf reports cmake from repo

    To make patches simpler and diff smaller.
    
    Signed-off-by: Håkon Øye Amundsen <[email protected]>
    hakonfam authored and SebastianBoe committed Feb 18, 2020
    Configuration menu
    Copy the full SHA
    30f47ea View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2020

  1. [nrf noup] linker: generalize linking into alternate slot

    Since any image (not only mcuboot) can be linked into S1,
    update the linker script so that its naming is generic.
    
    Signed-off-by: Håkon Øye Amundsen <[email protected]>
    hakonfam authored and SebastianBoe committed Feb 24, 2020
    Configuration menu
    Copy the full SHA
    7ddab66 View commit details
    Browse the repository at this point in the history
Loading