Skip to content

Commit 6489657

Browse files
committed
samples: matter: do not override PM_MCUBOOT_PAD sysbuild config
This commit removes redundant configuration of sysbuild config PM_MCUBOOT_PAD. Signed-off-by: Łukasz Duda <[email protected]>
1 parent 8222e0b commit 6489657

File tree

7 files changed

+10
-45
lines changed

7 files changed

+10
-45
lines changed

samples/matter/light_bulb/Kconfig.sysbuild

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,12 @@ config DFU_MULTI_IMAGE_PACKAGE_NET
6363

6464
endif # SOC_SERIES_NRF53X
6565

66-
if BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS
66+
if BOARD_NRF54L15DK
6767

68-
# Disable checking the external drivers for NS build.
6968
config PM_OVERRIDE_EXTERNAL_DRIVER_CHECK
7069
default y
7170

72-
# override the mcuboot pad size, because it is not set globally for NS build.
73-
config PM_MCUBOOT_PAD
74-
default 0x800
75-
76-
endif # BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS
71+
endif # BOARD_NRF54L15DK
7772

7873
endif # BOOTLOADER_MCUBOOT
7974

samples/matter/light_switch/Kconfig.sysbuild

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,12 @@ config DFU_MULTI_IMAGE_PACKAGE_NET
6363

6464
endif # SOC_SERIES_NRF53X
6565

66-
if BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS
66+
if BOARD_NRF54L15DK
6767

68-
# Disable checking the external drivers for NS build.
6968
config PM_OVERRIDE_EXTERNAL_DRIVER_CHECK
7069
default y
7170

72-
# override the mcuboot pad size, because it is not set globally for NS build.
73-
config PM_MCUBOOT_PAD
74-
default 0x800
75-
76-
endif # BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS
71+
endif # BOARD_NRF54L15DK
7772

7873
endif # BOOTLOADER_MCUBOOT
7974

samples/matter/lock/Kconfig.sysbuild

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,12 @@ config DFU_MULTI_IMAGE_PACKAGE_NET
6363

6464
endif # SOC_SERIES_NRF53X
6565

66-
if BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS
66+
if BOARD_NRF54L15DK
6767

68-
# Disable checking the external drivers for NS build.
6968
config PM_OVERRIDE_EXTERNAL_DRIVER_CHECK
7069
default y
7170

72-
# override the mcuboot pad size, because it is not set globally for NS build.
73-
config PM_MCUBOOT_PAD
74-
default 0x800
75-
76-
endif # BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS
71+
endif # BOARD_NRF54L15DK
7772

7873
endif # BOOTLOADER_MCUBOOT
7974

samples/matter/manufacturer_specific/Kconfig.sysbuild

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,9 @@ endif # SOC_SERIES_NRF53X
6565

6666
if BOARD_NRF54L15DK
6767

68-
# Disable checking the external drivers for nRF54L15 DKs.
6968
config PM_OVERRIDE_EXTERNAL_DRIVER_CHECK
7069
default y
7170

72-
# override the mcuboot pad size, because it is not set globally for NS build.
73-
config PM_MCUBOOT_PAD
74-
default 0x800
75-
7671
endif # BOARD_NRF54L15DK
7772

7873
endif # BOOTLOADER_MCUBOOT

samples/matter/template/Kconfig.sysbuild

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,9 @@ endif # SOC_SERIES_NRF53X
6565

6666
if BOARD_NRF54L15DK
6767

68-
# Disable checking the external drivers for nRF54L15 DKs.
6968
config PM_OVERRIDE_EXTERNAL_DRIVER_CHECK
7069
default y
7170

72-
# override the mcuboot pad size, because it is not set globally for NS build.
73-
config PM_MCUBOOT_PAD
74-
default 0x800
75-
7671
endif # BOARD_NRF54L15DK
7772

7873
endif # BOOTLOADER_MCUBOOT

samples/matter/thermostat/Kconfig.sysbuild

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,12 @@ config DFU_MULTI_IMAGE_PACKAGE_NET
6363

6464
endif # SOC_SERIES_NRF53X
6565

66-
if BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS
66+
if BOARD_NRF54L15DK
6767

68-
# Disable checking the external drivers for NS build.
6968
config PM_OVERRIDE_EXTERNAL_DRIVER_CHECK
7069
default y
7170

72-
# override the mcuboot pad size, because it is not set globally for NS build.
73-
config PM_MCUBOOT_PAD
74-
default 0x800
75-
76-
endif # BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS
71+
endif # BOARD_NRF54L15DK
7772

7873
endif # BOOTLOADER_MCUBOOT
7974

samples/matter/window_covering/Kconfig.sysbuild

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,12 @@ config DFU_MULTI_IMAGE_PACKAGE_NET
6363

6464
endif # SOC_SERIES_NRF53X
6565

66-
if BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS
66+
if BOARD_NRF54L15DK
6767

68-
# Disable checking the external drivers for NS build.
6968
config PM_OVERRIDE_EXTERNAL_DRIVER_CHECK
7069
default y
7170

72-
# override the mcuboot pad size, because it is not set globally for NS build.
73-
config PM_MCUBOOT_PAD
74-
default 0x800
75-
76-
endif # BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS
71+
endif # BOARD_NRF54L15DK
7772

7873
endif # BOOTLOADER_MCUBOOT
7974

0 commit comments

Comments
 (0)