From 2af8b312df47ae417cfed606b8568b7201e51b9d Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Tue, 26 Aug 2025 10:02:14 +0100 Subject: [PATCH 1/4] Revert "[nrf noup] boot: zephyr: Add NCS boot banner" This reverts commit 8d31ad7f5e284789e9dc3acb3cb223dfe4e4db09. Signed-off-by: Jamie McCrae --- boot/zephyr/prj.conf | 3 --- 1 file changed, 3 deletions(-) diff --git a/boot/zephyr/prj.conf b/boot/zephyr/prj.conf index 87829ba63..26b9b4d65 100644 --- a/boot/zephyr/prj.conf +++ b/boot/zephyr/prj.conf @@ -37,6 +37,3 @@ CONFIG_PICOLIBC=y ### Disable malloc arena because we don't need it CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=0 CONFIG_NRF_RTC_TIMER_USER_CHAN_COUNT=0 - -# NCS boot banner -CONFIG_NCS_APPLICATION_BOOT_BANNER_STRING="MCUboot" From 73b97c0d931934ccd0f15f869bcb8317a5a0374c Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Tue, 26 Aug 2025 10:02:18 +0100 Subject: [PATCH 2/4] Revert "[nrf noup] zephyr: Restore default RTC user channel count" This reverts commit 50e1caa7c6d9710a610537e97188e624d548dfca. Signed-off-by: Jamie McCrae --- boot/zephyr/prj.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/boot/zephyr/prj.conf b/boot/zephyr/prj.conf index 26b9b4d65..02b27f1c4 100644 --- a/boot/zephyr/prj.conf +++ b/boot/zephyr/prj.conf @@ -36,4 +36,3 @@ CONFIG_CBPRINTF_NANO=y CONFIG_PICOLIBC=y ### Disable malloc arena because we don't need it CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=0 -CONFIG_NRF_RTC_TIMER_USER_CHAN_COUNT=0 From f7b0ac79b7ceb2294bdca77a4cc6cde3477e7a70 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Tue, 11 Jun 2024 12:32:51 +0100 Subject: [PATCH 3/4] [nrf noup] boot: zephyr: Add NCS boot banner Adds a boot banner which shows as MCUboot Signed-off-by: Jamie McCrae (cherry picked from commit 4b3d6ab014bca42f57b25bfc1843a473f11cb898) --- boot/zephyr/prj.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/boot/zephyr/prj.conf b/boot/zephyr/prj.conf index 02b27f1c4..766762237 100644 --- a/boot/zephyr/prj.conf +++ b/boot/zephyr/prj.conf @@ -36,3 +36,6 @@ CONFIG_CBPRINTF_NANO=y CONFIG_PICOLIBC=y ### Disable malloc arena because we don't need it CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=0 + +# NCS boot banner +CONFIG_NCS_APPLICATION_BOOT_BANNER_STRING="MCUboot" From 5f9bb854679b51594a84a682c824decb7b2c2493 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Tue, 26 Aug 2025 10:22:04 +0100 Subject: [PATCH 4/4] [nrf noup] boot: zephyr: firmware_loader: Allow GPIO usage in BM Allows GPIO entrance mode when bare metal is used, this is needed because the zephyr GPIO drivers are not used, therefore the Kconfig will not be enabled Signed-off-by: Jamie McCrae --- boot/zephyr/Kconfig.firmware_loader | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/zephyr/Kconfig.firmware_loader b/boot/zephyr/Kconfig.firmware_loader index 1ba223949..036da98eb 100644 --- a/boot/zephyr/Kconfig.firmware_loader +++ b/boot/zephyr/Kconfig.firmware_loader @@ -8,7 +8,7 @@ menu "Firmware loader entrance methods" menuconfig BOOT_FIRMWARE_LOADER_ENTRANCE_GPIO bool "GPIO" - depends on GPIO + depends on GPIO || NCS_BM help Use a GPIO to enter firmware loader mode.