Skip to content

Commit c362afb

Browse files
MarekPietarlubos
authored andcommitted
[nrf fromlist] boot: zephyr: Remove legacy serial recovery GPIO configuration
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 Upstream PR: mcu-tools/mcuboot#1472 Signed-off-by: Marek Pieta <[email protected]> (cherry picked from commit fda18fdafd1c83bd30a58c41c85344c78b1c80fb)
1 parent abc3dea commit c362afb

File tree

5 files changed

+0
-13
lines changed

5 files changed

+0
-13
lines changed

boot/zephyr/boards/actinius_icarus.conf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,3 @@ CONFIG_BOOT_MAX_IMG_SECTORS=256
66

77
# MCUboot serial recovery
88
CONFIG_MCUBOOT_SERIAL=y
9-
CONFIG_BOOT_SERIAL_DETECT_PORT="GPIO_0"
10-
CONFIG_BOOT_SERIAL_DETECT_PIN=5
11-
CONFIG_BOOT_SERIAL_DETECT_PIN_VAL=0

boot/zephyr/boards/circuitdojo_feather_nrf9160.conf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ CONFIG_BOOT_MAX_IMG_SECTORS=256
99

1010
# MCUboot serial recovery
1111
CONFIG_MCUBOOT_SERIAL=y
12-
CONFIG_BOOT_SERIAL_DETECT_PORT="GPIO_0"
13-
CONFIG_BOOT_SERIAL_DETECT_PIN=12
14-
CONFIG_BOOT_SERIAL_DETECT_PIN_VAL=0
1512
CONFIG_BOOT_SERIAL_DETECT_DELAY=450
1613
CONFIG_MCUBOOT_INDICATION_LED=y
1714

boot/zephyr/boards/nrf52840dongle_nrf52840.conf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ CONFIG_UART_LINE_CTRL=y
1717
CONFIG_GPIO=y
1818
CONFIG_MCUBOOT_SERIAL=y
1919
CONFIG_BOOT_SERIAL_CDC_ACM=y
20-
CONFIG_BOOT_SERIAL_DETECT_PORT="GPIO_1"
21-
CONFIG_BOOT_SERIAL_DETECT_PIN=6
2220

2321
# Required by USB
2422
CONFIG_MULTITHREADING=y

boot/zephyr/boards/sparkfun_thing_plus_nrf9160.conf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ CONFIG_BOOT_MAX_IMG_SECTORS=256
99

1010
# MCUboot serial recovery
1111
CONFIG_MCUBOOT_SERIAL=y
12-
CONFIG_BOOT_SERIAL_DETECT_PORT="GPIO_0"
13-
CONFIG_BOOT_SERIAL_DETECT_PIN=12
14-
CONFIG_BOOT_SERIAL_DETECT_PIN_VAL=0
1512
CONFIG_BOOT_SERIAL_DETECT_DELAY=450
1613
CONFIG_MCUBOOT_INDICATION_LED=y
1714

boot/zephyr/boards/thingy53_nrf5340_cpuapp.conf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ CONFIG_GPIO=y
2424
CONFIG_MCUBOOT_SERIAL=y
2525
CONFIG_MCUBOOT_SERIAL_DIRECT_IMAGE_UPLOAD=y
2626
CONFIG_BOOT_SERIAL_CDC_ACM=y
27-
CONFIG_BOOT_SERIAL_DETECT_PORT="GPIO_1"
28-
CONFIG_BOOT_SERIAL_DETECT_PIN=13
2927

3028
# Required by QSPI
3129
CONFIG_NORDIC_QSPI_NOR=y

0 commit comments

Comments
 (0)