tests: simplify simple bootloader test sample

[KRKNWK-17881] Signed-off-by: Krzysztof Taborowski <[email protected]>
nrfconnect · Oct 16, 2023 · 6d1efc6 · 6d1efc6
1 parent fac6325
commit 6d1efc6
Show file tree

Hide file tree

Showing 19 changed files with 15 additions and 457 deletions.
diff --git a/tests/manual/simple_bootloader/README.rst b/tests/manual/simple_bootloader/README.rst
@@ -7,14 +7,14 @@ Application overview
 This is a simple application to be updated via sidewalk dfu process.
 It is significantly smaller then any Sidewalk sample.
 
-Maintenace notes
+Maintenance notes
 ================
 .. note::
-   This appclication is designed to wrok with sidewalk template_ble sample
+   This appclication is designed to work with sidewalk template_ble sample
 
 Configuration:
    * prj.conf - From Kconfig.dependencies config SIDEWALK_DFU_BOOTLOADER
-   * pm_static.yaml - coppied from template_ble. Setting storage added as static partition (values from ninja partition_manager_report) to keep application footprint small.
+   * pm_static.yaml - copied from template_ble. Setting storage added as static partition (values from ninja partition_manager_report) to keep application footprint small.
 
 Requirements
 ************
@@ -33,7 +33,7 @@ Testing
 
 Precondition
 #. Build and flash Sidewalk template_ble sample
-#. Flash MFG.hex (provisoing data)
+#. Flash MFG.hex (provisioning data)
 #. Enter DFU mode (button action)
 
 Testing sample bootloder application

diff --git a/tests/manual/simple_bootloader/boards/nrf5340dk_nrf5340_cpuapp.conf b/tests/manual/simple_bootloader/boards/nrf5340dk_nrf5340_cpuapp.conf
@@ -5,17 +5,3 @@
 #
 
 CONFIG_BOARD_ENABLE_CPUNET=y
-
-# Allow for storing two images in MCUboot partitions
-CONFIG_UPDATEABLE_IMAGE_NUMBER=2
-
-# Store new images inside external flash
-CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=y
-
-# Configure QSPI for external flash
-CONFIG_NORDIC_QSPI_NOR=y
-CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
-CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16
-
-CONFIG_DFU_MULTI_IMAGE=y
-CONFIG_NRF53_ENFORCE_IMAGE_VERSION_EQUALITY=y
diff --git a/tests/manual/simple_bootloader/boards/nrf5340dk_nrf5340_cpuapp.overlay b/tests/manual/simple_bootloader/boards/nrf5340dk_nrf5340_cpuapp.overlay
diff --git a/tests/manual/simple_bootloader/boards/nrf5340dk_nrf5340_cpuapp_debug.conf b/tests/manual/simple_bootloader/boards/nrf5340dk_nrf5340_cpuapp_debug.conf
diff --git a/tests/manual/simple_bootloader/child_image/mcuboot/Kconfig.root b/tests/manual/simple_bootloader/child_image/mcuboot/Kconfig.root
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2023 Nordic Semiconductor ASA
+# Copyright (c) 2022 Nordic Semiconductor ASA
 #
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #

diff --git a/tests/manual/simple_bootloader/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.conf b/tests/manual/simple_bootloader/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.conf
diff --git a/tests/manual/simple_bootloader/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay b/tests/manual/simple_bootloader/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay
diff --git a/...s/manual/simple_bootloader/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp_debug.conf b/...s/manual/simple_bootloader/child_image/mcuboot/boards/nrf5340dk_nrf5340_cpuapp_debug.conf
diff --git a/tests/manual/simple_bootloader/child_image/mcuboot/prj.conf b/tests/manual/simple_bootloader/child_image/mcuboot/prj.conf
@@ -17,5 +17,6 @@ CONFIG_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_UART_CONSOLE=n
 CONFIG_USE_SEGGER_RTT=n
+CONFIG_GPIO=n
 CONFIG_NO_RUNTIME_CHECKS=y
 CONFIG_SIZE_OPTIMIZATIONS=y
diff --git a/tests/manual/simple_bootloader/child_image/mcuboot/prj_debug.conf b/tests/manual/simple_bootloader/child_image/mcuboot/prj_debug.conf
diff --git a/tests/manual/simple_bootloader/ext_flash.overlay b/tests/manual/simple_bootloader/ext_flash.overlay
diff --git a/tests/manual/simple_bootloader/pm_static.yml b/tests/manual/simple_bootloader/pm_static.yml
diff --git a/...ual/simple_bootloader/pm_static_debug.yml → ...tloader/pm_static_nrf52840dk_nrf52840.yml b/...ual/simple_bootloader/pm_static_debug.yml → ...tloader/pm_static_nrf52840dk_nrf52840.yml
@@ -1,13 +1,11 @@
-settings_storage:
-  address: 0xf7000
+mcuboot:
+  address: 0x0
   region: flash_primary
-  size: 0x2000
-
+  size: 0x7000
 sidewalk_storage:
   address: 0xf9000
   region: flash_primary
   size: 0x6000
-
 mfg_storage:
   address: 0xff000
   region: flash_primary

diff --git a/tests/manual/simple_bootloader/pm_static_nrf52840dk_nrf52840_ext_flash.yml b/tests/manual/simple_bootloader/pm_static_nrf52840dk_nrf52840_ext_flash.yml