Merge branch 'master' into pw_rpc_fixes

project-chip · Jan 22, 2025 · 31673ef · 31673ef
2 parents 4438ec3 + 2d0f857
commit 31673ef
Show file tree

Hide file tree

Showing 17 changed files with 74 additions and 116 deletions.
diff --git a/data_model/1.4/clusters/EcosystemInformationCluster.xml b/data_model/1.4/clusters/EcosystemInformationCluster.xml
@@ -120,4 +120,18 @@ Davis, CA 95616, USA
       <access fabricScoped="true"/>
     </struct>
   </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="DeviceDirectory" type="list">
+      <entry type="EcosystemDeviceStruct"/>
+      <access read="true" readPrivilege="manage" fabricScoped="true"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="LocationDirectory" type="list">
+      <entry type="EcosystemLocationStruct"/>
+      <access read="true" readPrivilege="manage" fabricScoped="true"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
+      <mandatoryConform/>
+    </attribute>
+  </attributes>
 </cluster>
diff --git a/data_model/1.4/spec_sha b/data_model/1.4/spec_sha
@@ -1 +1 @@
-3d8fc9ae05045a53fdaffd7e3593f92a48b10e30
+21812107312887c416632ed6dd2399af1f077548
diff --git a/examples/contact-sensor-app/nxp/k32w1/BUILD.gn b/examples/contact-sensor-app/nxp/k32w1/BUILD.gn
@@ -86,14 +86,6 @@ mcxw71_k32w1_sdk("sdk") {
   defines += [
     "CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR=${setup_discriminator}",
   ]
-
-  if (nxp_nvm_component == "littlefs") {
-    include_dirs += [ "${example_platform_dir}/board" ]
-    sources += [
-      "${example_platform_dir}/board/peripherals.c",
-      "${example_platform_dir}/board/peripherals.h",
-    ]
-  }
 }
 
 mcxw71_k32w1_executable("contact_sensor_app") {

diff --git a/examples/contact-sensor-app/nxp/k32w1/args.gni b/examples/contact-sensor-app/nxp/k32w1/args.gni
@@ -42,5 +42,3 @@ chip_openthread_ftd = false
 nxp_enable_ot_cli = false
 
 chip_with_diag_logs_demo = true
-
-nxp_nvm_component = "nvs"
diff --git a/examples/contact-sensor-app/nxp/mcxw71/BUILD.gn b/examples/contact-sensor-app/nxp/mcxw71/BUILD.gn
@@ -85,14 +85,6 @@ mcxw71_k32w1_sdk("sdk") {
   defines += [
     "CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR=${setup_discriminator}",
   ]
-
-  if (nxp_nvm_component == "littlefs") {
-    include_dirs += [ "${example_platform_dir}/board" ]
-    sources += [
-      "${example_platform_dir}/board/peripherals.c",
-      "${example_platform_dir}/board/peripherals.h",
-    ]
-  }
 }
 
 mcxw71_k32w1_executable("contact_sensor_app") {

diff --git a/examples/contact-sensor-app/nxp/mcxw71/args.gni b/examples/contact-sensor-app/nxp/mcxw71/args.gni
@@ -40,5 +40,3 @@ chip_openthread_ftd = false
 nxp_enable_ot_cli = false
 
 chip_with_diag_logs_demo = true
-
-nxp_nvm_component = "nvs"
diff --git a/examples/lighting-app/nxp/k32w1/BUILD.gn b/examples/lighting-app/nxp/k32w1/BUILD.gn
@@ -100,14 +100,6 @@ mcxw71_k32w1_sdk("sdk") {
   defines += [
     "CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR=${setup_discriminator}",
   ]
-
-  if (nxp_nvm_component == "littlefs") {
-    include_dirs += [ "${example_platform_dir}/board" ]
-    sources += [
-      "${example_platform_dir}/board/peripherals.c",
-      "${example_platform_dir}/board/peripherals.h",
-    ]
-  }
 }
 
 mcxw71_k32w1_executable("light_app") {

diff --git a/examples/lighting-app/nxp/k32w1/args.gni b/examples/lighting-app/nxp/k32w1/args.gni
@@ -35,7 +35,5 @@ chip_system_config_provide_statistics = false
 chip_system_config_use_open_thread_inet_endpoints = true
 chip_with_lwip = false
 
-nxp_nvm_component = "nvs"
-
 nxp_use_smu2_static = true
 nxp_use_smu2_dynamic = true
diff --git a/examples/lighting-app/nxp/mcxw71/BUILD.gn b/examples/lighting-app/nxp/mcxw71/BUILD.gn
@@ -100,14 +100,6 @@ mcxw71_k32w1_sdk("sdk") {
   defines += [
     "CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR=${setup_discriminator}",
   ]
-
-  if (nxp_nvm_component == "littlefs") {
-    include_dirs += [ "${example_platform_dir}/board" ]
-    sources += [
-      "${example_platform_dir}/board/peripherals.c",
-      "${example_platform_dir}/board/peripherals.h",
-    ]
-  }
 }
 
 mcxw71_k32w1_executable("light_app") {

diff --git a/examples/lighting-app/nxp/mcxw71/args.gni b/examples/lighting-app/nxp/mcxw71/args.gni
@@ -35,7 +35,5 @@ chip_system_config_provide_statistics = false
 chip_system_config_use_open_thread_inet_endpoints = true
 chip_with_lwip = false
 
-nxp_nvm_component = "nvs"
-
 nxp_use_smu2_static = true
 nxp_use_smu2_dynamic = true
diff --git a/examples/lock-app/nxp/k32w1/BUILD.gn b/examples/lock-app/nxp/k32w1/BUILD.gn
@@ -85,14 +85,6 @@ mcxw71_k32w1_sdk("sdk") {
     "CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR=${setup_discriminator}",
   ]
 
-  if (nxp_nvm_component == "littlefs") {
-    include_dirs += [ "${example_platform_dir}/board" ]
-    sources += [
-      "${example_platform_dir}/board/peripherals.c",
-      "${example_platform_dir}/board/peripherals.h",
-    ]
-  }
-
   if (nxp_multiple_ble_connections) {
     include_dirs += [ "${example_platform_dir}/app_ble/include" ]
     defines += [

diff --git a/examples/lock-app/nxp/mcxw71/BUILD.gn b/examples/lock-app/nxp/mcxw71/BUILD.gn
@@ -85,14 +85,6 @@ mcxw71_k32w1_sdk("sdk") {
     "CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR=${setup_discriminator}",
   ]
 
-  if (nxp_nvm_component == "littlefs") {
-    include_dirs += [ "${example_platform_dir}/board" ]
-    sources += [
-      "${example_platform_dir}/board/peripherals.c",
-      "${example_platform_dir}/board/peripherals.h",
-    ]
-  }
-
   if (nxp_multiple_ble_connections) {
     include_dirs += [ "${example_platform_dir}/app_ble/include" ]
     defines += [

diff --git a/examples/platform/nxp/mcxw71_k32w1/app/support/BUILD.gn b/examples/platform/nxp/mcxw71_k32w1/app/support/BUILD.gn
@@ -55,8 +55,6 @@ source_set("freertos_memory_utils") {
 
   if (nxp_nvm_component == "fwk_nvm") {
     defines = [ "CHIP_PLAT_NVM_SUPPORT=1" ]
-  } else if (nxp_nvm_component == "littlefs") {
-    defines = [ "CHIP_PLAT_NVM_SUPPORT=3" ]
   }
 
   public_configs = [

diff --git a/scripts/dm_xml_ci_change_enforcement.py b/scripts/dm_xml_ci_change_enforcement.py
@@ -36,15 +36,15 @@ def check_dm_directory(dir):
 
     def check_dir(dir):
         cmd = f'git diff HEAD^..HEAD --name-only -- {dir}'
-        output = subprocess.check_output(cmd, shell=True).decode().splitlines()
+        output = subprocess.check_output(cmd, shell=True).decode()
         if output and 'spec_sha' not in output and 'scraper_version' not in output:
             print(f'Data model directory {dir} had changes to the following files without a corresponding update to the spec SHA')
             print(output)
             print("Note that the data_model directory files are automatically updated by a spec scraper and should not be manually updated.")
             return 1
         return 0
 
-    ret = check_dir(clusters) + check_dir(device_types)
+    ret = check_dir(dir)
     sys.exit(ret)
 
 

diff --git a/src/platform/nxp/mcxw71_k32w1/BUILD.gn b/src/platform/nxp/mcxw71_k32w1/BUILD.gn
@@ -123,18 +123,6 @@ static_library("nxp_platform") {
       "ram_storage.c",
       "ram_storage.h",
     ]
-  } else if (nxp_nvm_component == "littlefs") {
-    defines += [
-      "CHIP_PLAT_NVM_SUPPORT=3",
-      "EXTERNAL_KEYVALUESTOREMANAGERIMPL_HEADER=\"platform/nxp/common/KeyValueStoreManagerImpl.h\"",
-    ]
-
-    sources += [
-      "../common/KeyValueStoreManagerImpl.cpp",
-      "../common/KeyValueStoreManagerImpl.h",
-      "../common/NXPConfig.h",
-      "../common/NXPConfigKS.cpp",
-    ]
   } else if (nxp_nvm_component == "nvs") {
     defines += [
       "gAppNvsExternalFlash_c=0",

diff --git a/src/platform/nxp/mcxw71_k32w1/args.gni b/src/platform/nxp/mcxw71_k32w1/args.gni
@@ -21,6 +21,7 @@ openthread_root =
 nxp_platform = "mcxw71_k32w1"
 nxp_sdk_name = "mcxw71_k32w1_sdk"
 nxp_device_layer = "nxp/${nxp_platform}"
+nxp_nvm_component = "nvs"
 nxp_use_lwip = false
 
 # ARM architecture flags will be set based on NXP board.
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		3d8fc9ae05045a53fdaffd7e3593f92a48b10e30
		21812107312887c416632ed6dd2399af1f077548
Original file line number	Diff line number	Diff line change
Expand Up		@@ -42,5 +42,3 @@ chip_openthread_ftd = false
		nxp_enable_ot_cli = false

		chip_with_diag_logs_demo = true

		nxp_nvm_component = "nvs"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -40,5 +40,3 @@ chip_openthread_ftd = false
		nxp_enable_ot_cli = false

		chip_with_diag_logs_demo = true

		nxp_nvm_component = "nvs"