fix: Add fix for bootloader behavior.

* Until boards move to bootmode via retention subsystem, enable `NRF_STORE_REBOOT_TYPE_GPREGRET` by default.
petejohanson · Dec 4, 2023 · 2631675 · 2631675
1 parent b2301a7
commit 2631675
Show file tree

Hide file tree

Showing 26 changed files with 81 additions and 2 deletions.
diff --git a/app/boards/arm/adv360pro/adv360pro_left_defconfig b/app/boards/arm/adv360pro/adv360pro_left_defconfig
@@ -18,6 +18,9 @@ CONFIG_PINCTRL=y
 CONFIG_SPI=y
 CONFIG_SPI_NRFX=y
 
+# Use until moved to retained bootmode
+CONFIG_NRF_STORE_REBOOT_TYPE_GPREGRET=y
+
 # Enable writing to flash
 CONFIG_USE_DT_CODE_PARTITION=y
 CONFIG_MPU_ALLOW_FLASH_WRITE=y

diff --git a/app/boards/arm/adv360pro/adv360pro_right_defconfig b/app/boards/arm/adv360pro/adv360pro_right_defconfig
@@ -18,6 +18,9 @@ CONFIG_PINCTRL=y
 CONFIG_SPI=y
 CONFIG_SPI_NRFX=y
 
+# Use until moved to retained bootmode
+CONFIG_NRF_STORE_REBOOT_TYPE_GPREGRET=y
+
 # Enable writing to flash
 CONFIG_USE_DT_CODE_PARTITION=y
 CONFIG_MPU_ALLOW_FLASH_WRITE=y

diff --git a/app/boards/arm/bluemicro840/bluemicro840_v1_defconfig b/app/boards/arm/bluemicro840/bluemicro840_v1_defconfig
@@ -12,6 +12,9 @@ CONFIG_PINCTRL=y
 # enable GPIO
 CONFIG_GPIO=y
 
+# Use until moved to retained bootmode
+CONFIG_NRF_STORE_REBOOT_TYPE_GPREGRET=y
+
 CONFIG_USE_DT_CODE_PARTITION=y
 CONFIG_BUILD_OUTPUT_UF2=y
 

diff --git a/app/boards/arm/bt60/bt60_v1_defconfig b/app/boards/arm/bt60/bt60_v1_defconfig
@@ -14,6 +14,9 @@ CONFIG_GPIO=y
 CONFIG_EC11=y
 CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
 
+# Use until moved to retained bootmode
+CONFIG_NRF_STORE_REBOOT_TYPE_GPREGRET=y
+
 CONFIG_USE_DT_CODE_PARTITION=y
 CONFIG_BUILD_OUTPUT_UF2=y
 

diff --git a/app/boards/arm/bt60/bt60_v1_hs_defconfig b/app/boards/arm/bt60/bt60_v1_hs_defconfig
@@ -14,6 +14,9 @@ CONFIG_GPIO=y
 CONFIG_EC11=y
 CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
 
+# Use until moved to retained bootmode
+CONFIG_NRF_STORE_REBOOT_TYPE_GPREGRET=y
+
 CONFIG_USE_DT_CODE_PARTITION=y
 CONFIG_BUILD_OUTPUT_UF2=y
 

diff --git a/app/boards/arm/ckp/bt60_v2_defconfig b/app/boards/arm/ckp/bt60_v2_defconfig
@@ -15,6 +15,9 @@ CONFIG_PINCTRL=y
 CONFIG_EC11=y
 CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
 
+# Use until moved to retained bootmode
+CONFIG_NRF_STORE_REBOOT_TYPE_GPREGRET=y
+
 CONFIG_USE_DT_CODE_PARTITION=y
 CONFIG_PWM=y
 CONFIG_LED_PWM=y

diff --git a/app/boards/arm/ckp/bt65_v1_defconfig b/app/boards/arm/ckp/bt65_v1_defconfig
@@ -15,6 +15,9 @@ CONFIG_PINCTRL=y
 CONFIG_EC11=y
 CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
 
