Revert "[nrfconnect] Add support for Zephyr's version management (project-chip#33216)"

This reverts commit 42e5ceb.

Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>

Author: adigie

config/zephyr/Kconfig

@@ -95,7 +95,6 @@ config CHIP_DEVICE_HARDWARE_VERSION_STRING
 	  hardware version string is exposed as an attribute of the Basic
 	  Information cluster.
 
-if "$(APPVERSION)"=""
 config CHIP_DEVICE_SOFTWARE_VERSION
 	int "Software version"
 	default 0
@@ -117,7 +116,6 @@ config CHIP_DEVICE_SOFTWARE_VERSION_STRING
 	  software version string is exposed as an attribute of the Basic
 	  Information cluster, and included in the header of the generated Matter
 	  over-the-air (OTA) update image.
-endif
 
 config CHIP_DEVICE_MANUFACTURING_DATE
 	string "Manufacturing date (ISO 8601 format)"

config/zephyr/ota-image.cmake

@@ -31,33 +31,18 @@ function(chip_ota_image TARGET_NAME)
     endif()
 
     # Prepare ota_image_tool.py argument list
-    if(DEFINED APPVERSION)
-        set(OTA_ARGS
-            "--vendor-id"
-            ${CONFIG_CHIP_DEVICE_VENDOR_ID}
-            "--product-id"
-            ${CONFIG_CHIP_DEVICE_PRODUCT_ID}
-            "--version"
-            ${APPVERSION}
-            "--version-str"
-            ${APP_VERSION_TWEAK_STRING}
-            "--digest-algorithm"
-            "sha256"
-        )
-    else()
-        set(OTA_ARGS
-            "--vendor-id"
-            ${CONFIG_CHIP_DEVICE_VENDOR_ID}
-            "--product-id"
-            ${CONFIG_CHIP_DEVICE_PRODUCT_ID}
-            "--version"
-            ${CONFIG_CHIP_DEVICE_SOFTWARE_VERSION}
-            "--version-str"
-            ${CONFIG_CHIP_DEVICE_SOFTWARE_VERSION_STRING}
-            "--digest-algorithm"
-            "sha256"
-        )
-    endif()
+    set(OTA_ARGS
+        "--vendor-id"
+        ${CONFIG_CHIP_DEVICE_VENDOR_ID}
+        "--product-id"
+        ${CONFIG_CHIP_DEVICE_PRODUCT_ID}
+        "--version"
+        ${CONFIG_CHIP_DEVICE_SOFTWARE_VERSION}
+        "--version-str"
+        ${CONFIG_CHIP_DEVICE_SOFTWARE_VERSION_STRING}
+        "--digest-algorithm"
+        "sha256"
+    )
 
     separate_arguments(OTA_EXTRA_ARGS NATIVE_COMMAND "${CHIP_OTA_IMAGE_EXTRA_ARGS}")
 

src/platform/nrfconnect/CHIPDevicePlatformConfig.h

@@ -23,9 +23,6 @@
 
 #pragma once
 
-#ifndef CONFIG_CHIP_DEVICE_SOFTWARE_VERSION
-#include "app_version.h"
-#endif
 #include "autoconf.h"
 
 // ==================== Platform Adaptations ====================
@@ -36,19 +33,8 @@
 #define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_NAME CONFIG_CHIP_DEVICE_PRODUCT_NAME
 #define CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION CONFIG_CHIP_DEVICE_HARDWARE_VERSION
 #define CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION_STRING CONFIG_CHIP_DEVICE_HARDWARE_VERSION_STRING
-
-#ifdef CONFIG_CHIP_DEVICE_SOFTWARE_VERSION
 #define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION CONFIG_CHIP_DEVICE_SOFTWARE_VERSION
-#else
-#define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION APPVERSION
-#endif
-
-#ifdef CONFIG_CHIP_DEVICE_SOFTWARE_VERSION_STRING
 #define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING CONFIG_CHIP_DEVICE_SOFTWARE_VERSION_STRING
-#else
-#define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING APP_VERSION_TWEAK_STRING
-#endif
-
 #define CHIP_DEVICE_CONFIG_TEST_MANUFACTURING_DATE CONFIG_CHIP_DEVICE_MANUFACTURING_DATE
 #define CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER CONFIG_CHIP_DEVICE_SERIAL_NUMBER
 #define CHIP_DEVICE_CONFIG_DEVICE_TYPE CONFIG_CHIP_DEVICE_TYPE