Zephyr 2.5 upgrade

[petejohanson]

The start of the Zephyr 2.5.0 upgrade. I need to do more real world testing, so far it works for basics on my Zaphod prototype, but I am having some issue w/ deadlocks w/ the display enabled, which may or may not be Zaphod specific.

[innovaker]

My end-2-end tests are passing on both BLE and USB 🥳

[innovaker]

We should upgrade https://github.com/zmkfirmware/zmk-docker as a corequisite to this PR.

[innovaker]

Thanks @petejohanson! I've been through the PR in detail. Generally looks fine 👍

---

zephyrproject-rtos/zephyr@de5aa40

power: standarize PM Kconfigs and cleanup

1e9662b

refactor: Upgrade to Zephyr 2.5.0.

Confirmed, looks OK.

---

zephyrproject-rtos/zephyr@51dba7a

power: Move pm subsystem to new power states

1e9662b

refactor: Upgrade to Zephyr 2.5.0.

Confirmed, looks OK.

---

https://docs.zephyrproject.org/2.5.0/releases/release-notes-2.5.html

DEVICE_AND_API_INIT was deprecated in favor of DEVICE_DT_INST_DEFINE and DEVICE_DEFINE.

58cff59

Confirmed, looks OK.

---

https://discord.com/channels/719497620560543766/719544230497878116/778662581123416135

SYS_PM_POLICY

petejohanson/zephyr@7b06338

They've still not given Idle State Power Management Policy a name? o_O

---

The power changes should probably be in a separate commit to the west.yml changes.

---

https://docs.zephyrproject.org/2.5.0/releases/release-notes-2.5.html

Made these global changes in STM32 boards and SoC series:
Pin control configuration is now done through devicetree and existing macros to configure pins in pinmux.c files are tagged as deprecated. The new pin settings are provided thanks to .dtsi files distributed in hal_stm32 module.

91bc402
97b93aa

Which I think covers these?

• bdn9_rev2
• dz60rgb_rev1
• planck_rev6
• proton_c

My interpretations of the changes are:

• bdn9_rev2 already had it enabled but didn't include the now deprecated pinmux.c?
• dz60rgb_rev1 is now enabled?
• planck_rev6 is still running on the old system? What's the plan?
• proton_c has been converted (I guess you own one)?

---

I'd suggest reordering the commits so that the PINMUX related commits are sequential.

---

https://docs.zephyrproject.org/2.5.0/releases/release-notes-2.5.html

LVGL
Library has been updated to minor release v7.6.1

fecfad7

fix(display): Avoid fault w/ LVGL API usage.

I skipped this one :)

---

https://docs.zephyrproject.org/2.5.0/releases/release-notes-2.5.html

The deprecated BT_LE_ADV_* macros have been removed, use the BT_GAP_ADV_* enums instead.

Do you know which macros were removed? The release notes state they were deprecated in 2.3.0 and removed in 2.5.0, but I only found these ...

zephyr/include/bluetooth/bluetooth.h
  596,1: #define BT_LE_ADV_PARAM_INIT(_options, _int_min, _int_max, _peer) \
  616,1: #define BT_LE_ADV_PARAM(_options, _int_min, _int_max, _peer) \
  621,1: #define BT_LE_ADV_CONN_DIR(_peer) BT_LE_ADV_PARAM(BT_LE_ADV_OPT_CONNECTABLE |  \
  626,1: #define BT_LE_ADV_CONN BT_LE_ADV_PARAM(BT_LE_ADV_OPT_CONNECTABLE, \
  630,1: #define BT_LE_ADV_CONN_NAME BT_LE_ADV_PARAM(BT_LE_ADV_OPT_CONNECTABLE | \
  635,1: #define BT_LE_ADV_CONN_DIR_LOW_DUTY(_peer) \
  642,1: #define BT_LE_ADV_NCONN BT_LE_ADV_PARAM(0, BT_GAP_ADV_FAST_INT_MIN_2, \
  646,1: #define BT_LE_ADV_NCONN_NAME BT_LE_ADV_PARAM(BT_LE_ADV_OPT_USE_NAME, \
  651,1: #define BT_LE_ADV_NCONN_IDENTITY BT_LE_ADV_PARAM(BT_LE_ADV_OPT_USE_IDENTITY, \

zephyr/include/bluetooth/hci.h
  813,1: #define BT_LE_ADV_FP_NO_WHITELIST               0x00
  814,1: #define BT_LE_ADV_FP_WHITELIST_SCAN_REQ         0x01
  815,1: #define BT_LE_ADV_FP_WHITELIST_CONN_IND         0x02
  816,1: #define BT_LE_ADV_FP_WHITELIST_BOTH             0x03

which still exist in 2.5.0.
ZMK still uses the BT_LE_ADV_PARAM macro. Should it?

---

https://github.com/petejohanson/zephyr/commits/v2.5.0-zmk-fixes

I noticed we've never tidied up the hotfix commit messages on ZMK's fork of zephyr. Each of the 3 commits currently follows a different convention (I'm also at fault here). This release might be a good opportunity to align them one way or another as they seem determined to outstay their welcome.

---

Generally speaking, it's much easier to validate/verify Zephyr upgrade PRs if relevant references are included in the commit messages (as footers?). Such as:

• a link to the relevant release note (if the change is listed)
• GitHub issue or PR #
• commit hashes

In this instance, the power changes weren't trivial to trace and doing so probably duplicated your own efforts.

---

Will approve after we complete the container upgrades.

[innovaker]

Should the commits in the Zephyr fixes branch(es) contain notices that The ZMK Contributors modified them? They're Apache 2.0 files. If so, we should add this retrospectively to the old branches too.

[innovaker]

Documentation!

Has anyone compared Zephyr 2.4.0 vs. Zephyr 2.5.0 vs. ZMK Basic Setup

• https://docs.zephyrproject.org/2.4.0/getting_started/index.html
• https://docs.zephyrproject.org/2.4.0/getting_started/installation_linux.html
• https://docs.zephyrproject.org/2.4.0/guides/beyond-GSG.html
• https://docs.zephyrproject.org/2.5.0/getting_started/index.html
• https://docs.zephyrproject.org/2.5.0/getting_started/installation_linux.html
• https://docs.zephyrproject.org/2.5.0/guides/beyond-GSG.html
• https://zmkfirmware.dev/docs/development/setup

and/or updated the ZMK documentation accordingly for this PR (or any prerequisite syncing!)?

[schengnz]

Is there any chance we could roll in the J-Link thread awareness support recently added to Zephyr (#788)? Thanks!

[petejohanson]

@innovaker Fixed up the commit messages w/ "See" trailers with some relevant links.

[innovaker]

Documentation!

Has anyone compared Zephyr 2.4.0 vs. Zephyr 2.5.0 vs. ZMK Basic Setup

* https://docs.zephyrproject.org/2.4.0/getting_started/index.html

* https://docs.zephyrproject.org/2.4.0/getting_started/installation_linux.html

* https://docs.zephyrproject.org/2.4.0/guides/beyond-GSG.html

* https://docs.zephyrproject.org/2.5.0/getting_started/index.html

* https://docs.zephyrproject.org/2.5.0/getting_started/installation_linux.html

* https://docs.zephyrproject.org/2.5.0/guides/beyond-GSG.html

* https://zmkfirmware.dev/docs/development/setup

and/or updated the ZMK documentation accordingly for this PR (or any prerequisite syncing!)?

Has this been done? A quick looks suggests the Zephyr SDK needs boosting.