+# Use until moved to retained bootmode
+CONFIG_NRF_STORE_REBOOT_TYPE_GPREGRET=y
+
 CONFIG_USE_DT_CODE_PARTITION=y
 CONFIG_PWM=y
 CONFIG_LED_PWM=y

diff --git a/app/boards/arm/ckp/bt75_v1_defconfig b/app/boards/arm/ckp/bt75_v1_defconfig
@@ -15,6 +15,9 @@ CONFIG_PINCTRL=y
 CONFIG_EC11=y
 CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
 
+# Use until moved to retained bootmode
+CONFIG_NRF_STORE_REBOOT_TYPE_GPREGRET=y
+
 CONFIG_USE_DT_CODE_PARTITION=y
 CONFIG_PWM=y
 CONFIG_LED_PWM=y

diff --git a/app/boards/arm/corneish_zen/corneish_zen_v1_left_defconfig b/app/boards/arm/corneish_zen/corneish_zen_v1_left_defconfig
@@ -25,6 +25,9 @@ CONFIG_I2C_NRFX=y
 # Enable SPI
 CONFIG_SPI_NRFX=y
 
+# Use until moved to retained bootmode
+CONFIG_NRF_STORE_REBOOT_TYPE_GPREGRET=y
+
 # Enable writing to flash
 CONFIG_USE_DT_CODE_PARTITION=y
 CONFIG_BUILD_OUTPUT_UF2=y

diff --git a/app/boards/arm/corneish_zen/corneish_zen_v1_right_defconfig b/app/boards/arm/corneish_zen/corneish_zen_v1_right_defconfig
@@ -25,6 +25,9 @@ CONFIG_I2C_NRFX=y
 # Enable SPI
 CONFIG_SPI_NRFX=y
 
+# Use until moved to retained bootmode
+CONFIG_NRF_STORE_REBOOT_TYPE_GPREGRET=y
+
 # Enable writing to flash
 CONFIG_USE_DT_CODE_PARTITION=y
 CONFIG_BUILD_OUTPUT_UF2=y

diff --git a/app/boards/arm/corneish_zen/corneish_zen_v2_left_defconfig b/app/boards/arm/corneish_zen/corneish_zen_v2_left_defconfig
@@ -21,6 +21,9 @@ CONFIG_GPIO=y
 # Enable SPI
 CONFIG_SPI_NRFX=y
 
+# Use until moved to retained bootmode
+CONFIG_NRF_STORE_REBOOT_TYPE_GPREGRET=y
+
 # Enable writing to flash
 CONFIG_USE_DT_CODE_PARTITION=y
 CONFIG_BUILD_OUTPUT_UF2=y

diff --git a/app/boards/arm/corneish_zen/corneish_zen_v2_right_defconfig b/app/boards/arm/corneish_zen/corneish_zen_v2_right_defconfig
@@ -21,6 +21,9 @@ CONFIG_GPIO=y
 # Enable SPI
 CONFIG_SPI_NRFX=y
 
+# Use until moved to retained bootmode
+CONFIG_NRF_STORE_REBOOT_TYPE_GPREGRET=y
+
 # Enable writing to flash
 CONFIG_USE_DT_CODE_PARTITION=y
 CONFIG_BUILD_OUTPUT_UF2=y

diff --git a/app/boards/arm/glove80/glove80_lh_defconfig b/app/boards/arm/glove80/glove80_lh_defconfig
@@ -32,6 +32,9 @@ CONFIG_ARM_MPU=y
 # Enable GPIO
 CONFIG_GPIO=y
 
+# Use until moved to retained bootmode
+CONFIG_NRF_STORE_REBOOT_TYPE_GPREGRET=y
+
 # Build configurations
 CONFIG_BUILD_OUTPUT_UF2=y
 CONFIG_BUILD_OUTPUT_UF2_FAMILY_ID="0x9807B007"

