zmkfirmware
/
zmk
mirror of https://github.com/zmkfirmware/zmk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(core): support magic bootloader values for nRF52833 (#3163) 

Enable ZMK_BOOTMODE_MAGIC_VALUE_BOOTLOADER_TYPE_ADAFRUIT_NRF52 for
nRF52833, add nrf52833_uf2_boot_mode.dtsi as a copy of the nRF52840 file
for easy inclusion.

Enable retention for all nrfmicro subvariants (as this is the only
in-tree board that uses the nRF52833).

This fixes &bootloader for nRF52833 boards post-4.1 upgrade.
This commit is contained in:
Alexander Krikun 2025-12-24 19:16:59 +04:00 committed by GitHub
parent b68b29d053
commit 308de56fb9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/boards/joric/nrfmicro/Kconfig.nrfmicro
View File

@ -7,6 +7,6 @@ config BOARD_NRFMICRO
select SOC_NRF52840_QIAA if BOARD_NRFMICRO_NRF52840 select SOC_NRF52840_QIAA if BOARD_NRFMICRO_NRF52840
select SOC_NRF52840_QIAA if BOARD_NRFMICRO_NRF52840_FLIPPED select SOC_NRF52840_QIAA if BOARD_NRFMICRO_NRF52840_FLIPPED
select SOC_NRF52833_QIAA if BOARD_NRFMICRO_NRF52833 select SOC_NRF52833_QIAA if BOARD_NRFMICRO_NRF52833
imply RETAINED_MEM if BOARD_NRFMICRO_NRF52840 || BOARD_NRFMICRO_NRF52840_FLIPPED imply RETAINED_MEM
imply RETENTION if BOARD_NRFMICRO_NRF52840 || BOARD_NRFMICRO_NRF52840_FLIPPED imply RETENTION
imply RETENTION_BOOT_MODE if BOARD_NRFMICRO_NRF52840 || BOARD_NRFMICRO_NRF52840_FLIPPED imply RETENTION_BOOT_MODE

2
app/boards/joric/nrfmicro/nrfmicro_nrf52833.dts
View File

@ -6,6 +6,8 @@
/dts-v1/; /dts-v1/;
#include <nordic/nrf52833_qiaa.dtsi> #include <nordic/nrf52833_qiaa.dtsi>
#include <common/nordic/nrf52833_uf2_boot_mode.dtsi>
#include "arduino_pro_micro_pins_52833.dtsi" #include "arduino_pro_micro_pins_52833.dtsi"
#include "nrfmicro-pinctrl.dtsi" #include "nrfmicro-pinctrl.dtsi"

29
app/dts/common/nordic/nrf52833_uf2_boot_mode.dtsi Normal file
View File

@ -0,0 +1,29 @@
&gpregret1 {
adafruit_boot_retention: retention@0 {
compatible = "zephyr,retention";
status = "okay";
reg = <0x0 0x1>;
};
};
/ {
chosen {
zephyr,boot-mode = &boot_retention;
zmk,magic-boot-mode = &adafruit_boot_retention;
};
magic_mapper {
compatible = "zmk,bootmode-to-magic-mapper";
status = "okay";
#address-cells = <1>;
#size-cells = <1>;
boot_retention: retention@0 {
compatible = "zephyr,retention";
status = "okay";
reg = <0x0 0x1>;
};
};
};

2
app/src/boot/Kconfig.defaults
View File

@ -16,7 +16,7 @@ endif
if ZMK_BOOTMODE_TO_MAGIC_VALUE_MAPPER if ZMK_BOOTMODE_TO_MAGIC_VALUE_MAPPER
choice ZMK_BOOTMODE_MAGIC_VALUE_BOOTLOADER_TYPE choice ZMK_BOOTMODE_MAGIC_VALUE_BOOTLOADER_TYPE
default ZMK_BOOTMODE_MAGIC_VALUE_BOOTLOADER_TYPE_ADAFRUIT_NRF52 if SOC_NRF52840 default ZMK_BOOTMODE_MAGIC_VALUE_BOOTLOADER_TYPE_ADAFRUIT_NRF52 if SOC_NRF52833 || SOC_NRF52840
endchoice endchoice