Revert "[nrf fromlist] boot: zephyr: Remove legacy serial recovery GPIO configuration"

tmon-nordic · tmon-nordic · commit 19486e40f81d · 2022-11-03T08:07:41.000+01:00
This reverts commit c362afb. Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
diff --git a/boot/zephyr/boards/actinius_icarus.conf b/boot/zephyr/boards/actinius_icarus.conf
@@ -6,3 +6,6 @@ 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=5
+CONFIG_BOOT_SERIAL_DETECT_PIN_VAL=0
diff --git a/boot/zephyr/boards/circuitdojo_feather_nrf9160.conf b/boot/zephyr/boards/circuitdojo_feather_nrf9160.conf
@@ -9,6 +9,9 @@ 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=12
+CONFIG_BOOT_SERIAL_DETECT_PIN_VAL=0
 CONFIG_BOOT_SERIAL_DETECT_DELAY=450
 CONFIG_MCUBOOT_INDICATION_LED=y
 
diff --git a/boot/zephyr/boards/nrf52840dongle_nrf52840.conf b/boot/zephyr/boards/nrf52840dongle_nrf52840.conf
@@ -17,6 +17,8 @@ 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=6
 
 # Required by USB
 CONFIG_MULTITHREADING=y
diff --git a/boot/zephyr/boards/sparkfun_thing_plus_nrf9160.conf b/boot/zephyr/boards/sparkfun_thing_plus_nrf9160.conf
@@ -9,6 +9,9 @@ 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=12
+CONFIG_BOOT_SERIAL_DETECT_PIN_VAL=0
 CONFIG_BOOT_SERIAL_DETECT_DELAY=450
 CONFIG_MCUBOOT_INDICATION_LED=y
 
diff --git a/boot/zephyr/boards/thingy53_nrf5340_cpuapp.conf b/boot/zephyr/boards/thingy53_nrf5340_cpuapp.conf
@@ -24,6 +24,8 @@ CONFIG_GPIO=y
 CONFIG_MCUBOOT_SERIAL=y
 CONFIG_MCUBOOT_SERIAL_DIRECT_IMAGE_UPLOAD=y
 CONFIG_BOOT_SERIAL_CDC_ACM=y
+CONFIG_BOOT_SERIAL_DETECT_PORT="GPIO_1"
+CONFIG_BOOT_SERIAL_DETECT_PIN=13
 
 # Required by QSPI
 CONFIG_NORDIC_QSPI_NOR=y
