Skip to content

Commit

Permalink
[nrf noup] boot: zephyr: Align serial recovery config on Thingy:91
Browse files Browse the repository at this point in the history
Change removes the legacy configuration. The legacy configuration
became problematic, because GPIO DTS nodes no longer support labels
that were used to identify nodes in MCUboot. Therefore we need to
use GPIO DTS node name with the legacy approach.

The GPIO should be configured by board's DTS, which is simpler.

Jira: NCSDK-16550

Signed-off-by: Marek Pieta <[email protected]>
(cherry picked from commit bf00840)
  • Loading branch information
MarekPieta authored and mbolivar-nordic committed Nov 29, 2022
1 parent dbcdfae commit bf04817
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 6 deletions.
3 changes: 0 additions & 3 deletions boot/zephyr/boards/thingy91_nrf52840.conf
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ CONFIG_UART_LINE_CTRL=y
CONFIG_GPIO=y
CONFIG_MCUBOOT_SERIAL=y
CONFIG_BOOT_SERIAL_CDC_ACM=y
CONFIG_BOOT_SERIAL_DETECT_PORT="GPIO_1"
CONFIG_BOOT_SERIAL_DETECT_PIN=13
CONFIG_BOOT_SERIAL_DETECT_PIN_VAL=0

# Required by USB
CONFIG_MULTITHREADING=y
Expand Down
3 changes: 0 additions & 3 deletions boot/zephyr/boards/thingy91_nrf9160.conf
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,3 @@ CONFIG_BOOT_MAX_IMG_SECTORS=256

# MCUboot serial recovery
CONFIG_MCUBOOT_SERIAL=y
CONFIG_BOOT_SERIAL_DETECT_PORT="GPIO_0"
CONFIG_BOOT_SERIAL_DETECT_PIN=26
CONFIG_BOOT_SERIAL_DETECT_PIN_VAL=0

0 comments on commit bf04817

Please sign in to comment.