diff --git a/app/boards/arm/glove80/glove80_rh_defconfig b/app/boards/arm/glove80/glove80_rh_defconfig
@@ -29,6 +29,9 @@ CONFIG_ARM_MPU=y
 # Enable GPIO
 CONFIG_GPIO=y
 
+# Use until moved to retained bootmode
+CONFIG_NRF_STORE_REBOOT_TYPE_GPREGRET=y
+
 # Build configurations
 CONFIG_BUILD_OUTPUT_UF2=y
 CONFIG_BUILD_OUTPUT_UF2_FAMILY_ID="0x9808B007"

diff --git a/app/boards/arm/mikoto/mikoto_520_defconfig b/app/boards/arm/mikoto/mikoto_520_defconfig
@@ -12,6 +12,9 @@ CONFIG_PINCTRL=y
 # enable GPIO
 CONFIG_GPIO=y
 
+# Use until moved to retained bootmode
+CONFIG_NRF_STORE_REBOOT_TYPE_GPREGRET=y
+
 CONFIG_USE_DT_CODE_PARTITION=y
 CONFIG_BUILD_OUTPUT_UF2=y
 

diff --git a/app/boards/arm/nice_nano/nice_nano_defconfig b/app/boards/arm/nice_nano/nice_nano_defconfig
@@ -13,6 +13,9 @@ CONFIG_GPIO=y
 # Use pinctrl
 CONFIG_PINCTRL=y
 
+# Use until moved to retained bootmode
+CONFIG_NRF_STORE_REBOOT_TYPE_GPREGRET=y
+
 CONFIG_USE_DT_CODE_PARTITION=y
 CONFIG_BUILD_OUTPUT_UF2=y
 

diff --git a/app/boards/arm/nice_nano/nice_nano_v2_defconfig b/app/boards/arm/nice_nano/nice_nano_v2_defconfig
@@ -13,6 +13,10 @@ CONFIG_PINCTRL=y
 # enable GPIO
 CONFIG_GPIO=y
 
+# Use until moved to retained bootmode
+
+CONFIG_NRF_STORE_REBOOT_TYPE_GPREGRET=y
+
 CONFIG_USE_DT_CODE_PARTITION=y
 CONFIG_BUILD_OUTPUT_UF2=y
 
@@ -24,4 +28,4 @@ CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_FLASH_MAP=y
 
 CONFIG_ZMK_BLE=y
-CONFIG_ZMK_USB=y
+CONFIG_ZMK_USB=y
diff --git a/app/boards/arm/nrf52840_m2/nrf52840_m2_defconfig b/app/boards/arm/nrf52840_m2/nrf52840_m2_defconfig
@@ -11,6 +11,9 @@ CONFIG_ARM_MPU=y
 # enable GPIO
 CONFIG_GPIO=y
 
+# Use until moved to retained bootmode
+CONFIG_NRF_STORE_REBOOT_TYPE_GPREGRET=y
+
 CONFIG_USE_DT_CODE_PARTITION=y
 CONFIG_BUILD_OUTPUT_UF2=y
 

diff --git a/app/boards/arm/nrfmicro/nrfmicro_11_defconfig b/app/boards/arm/nrfmicro/nrfmicro_11_defconfig
@@ -12,6 +12,9 @@ CONFIG_PINCTRL=y
 # enable GPIO
 CONFIG_GPIO=y
 
+# Use until moved to retained bootmode
+CONFIG_NRF_STORE_REBOOT_TYPE_GPREGRET=y
+
 CONFIG_USE_DT_CODE_PARTITION=y
 CONFIG_BUILD_OUTPUT_UF2=y
 
@@ -25,4 +28,4 @@ CONFIG_CLOCK_CONTROL_NRF=y
 CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y
 
 CONFIG_ZMK_USB=y
