treewide: Remove child/parent image support

Removes support for child/parent image

Signed-off-by: Jamie McCrae <[email protected]>

Author: nordicjm

CMakeLists.txt

@@ -24,7 +24,6 @@ endforeach()
 include(cmake/extensions.cmake)
 include(cmake/version.cmake)
 include(cmake/version_app.cmake)
-include(cmake/multi_image.cmake)
 include(cmake/sdp.cmake)
 
 zephyr_include_directories(include)

Kconfig.nrf

@@ -28,12 +28,6 @@ endif # BUILD_WITH_TFM
 
 menu "Nordic nRF Connect"
 
-# Hides child parent configuration options
-config HIDE_CHILD_PARENT_CONFIG
-	bool
-	default y if "$(HIDE_CHILD_PARENT_CONFIG)" = "True"
-	default n
-
 # Override configuration from zephyr which sets this to 0x200 if MCUboot is
 # enabled (CONFIG_BOOTLOADER_MCUBOOT), since NCS use partition_manager to
 # get this offset intsead.

applications/asset_tracker_v2/boards/native_sim.conf

@@ -111,7 +111,6 @@ CONFIG_IMG_MANAGER=n
 CONFIG_MCUBOOT_IMG_MANAGER=n
 CONFIG_IMG_ERASE_PROGRESSIVELY=n
 CONFIG_SECURE_BOOT=n
-CONFIG_BUILD_S1_VARIANT=n
 
 # Watchdog
 CONFIG_WATCHDOG_APPLICATION=n

applications/asset_tracker_v2/boards/thingy91_nrf9160_ns.conf

@@ -29,4 +29,3 @@ CONFIG_LED_PWM=y
 
 # Disable MCUboot DFU -- incompatible with static partitions
 CONFIG_SECURE_BOOT=n
-CONFIG_BUILD_S1_VARIANT=n

applications/asset_tracker_v2/prj.conf

@@ -77,7 +77,6 @@ CONFIG_IMG_MANAGER=y
 CONFIG_MCUBOOT_IMG_MANAGER=y
 CONFIG_IMG_ERASE_PROGRESSIVELY=y
 CONFIG_SECURE_BOOT=y
-CONFIG_BUILD_S1_VARIANT=y
 
 # Watchdog
 CONFIG_WATCHDOG_APPLICATION=y

applications/machine_learning/CMakeLists.txt

@@ -39,7 +39,3 @@ add_subdirectory(common/src/modules)
 add_subdirectory(src/events)
 add_subdirectory(src/modules)
 add_subdirectory(src/util)
-
-if(CONFIG_BT_HCI_IPC AND NOT SYSBUILD)
-  assert_exists(hci_ipc_CONF_FILE)
-endif()

applications/nrf5340_audio/Kconfig.defaults

@@ -21,9 +21,6 @@ config SYSTEM_WORKQUEUE_STACK_SIZE
 config THREAD_NAME
 	default y
 
-config NCS_INCLUDE_RPMSG_CHILD_IMAGE
-	default y
-
 # Workaround to not use fatal_error.c in NCS. Note that the system may still
 # reset on error depending on the build configuraion
 config RESET_ON_FATAL_ERROR

applications/nrf_desktop/CMakeLists.txt

@@ -43,19 +43,7 @@ add_subdirectory(src/hw_interface)
 add_subdirectory(src/modules)
 add_subdirectory(src/util)
 
-if(NOT SYSBUILD AND NOT CONFIG_NCS_IS_VARIANT_IMAGE)
-  if(CONFIG_BOOTLOADER_MCUBOOT)
-    assert_exists(mcuboot_CONF_FILE)
-  endif()
-  if(CONFIG_SECURE_BOOT)
-    assert_exists(b0_CONF_FILE)
-  endif()
-  if(CONFIG_BT_HCI_IPC)
-    assert_exists(hci_ipc_CONF_FILE)
-  endif()
-endif()
-
-if (CONFIG_IMG_MANAGER)
+if(CONFIG_IMG_MANAGER)
   zephyr_library_link_libraries(MCUBOOT_BOOTUTIL)
 endif()
 

boards/nordic/thingy91x/Kconfig.defconfig.nrf5340

@@ -93,16 +93,10 @@ config SECURE_BOOT
 config BOOTLOADER_MCUBOOT
 	default y if BOARD_THINGY91X_NRF5340_CPUAPP || BOARD_THINGY91X_NRF5340_CPUAPP_NS
 
-config ADD_MCUBOOT_MEDIATE_SIM_FLASH_DTS
-	default y if BOARD_THINGY91X_NRF5340_CPUAPP || BOARD_THINGY91X_NRF5340_CPUAPP_NS
-
 config NRF53_UPGRADE_NETWORK_CORE
 	default y if BOARD_THINGY91X_NRF5340_CPUAPP || BOARD_THINGY91X_NRF5340_CPUAPP_NS
 
 config UPDATEABLE_IMAGE_NUMBER
 	default 2 if BOARD_THINGY91X_NRF5340_CPUAPP || BOARD_THINGY91X_NRF5340_CPUAPP_NS
 
-config SB_SIGNING_KEY_FILE
-	default "$(ZEPHYR_NRF_MODULE_DIR)/boards/nordic/thingy91x/nsib_signing_key_nrf5340.pem" if BOARD_THINGY91X_NRF5340_CPUAPP || BOARD_THINGY91X_NRF5340_CPUAPP_NS || BOARD_THINGY91X_NRF5340_CPUNET
-
 endif # !IS_BOOTLOADER_IMG

boards/nordic/thingy91x/Kconfig.defconfig.nrf9151

@@ -66,14 +66,6 @@ config SECURE_BOOT
 config BOOTLOADER_MCUBOOT
 	default y
 
-# Do not use these keys for own custom boards!
-# These are meant as examples and therefore public.
-# The documentation of the nRF Secure Immutable Bootloader and MCUBoot detail on how
-# to set up your own keys.
-
-config SB_SIGNING_KEY_FILE
-	default "$(ZEPHYR_NRF_MODULE_DIR)/boards/nordic/thingy91x/nsib_signing_key.pem"
-
 config I2C
 	default y