tests: remove mcuboot configuration from test app

[KRKNWK-19763]

Signed-off-by: Krzysztof Taborowski <[email protected]>

tests/manual/simple_bootloader/Kconfig.sysbuild

@@ -4,51 +4,7 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-config NRF_DEFAULT_EMPTY
-	default y if BOARD_NRF5340DK_NRF5340_CPUAPP
-
-choice BOOTLOADER
-	default BOOTLOADER_MCUBOOT
-endchoice
-
-if BOOTLOADER_MCUBOOT
-
-config DFU_MULTI_IMAGE_PACKAGE_BUILD
-	default y
-
-config DFU_MULTI_IMAGE_PACKAGE_APP
-	default y
-
-if (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP)
-
-config MCUBOOT_UPDATEABLE_IMAGES
-	default 2
-
-choice MCUBOOT_MODE
-	default MCUBOOT_MODE_OVERWRITE_ONLY
-endchoice
-
-choice BOOT_SIGNATURE_TYPE
-	default BOOT_SIGNATURE_TYPE_RSA
-endchoice
-
-config SECURE_BOOT
-	default y
-
-config SECURE_BOOT_NETCORE
-	default y
-
-config NETCORE_APP_UPDATE
-	default y
-
-config DFU_MULTI_IMAGE_PACKAGE_NET
-	default y
-
-endif # BOOTLOADER_MCUBOOT
-
-endif # (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP)
-
-config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY
-	default y if BOARD_NRF52840DK_NRF52840 || BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP
+config PM_MCUBOOT_PAD
+	default 0x800
 
 source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"

tests/manual/simple_bootloader/README.rst

@@ -1,4 +1,4 @@
-Sidewalk test simple bootloder application
+Sidewalk test simple bootloader application
 ##########################################
 
 Application overview
@@ -10,17 +10,18 @@ It is significantly smaller then any Sidewalk sample.
 Maintenance notes
 ================
 .. note::
-   This appclication is designed to work with sidewalk sid_end_device sample
+   This application is designed to work with sidewalk sid_end_device sample
+   It requires sidewalk sample bootloader to be flashed first.
 
 Configuration:
-   * prj.conf - From Kconfig.dependencies config SIDEWALK_DFU_BOOTLOADER
-   * pm_static.yaml - copied from sid_end_device. Setting storage added as static partition (values from ninja partition_manager_report) to keep application footprint small.
+   * prj.conf - App configuration.
+   * pm_static.yaml - based on sid_end_device. Setting storage added as static partition (values from ninja partition_manager_report) to keep application footprint small.
 
 Requirements
 ************
 
 This application requires:
-* nrf52840 DK
+* nrf52840 DK or nRF5340 DK or nRF54L15 DK
 * mcumgr tool (cli or mobile app)
 
 Building and running
@@ -38,10 +39,10 @@ Precondition
 
 Testing sample bootloder application
 #. Build application
-#. Ready to upload image is generated in sidewalk/tests/manual/simple_bootloader/build/zephyr/app_update.bin
+#. Ready to upload image is generated in sidewalk/tests/manual/simple_bootloader/build/dfu_application.zip
 #. upload image using mcumgr tool, mark to test, reset device
-#. wait or bootloder to swap images
-#. Application marks image as ok and prints message
+#. wait to bootloder to swap images
+#. Application marks image as ok. Prints message and turn on LED
 
 Application output
 ==================

tests/manual/simple_bootloader/boards/nrf54l15dk_nrf54l10_cpuapp.overlay

@@ -3,9 +3,6 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
-
-
-/* Application does not use cpuflpr core. Assign whole RRAM to cpuapp. */
 &cpuapp_rram {
 	reg = <0x0 DT_SIZE_K(1024)>;
 };
@@ -14,3 +11,18 @@
 	reg = <0x20000000 DT_SIZE_K(192)>;
 	ranges = <0x0 0x20000000 DT_SIZE_K(192)>;
 };
+
+/ {
+	chosen {
+		nordic,pm-ext-flash = &mx25r64;
+	};
+};
+
+&mx25r64 {
+	status = "okay";
+};
+
+// TODO: re-enable HWFC once it's fixed
+&uart20 {
+	/delete-property/ hw-flow-control;
+};

tests/manual/simple_bootloader/pm_static_nrf54l15dk_nrf54l10_cpuapp.yml

@@ -1,66 +1,20 @@
-app:
-  address: 0xc800
-  end_address: 0x84800
-  region: flash_primary
-  size: 0x78000
 mcuboot:
   address: 0x0
-  end_address: 0xc000
-  placement:
-    before:
-    - mcuboot_primary
+  end_address: 0xd000
   region: flash_primary
-  size: 0xc000
+  size: 0xd000
 mcuboot_pad:
-  address: 0xc000
-  end_address: 0xc800
-  placement:
-    before:
-    - mcuboot_primary_app
+  address: 0xd000
+  end_address: 0xd800
   region: flash_primary
   size: 0x800
-mcuboot_primary:
-  address: 0xc000
-  end_address: 0x84800
-  orig_span: &id001
-  - mcuboot_pad
-  - app
-  region: flash_primary
-  sharers: 0x1
-  size: 0x78800
-  span: *id001
-mcuboot_primary_app:
-  address: 0xc800
-  end_address: 0x84800
-  orig_span: &id002
-  - app
-  region: flash_primary
-  size: 0x78000
-  span: *id002
-mcuboot_secondary:
-  address: 0x84800
-  end_address: 0xfd000
-  placement:
-    after:
-    - mcuboot_primary
-    align:
-      start: 0x1000
+settings_storage:
+  address: 0xfd000
+  end_address: 0xff000
   region: flash_primary
-  share_size:
-  - mcuboot_primary
-  size: 0x78800
+  size: 0x2000
 mfg_storage:
   address: 0xff000
   end_address: 0x100000
   region: flash_primary
   size: 0x1000
-settings_storage:
-  address: 0xfd000
-  end_address: 0xff000
-  placement:
-    align:
-      start: 0x1000
-    before:
-    - end
-  region: flash_primary
-  size: 0x2000

tests/manual/simple_bootloader/prj.conf

@@ -3,7 +3,5 @@
 #
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
-
-CONFIG_BOOTLOADER_MCUBOOT=y
 CONFIG_LOG=y
 CONFIG_DK_LIBRARY=y