Skip to content

Commit e795138

Browse files
MarekPietarlubos
authored andcommitted
applications: nrf_desktop: Disable RWX for MCUboot on nRF54L SoCs
Use CONFIG_NCS_MCUBOOT_DISABLE_SELF_RWX instead of CONFIG_FPROTECT to improve protection of the MCUboot immutable bootloader code. Jira: NCSDK-39101 Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no> Signed-off-by: Pekka Niskanen <pekka.niskanen@nordicsemi.no>
1 parent 12b4ecb commit e795138

24 files changed

Lines changed: 26 additions & 14 deletions

File tree

applications/nrf_desktop/configuration/nrf54l15dk_nrf54l05_cpuapp/images/mcuboot/prj_release.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ CONFIG_BOOT_BOOTSTRAP=n
1313
CONFIG_BOOT_VERSION_CMP_USE_BUILD_NUMBER=y
1414

1515
CONFIG_FLASH=y
16-
CONFIG_FPROTECT=y
16+
CONFIG_NCS_MCUBOOT_DISABLE_SELF_RWX=y
1717

1818
CONFIG_RESET_ON_FATAL_ERROR=y
1919

applications/nrf_desktop/configuration/nrf54l15dk_nrf54l05_cpuapp/images/mcuboot/prj_release_fast_pair.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ CONFIG_BOOT_BOOTSTRAP=n
1313
CONFIG_BOOT_VERSION_CMP_USE_BUILD_NUMBER=y
1414

1515
CONFIG_FLASH=y
16-
CONFIG_FPROTECT=y
16+
CONFIG_NCS_MCUBOOT_DISABLE_SELF_RWX=y
1717

1818
CONFIG_RESET_ON_FATAL_ERROR=y
1919

applications/nrf_desktop/configuration/nrf54l15dk_nrf54l05_cpuapp/images/mcuboot/prj_release_keyboard.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ CONFIG_BOOT_BOOTSTRAP=n
1313
CONFIG_BOOT_VERSION_CMP_USE_BUILD_NUMBER=y
1414

1515
CONFIG_FLASH=y
16-
CONFIG_FPROTECT=y
16+
CONFIG_NCS_MCUBOOT_DISABLE_SELF_RWX=y
1717

1818
CONFIG_RESET_ON_FATAL_ERROR=y
1919

applications/nrf_desktop/configuration/nrf54l15dk_nrf54l10_cpuapp/images/mcuboot/prj.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ CONFIG_BOOT_BOOTSTRAP=n
1313
CONFIG_BOOT_VERSION_CMP_USE_BUILD_NUMBER=y
1414

1515
CONFIG_FLASH=y
16-
CONFIG_FPROTECT=y
16+
CONFIG_NCS_MCUBOOT_DISABLE_SELF_RWX=y
1717

1818
# Reduce memory consumption
1919
CONFIG_BOOT_BANNER=n

applications/nrf_desktop/configuration/nrf54l15dk_nrf54l10_cpuapp/images/mcuboot/prj_fast_pair.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ CONFIG_BOOT_BOOTSTRAP=n
1313
CONFIG_BOOT_VERSION_CMP_USE_BUILD_NUMBER=y
1414

1515
CONFIG_FLASH=y
16-
CONFIG_FPROTECT=y
16+
CONFIG_NCS_MCUBOOT_DISABLE_SELF_RWX=y
1717

1818
# Reduce memory consumption
1919
CONFIG_BOOT_BANNER=n

applications/nrf_desktop/configuration/nrf54l15dk_nrf54l10_cpuapp/images/mcuboot/prj_keyboard.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ CONFIG_BOOT_BOOTSTRAP=n
1313
CONFIG_BOOT_VERSION_CMP_USE_BUILD_NUMBER=y
1414

1515
CONFIG_FLASH=y
16-
CONFIG_FPROTECT=y
16+
CONFIG_NCS_MCUBOOT_DISABLE_SELF_RWX=y
1717

1818
# Reduce memory consumption
1919
CONFIG_BOOT_BANNER=n

applications/nrf_desktop/configuration/nrf54l15dk_nrf54l10_cpuapp/images/mcuboot/prj_release.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ CONFIG_BOOT_BOOTSTRAP=n
1313
CONFIG_BOOT_VERSION_CMP_USE_BUILD_NUMBER=y
1414

1515
CONFIG_FLASH=y
16-
CONFIG_FPROTECT=y
16+
CONFIG_NCS_MCUBOOT_DISABLE_SELF_RWX=y
1717

1818
CONFIG_RESET_ON_FATAL_ERROR=y
1919

applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/images/mcuboot/prj.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ CONFIG_BOOT_BOOTSTRAP=n
1313
CONFIG_BOOT_VERSION_CMP_USE_BUILD_NUMBER=y
1414

1515
CONFIG_FLASH=y
16-
CONFIG_FPROTECT=y
16+
CONFIG_NCS_MCUBOOT_DISABLE_SELF_RWX=y
1717

1818
# Reduce memory consumption
1919
CONFIG_BOOT_BANNER=n

applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/images/mcuboot/prj_fast_pair.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ CONFIG_BOOT_BOOTSTRAP=n
1313
CONFIG_BOOT_VERSION_CMP_USE_BUILD_NUMBER=y
1414

1515
CONFIG_FLASH=y
16-
CONFIG_FPROTECT=y
16+
CONFIG_NCS_MCUBOOT_DISABLE_SELF_RWX=y
1717

1818
# Reduce memory consumption
1919
CONFIG_BOOT_BANNER=n

applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/images/mcuboot/prj_keyboard.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ CONFIG_BOOT_BOOTSTRAP=n
1313
CONFIG_BOOT_VERSION_CMP_USE_BUILD_NUMBER=y
1414

1515
CONFIG_FLASH=y
16-
CONFIG_FPROTECT=y
16+
CONFIG_NCS_MCUBOOT_DISABLE_SELF_RWX=y
1717

1818
# Reduce memory consumption
1919
CONFIG_BOOT_BANNER=n

0 commit comments

Comments
 (0)