From 994816d04a055b39de2d174930271023965e8138 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=AD=20Bol=C3=ADvar?= Date: Wed, 28 Jul 2021 12:16:06 -0700 Subject: [PATCH] zephyr: Kconfig: fix board references MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Martí Bolívar --- boot/zephyr/Kconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/boot/zephyr/Kconfig b/boot/zephyr/Kconfig index 49bfbb4a..a601242d 100644 --- a/boot/zephyr/Kconfig +++ b/boot/zephyr/Kconfig @@ -394,8 +394,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. @@ -525,8 +525,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.