-CONFIG_ZMK_BLE=y
+CONFIG_ZMK_BLE=y
diff --git a/app/boards/arm/nrfmicro/nrfmicro_11_flipped_defconfig b/app/boards/arm/nrfmicro/nrfmicro_11_flipped_defconfig
@@ -12,6 +12,9 @@ CONFIG_PINCTRL=y
 # enable GPIO
 CONFIG_GPIO=y
 
+# Use until moved to retained bootmode
+CONFIG_NRF_STORE_REBOOT_TYPE_GPREGRET=y
+
 CONFIG_USE_DT_CODE_PARTITION=y
 CONFIG_BUILD_OUTPUT_UF2=y
 

diff --git a/app/boards/arm/nrfmicro/nrfmicro_13_52833_defconfig b/app/boards/arm/nrfmicro/nrfmicro_13_52833_defconfig
@@ -12,6 +12,9 @@ CONFIG_PINCTRL=y
 # enable GPIO
 CONFIG_GPIO=y
 
+# Use until moved to retained bootmode
+CONFIG_NRF_STORE_REBOOT_TYPE_GPREGRET=y
+
 CONFIG_USE_DT_CODE_PARTITION=y
 CONFIG_BUILD_OUTPUT_UF2=y
 

diff --git a/app/boards/arm/nrfmicro/nrfmicro_13_defconfig b/app/boards/arm/nrfmicro/nrfmicro_13_defconfig
@@ -12,6 +12,9 @@ CONFIG_PINCTRL=y
 # enable GPIO
 CONFIG_GPIO=y
 
+# Use until moved to retained bootmode
+CONFIG_NRF_STORE_REBOOT_TYPE_GPREGRET=y
+
 CONFIG_USE_DT_CODE_PARTITION=y
 CONFIG_BUILD_OUTPUT_UF2=y
 

diff --git a/app/boards/arm/pillbug/pillbug_defconfig b/app/boards/arm/pillbug/pillbug_defconfig
@@ -14,6 +14,9 @@ CONFIG_PINCTRL=y
 # enable GPIO
 CONFIG_GPIO=y
 
+# Use until moved to retained bootmode
+CONFIG_NRF_STORE_REBOOT_TYPE_GPREGRET=y
+
 CONFIG_USE_DT_CODE_PARTITION=y
 CONFIG_BUILD_OUTPUT_UF2=y
 

diff --git a/app/boards/arm/puchi_ble/puchi_ble_v1_defconfig b/app/boards/arm/puchi_ble/puchi_ble_v1_defconfig
@@ -14,6 +14,9 @@ CONFIG_GPIO=y
 # Use pinctrl
 CONFIG_PINCTRL=y
 
+# Use until moved to retained bootmode
+CONFIG_NRF_STORE_REBOOT_TYPE_GPREGRET=y
+
 CONFIG_USE_DT_CODE_PARTITION=y
 CONFIG_BUILD_OUTPUT_UF2=y
 

diff --git a/app/boards/arm/s40nc/s40nc_defconfig b/app/boards/arm/s40nc/s40nc_defconfig
@@ -11,6 +11,9 @@ CONFIG_ARM_MPU=y
 # enable GPIO
 CONFIG_GPIO=y
 
+# Use until moved to retained bootmode
+CONFIG_NRF_STORE_REBOOT_TYPE_GPREGRET=y
+
 CONFIG_USE_DT_CODE_PARTITION=y
 CONFIG_BUILD_OUTPUT_UF2=y
 

diff --git a/app/boards/seeeduino_xiao_ble.conf b/app/boards/seeeduino_xiao_ble.conf
@@ -7,6 +7,9 @@ CONFIG_ZMK_USB=y
 CONFIG_ZMK_BLE=y
 
 
+# Use until moved to retained bootmode
+CONFIG_NRF_STORE_REBOOT_TYPE_GPREGRET=y
+
 CONFIG_MPU_ALLOW_FLASH_WRITE=y
 CONFIG_NVS=y
 CONFIG_SETTINGS_NVS=y