Skip to content
Open
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
6 changes: 3 additions & 3 deletions app/boards/zhiayang/mikoto/Kconfig.mikoto
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

config BOARD_MIKOTO
select SOC_NRF52840_QIAA
imply RETAINED_MEM if BOARD_MIKOTO_NRF52840_ZMK
imply RETENTION if BOARD_MIKOTO_NRF52840_ZMK
imply RETENTION_BOOT_MODE if BOARD_MIKOTO_NRF52840_ZMK
imply RETAINED_MEM
imply RETENTION
imply RETENTION_BOOT_MODE
Comment on lines +6 to +8
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is ok as is, and is extra safe not to change things if you build the "bare" mikoto board without the /zmk variant. Did you find these conditionals not working for you? Can you share the exact build command you used when testing this?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ohhh, interesting. Am I supposed to specify "mikoto/zmk@6.30" now?

Yeah I built locally with just "mikoto@6.3" and it was giving me DTS errors that I traced to smth about retention, so I tried disabling these configs and it worked.

Im not sure if there's a better way? Haven't been keeping up with the zmk progress lately.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, see the zephyr 4.1 blog post - recent addition. mikoto//zmk@... I believe

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Based on https://docs.zephyrproject.org/latest/hardware/porting/board_porting.html#board-terminology, it should actually be mikoto@6.3//zmk (which I think is a little odd to put the version in the middle)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The blog post for the 4.1 migration has been updated to reflect those new board IDs with the variant included.

imply I2C if BOARD_REVISION="7.2.0"
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
*/

#include <../boards/zhiayang/mikoto/mikoto-pinctrl.dtsi>
#include <../boards/zhiayang/mikoto/arduino_pro_micro_pins_v5.dtsi>
#include <../boards/zhiayang/mikoto/arduino_pro_micro_pins_v6.dtsi>
8 changes: 8 additions & 0 deletions app/boards/zhiayang/mikoto/mikoto_nrf52840_zmk_6_3_0.overlay
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/*
* Copyright (c) 2026 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

#include <../boards/zhiayang/mikoto/mikoto-pinctrl.dtsi>
#include <../boards/zhiayang/mikoto/arduino_pro_micro_pins_v6.dtsi>
8 changes: 8 additions & 0 deletions app/module/boards/zhiayang/mikoto/mikoto_6_3_0.overlay
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/*
* Copyright (c) 2023 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

#include "mikoto-pinctrl.dtsi"
#include "arduino_pro_micro_pins_v6.dtsi"