Commit 8812dc89 authored by Martí Bolívar's avatar Martí Bolívar Committed by Andrzej Puzdrowski
Browse files

zephyr: Kconfig: fix board references 



Upstream Zephyr has renamed the 'nonsecure' variants for boards that
support TF-M. The rename consistently uses '_ns' or '_NS' (with
underscore) as the postfix which distinguishes these variants from
their 'secure' versions.

This affects Kconfig symbols used by MCUboot, so fix them to keep
working with the latest zephyr main branch.

Signed-off-by: default avatarMartí Bolívar <marti.bolivar@nordicsemi.no>
(cherry picked from commit 994816d0)
Signed-off-by: default avatarAndrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
parent 2282da33

boot/zephyr/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -403,8 +403,8 @@ config BOOT_USB_DFU_DETECT_PIN 
	default 6 if BOARD_NRF9160DK_NRF9160

	default 11 if BOARD_NRF52840DK_NRF52840

	default 13 if BOARD_NRF52DK_NRF52832

	default 23 if BOARD_NRF5340_DK_NRF5340_CPUAPP || BOARD_NRF5340_DK_NRF5340_CPUAPPNS

	default 43 if BOARD_BL5340_DVK_CPUAPP || BOARD_BL5340_DVK_CPUAPPNS

	default 23 if BOARD_NRF5340_DK_NRF5340_CPUAPP || BOARD_NRF5340_DK_NRF5340_CPUAPP_NS

	default 43 if BOARD_BL5340_DVK_CPUAPP || BOARD_BL5340_DVK_CPUAPP_NS

	help

	  Pin on the DFU detect port that triggers DFU mode.
@@ -517,8 +517,8 @@ config BOOT_SERIAL_DETECT_PIN 
	default 6 if BOARD_NRF9160DK_NRF9160

	default 11 if BOARD_NRF52840DK_NRF52840

	default 13 if BOARD_NRF52DK_NRF52832 || BOARD_NRF52833DK_NRF52833

	default 23 if BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPPNS || \

		BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPPNS

	default 23 if BOARD_NRF5340PDK_NRF5340_CPUAPP || BOARD_NRF5340PDK_NRF5340_CPUAPP_NS || \

		BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS

	help

	  Pin on the serial detect port that triggers serial recovery mode.

CRA Git | Maintained and supported by SUSTech CRA and CCSE