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.

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

[Backport v2.9-branch] Update revision of nrf_802154 #1605

Merged
merged 2 commits into from
Dec 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion common.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ function(nrfxlib_calculate_lib_path lib_path)
set(arch_soc_dir ${arch_soc_dir}_cpuapp)
elseif(DEFINED CONFIG_SOC_NRF5340_CPUNET)
set(arch_soc_dir ${arch_soc_dir}_cpunet)
elseif(DEFINED CONFIG_SOC_NRF54L15_CPUAPP OR DEFINED CONFIG_SOC_NRF54L20_ENGA_CPUAPP)
elseif(DEFINED CONFIG_SOC_NRF54L15_CPUAPP OR DEFINED CONFIG_SOC_NRF54L20_ENGA_CPUAPP
OR DEFINED CONFIG_SOC_NRF54L10_CPUAPP OR DEFINED CONFIG_SOC_NRF54L05_CPUAPP)
set(arch_soc_dir ${arch_soc_dir}_cpuapp)
if(DEFINED CONFIG_TRUSTED_EXECUTION_NONSECURE AND ${CALC_LIB_PATH_NS_PROVIDED})
set(arch_soc_dir ${arch_soc_dir}_ns)
Expand Down
2 changes: 1 addition & 1 deletion nrf_802154/driver/src/nrf_802154_peripherals_nrf53.h
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ extern "C" {
* The DPPI channel that RADIO.CCAIDLE event publishes to
*/
#ifndef NRF_802154_DPPI_RADIO_CCAIDLE
#define NRF_802154_DPPI_RADIO_CCAIDLE 9U
#define NRF_802154_DPPI_RADIO_CCAIDLE 14U
#endif

/**
Expand Down
2 changes: 1 addition & 1 deletion nrf_802154/driver/src/nrf_802154_peripherals_nrf54h.h
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ extern "C" {
* The DPPI channel that RADIO.CCAIDLE event publishes to
*/
#ifndef NRF_802154_DPPI_RADIO_CCAIDLE
#define NRF_802154_DPPI_RADIO_CCAIDLE 9U
#define NRF_802154_DPPI_RADIO_CCAIDLE 14U
#endif

/**
Expand Down
2 changes: 1 addition & 1 deletion nrf_802154/driver/src/nrf_802154_peripherals_nrf54l.h
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ extern "C" {
* The DPPI channel that RADIO.CCAIDLE event publishes to
*/
#ifndef NRF_802154_DPPI_RADIO_CCAIDLE
#define NRF_802154_DPPI_RADIO_CCAIDLE 9U
#define NRF_802154_DPPI_RADIO_CCAIDLE 14U
#endif

/**
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading