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

Hotfix of build errors (for cyw920829m2evk_02 and cy8ckit_062_ble platforms) in week CI #75569

Merged
merged 2 commits into from
Jul 8, 2024
Merged

Hotfix of build errors (for cyw920829m2evk_02 and cy8ckit_062_ble platforms) in week CI #75569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d50516f
driver: spi: psoc6: fix build error in driver
npal-cy Jul 8, 2024
deb6110
samples: bluetooth: exclude cyw920829m2evk_02 from build
npal-cy Jul 8, 2024
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
5 changes: 3 additions & 2 deletions drivers/spi/spi_psoc6.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
LOG_MODULE_REGISTER(spi_psoc6);

#include <errno.h>
#include <zephyr/drivers/pinctrl.h>
#include <zephyr/drivers/spi.h>
#include <soc.h>

Expand Down Expand Up @@ -379,8 +380,8 @@ static int spi_psoc6_init(const struct device *dev)

/* Configure dt provided device signals when available */
err = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
if (ret < 0) {
return ret;
if (err < 0) {
return err;
}

Cy_SysClk_PeriphAssignDivider(config->periph_id,
Expand Down
1 change: 0 additions & 1 deletion samples/bluetooth/beacon/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ tests:
- nrf51dk/nrf51822
- nrf52dk/nrf52832
- nrf54l15pdk/nrf54l15/cpuapp
- cyw920829m2evk_02
tags: bluetooth
integration_platforms:
- qemu_cortex_m3
Expand Down
1 change: 0 additions & 1 deletion samples/bluetooth/broadcaster/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ tests:
- qemu_x86
- nrf51dk/nrf51822
- nrf52dk/nrf52832
- cyw920829m2evk_02
tags: bluetooth
integration_platforms:
- qemu_cortex_m3
1 change: 0 additions & 1 deletion samples/bluetooth/central/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ tests:
platform_allow:
- qemu_cortex_m3
- qemu_x86
- cyw920829m2evk_02
tags: bluetooth
integration_platforms:
- qemu_cortex_m3
1 change: 0 additions & 1 deletion samples/bluetooth/observer/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ tests:
- qemu_cortex_m3
- qemu_x86
- nrf52840dk/nrf52840
- cyw920829m2evk_02
integration_platforms:
- qemu_cortex_m3
tags: bluetooth
Expand Down
1 change: 0 additions & 1 deletion samples/bluetooth/periodic_adv/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ tests:
- qemu_x86
- nrf52_bsim
- nrf52dk/nrf52832
- cyw920829m2evk_02
tags: bluetooth
integration_platforms:
- qemu_cortex_m3
1 change: 0 additions & 1 deletion samples/bluetooth/peripheral_dis/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ tests:
platform_allow:
- qemu_cortex_m3
- qemu_x86
- cyw920829m2evk_02
tags: bluetooth
integration_platforms:
- qemu_cortex_m3
1 change: 0 additions & 1 deletion samples/bluetooth/scan_adv/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ tests:
platform_allow:
- qemu_cortex_m3
- qemu_x86
- cyw920829m2evk_02
tags: bluetooth
integration_platforms:
- qemu_cortex_m3
Loading