[build] Fix Build

ambiot · May 29, 2024 · e14ee55 · e14ee55
1 parent f3b6f69
commit e14ee55
Show file tree

Hide file tree

Showing 17 changed files with 89 additions and 87 deletions.
diff --git a/component/common/application/matter/common/include/platform_opts_matter.h b/component/common/application/matter/common/include/platform_opts_matter.h
@@ -11,8 +11,10 @@
 #define CONFIG_EXAMPLE_MATTER_CHIPTEST			1
 #define CONFIG_EXAMPLE_MATTER_LIGHT				0
 #define CONFIG_EXAMPLE_MATTER_THERMOSTAT		0
+#define CONFIG_EXAMPLE_MATTER_BRIDGE			0
 #define CONFIG_EXAMPLE_MATTER_AIRCON			0
-#define CONFIG_EXAMPLE_MATTER_LAUNDRY_WASHER	0
+#define CONFIG_EXAMPLE_MATTER_DISHWASHER		0
+#define CONFIG_EXAMPLE_MATTER_LAUNDRYWASHER		0
 #define CONFIG_EXAMPLE_MATTER_REFRIGERATOR		0
 
 #if defined(CONFIG_EXAMPLE_MATTER) && (CONFIG_EXAMPLE_MATTER == 1)

diff --git a/component/common/application/matter/example/laundrywasher/example_matter_laundrywasher.cpp b/component/common/application/matter/example/laundrywasher/example_matter_laundrywasher.cpp
@@ -54,4 +54,4 @@ extern "C" void example_matter_laundrywasher(void)
         ChipLogProgress(DeviceLayer, "\n\r%s xTaskCreate(example_matter_laundrywasher) failed", __FUNCTION__);
 }
 
-#endif /* CONFIG_EXAMPLE_MATTER_LAUNDRY_WASHER */
+#endif /* CONFIG_EXAMPLE_MATTER_LAUNDRYWASHER */
diff --git a/component/common/application/matter/project/amebad/make/chip_main/air_purifier_app/Makefile b/component/common/application/matter/project/amebad/make/chip_main/air_purifier_app/Makefile
@@ -168,11 +168,11 @@ $(STATIC_LIB):$(OBJS)
 #              CLEAN GENERATED FILES                                          #
 #*****************************************************************************#
 clean:
-	rm -f $(ROOTDIR)/make/chip_main/air_purifier_app/*.o
-	rm -f $(ROOTDIR)/make/chip_main/air_purifier_app/*.i
-	rm -f $(ROOTDIR)/make/chip_main/air_purifier_app/*.s
-	rm -f $(ROOTDIR)/make/chip_main/air_purifier_app/*.d
-	rm -f $(ROOTDIR)/make/chip_main/air_purifier_app/*.ii
-	rm -f $(ROOTDIR)/make/chip_main/air_purifier_app/*.su
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/air_purifier_app/*.o
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/air_purifier_app/*.i
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/air_purifier_app/*.s
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/air_purifier_app/*.d
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/air_purifier_app/*.ii
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/air_purifier_app/*.su
 
 -include $(DEPS)
diff --git a/component/common/application/matter/project/amebad/make/chip_main/aircon_port/Makefile b/component/common/application/matter/project/amebad/make/chip_main/aircon_port/Makefile
@@ -173,11 +173,11 @@ $(STATIC_LIB):$(OBJS)
 #              CLEAN GENERATED FILES                                          #
 #*****************************************************************************#
 clean:
-	rm -f $(ROOTDIR)/make/chip_main/aircon_port/*.o
-	rm -f $(ROOTDIR)/make/chip_main/aircon_port/*.i
-	rm -f $(ROOTDIR)/make/chip_main/aircon_port/*.s
-	rm -f $(ROOTDIR)/make/chip_main/aircon_port/*.d
-	rm -f $(ROOTDIR)/make/chip_main/aircon_port/*.ii
-	rm -f $(ROOTDIR)/make/chip_main/aircon_port/*.su
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/aircon_port/*.o
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/aircon_port/*.i
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/aircon_port/*.s
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/aircon_port/*.d
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/aircon_port/*.ii
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/aircon_port/*.su
 
 -include $(DEPS)
diff --git a/component/common/application/matter/project/amebad/make/chip_main/all_clusters_app/Makefile b/component/common/application/matter/project/amebad/make/chip_main/all_clusters_app/Makefile
@@ -198,11 +198,11 @@ $(STATIC_LIB):$(OBJS)
 #              CLEAN GENERATED FILES                                          #
 #*****************************************************************************#
 clean:
-	rm -f $(ROOTDIR)/make/chip_main/all_clusters_app/*.o
-	rm -f $(ROOTDIR)/make/chip_main/all_clusters_app/*.i
-	rm -f $(ROOTDIR)/make/chip_main/all_clusters_app/*.s
-	rm -f $(ROOTDIR)/make/chip_main/all_clusters_app/*.d
-	rm -f $(ROOTDIR)/make/chip_main/all_clusters_app/*.ii
-	rm -f $(ROOTDIR)/make/chip_main/all_clusters_app/*.su
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/all_clusters_app/*.o
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/all_clusters_app/*.i
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/all_clusters_app/*.s
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/all_clusters_app/*.d
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/all_clusters_app/*.ii
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/all_clusters_app/*.su
 
 -include $(DEPS)
diff --git a/component/common/application/matter/project/amebad/make/chip_main/bridge_dm_app/Makefile b/component/common/application/matter/project/amebad/make/chip_main/bridge_dm_app/Makefile
@@ -173,11 +173,11 @@ $(STATIC_LIB):$(OBJS)
 #              CLEAN GENERATED FILES                                          #
 #*****************************************************************************#
 clean:
-	rm -f $(ROOTDIR)/make/chip_main/bridge_dm_app/*.o
-	rm -f $(ROOTDIR)/make/chip_main/bridge_dm_app/*.i
-	rm -f $(ROOTDIR)/make/chip_main/bridge_dm_app/*.s
-	rm -f $(ROOTDIR)/make/chip_main/bridge_dm_app/*.d
-	rm -f $(ROOTDIR)/make/chip_main/bridge_dm_app/*.ii
-	rm -f $(ROOTDIR)/make/chip_main/bridge_dm_app/*.su
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/bridge_dm_app/*.o
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/bridge_dm_app/*.i
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/bridge_dm_app/*.s
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/bridge_dm_app/*.d
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/bridge_dm_app/*.ii
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/bridge_dm_app/*.su
 
 -include $(DEPS)
diff --git a/component/common/application/matter/project/amebad/make/chip_main/bridge_port/Makefile b/component/common/application/matter/project/amebad/make/chip_main/bridge_port/Makefile
@@ -172,11 +172,11 @@ $(STATIC_LIB):$(OBJS)
 #              CLEAN GENERATED FILES                                          #
 #*****************************************************************************#
 clean:
-	rm -f $(ROOTDIR)/make/chip_main/bridge_port/*.o
-	rm -f $(ROOTDIR)/make/chip_main/bridge_port/*.i
-	rm -f $(ROOTDIR)/make/chip_main/bridge_port/*.s
-	rm -f $(ROOTDIR)/make/chip_main/bridge_port/*.d
-	rm -f $(ROOTDIR)/make/chip_main/bridge_port/*.ii
-	rm -f $(ROOTDIR)/make/chip_main/bridge_port/*.su
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/bridge_port/*.o
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/bridge_port/*.i
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/bridge_port/*.s
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/bridge_port/*.d
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/bridge_port/*.ii
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/bridge_port/*.su
 
 -include $(DEPS)
diff --git a/component/common/application/matter/project/amebad/make/chip_main/dishwasher_port/Makefile b/component/common/application/matter/project/amebad/make/chip_main/dishwasher_port/Makefile
@@ -179,11 +179,11 @@ $(STATIC_LIB):$(OBJS)
 #              CLEAN GENERATED FILES                                          #
 #*****************************************************************************#
 clean:
-	rm -f $(ROOTDIR)/make/chip_main/dishwasher_port/*.o
-	rm -f $(ROOTDIR)/make/chip_main/dishwasher_port/*.i
-	rm -f $(ROOTDIR)/make/chip_main/dishwasher_port/*.s
-	rm -f $(ROOTDIR)/make/chip_main/dishwasher_port/*.d
-	rm -f $(ROOTDIR)/make/chip_main/dishwasher_port/*.ii
-	rm -f $(ROOTDIR)/make/chip_main/dishwasher_port/*.su
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/dishwasher_port/*.o
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/dishwasher_port/*.i
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/dishwasher_port/*.s
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/dishwasher_port/*.d
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/dishwasher_port/*.ii
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/dishwasher_port/*.su
 
 -include $(DEPS)
diff --git a/...onent/common/application/matter/project/amebad/make/chip_main/laundrywasher_port/Makefile b/...onent/common/application/matter/project/amebad/make/chip_main/laundrywasher_port/Makefile
@@ -178,11 +178,11 @@ $(STATIC_LIB):$(OBJS)
 #              CLEAN GENERATED FILES                                          #
 #*****************************************************************************#
 clean:
-	rm -f $(ROOTDIR)/make/chip_main/laundrywasher_port/*.o
-	rm -f $(ROOTDIR)/make/chip_main/laundrywasher_port/*.i
-	rm -f $(ROOTDIR)/make/chip_main/laundrywasher_port/*.s
-	rm -f $(ROOTDIR)/make/chip_main/laundrywasher_port/*.d
-	rm -f $(ROOTDIR)/make/chip_main/laundrywasher_port/*.ii
-	rm -f $(ROOTDIR)/make/chip_main/laundrywasher_port/*.su
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/laundrywasher_port/*.o
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/laundrywasher_port/*.i
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/laundrywasher_port/*.s
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/laundrywasher_port/*.d
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/laundrywasher_port/*.ii
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/laundrywasher_port/*.su
 
 -include $(DEPS)
diff --git a/component/common/application/matter/project/amebad/make/chip_main/light_switch_app/Makefile b/component/common/application/matter/project/amebad/make/chip_main/light_switch_app/Makefile
@@ -173,11 +173,11 @@ $(STATIC_LIB):$(OBJS)
 #              CLEAN GENERATED FILES                                          #
 #*****************************************************************************#
 clean:
-	rm -f $(ROOTDIR)/make/chip_main/light-switch_app/*.o
-	rm -f $(ROOTDIR)/make/chip_main/light-switch_app/*.i
-	rm -f $(ROOTDIR)/make/chip_main/light-switch_app/*.s
-	rm -f $(ROOTDIR)/make/chip_main/light-switch_app/*.d
-	rm -f $(ROOTDIR)/make/chip_main/light-switch_app/*.ii
-	rm -f $(ROOTDIR)/make/chip_main/light-switch_app/*.su
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/light_switch_app/*.o
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/light_switch_app/*.i
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/light_switch_app/*.s
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/light_switch_app/*.d
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/light_switch_app/*.ii
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/light_switch_app/*.su
 
 -include $(DEPS)
diff --git a/component/common/application/matter/project/amebad/make/chip_main/lighting_app/Makefile b/component/common/application/matter/project/amebad/make/chip_main/lighting_app/Makefile
@@ -170,11 +170,11 @@ $(STATIC_LIB):$(OBJS)
 #              CLEAN GENERATED FILES                                          #
 #*****************************************************************************#
 clean:
-	rm -f $(ROOTDIR)/make/chip_main/lighting_app/*.o
-	rm -f $(ROOTDIR)/make/chip_main/lighting_app/*.i
-	rm -f $(ROOTDIR)/make/chip_main/lighting_app/*.s
-	rm -f $(ROOTDIR)/make/chip_main/lighting_app/*.d
-	rm -f $(ROOTDIR)/make/chip_main/lighting_app/*.ii
-	rm -f $(ROOTDIR)/make/chip_main/lighting_app/*.su
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/lighting_app/*.o
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/lighting_app/*.i
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/lighting_app/*.s
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/lighting_app/*.d
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/lighting_app/*.ii
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/lighting_app/*.su
 
 -include $(DEPS)
diff --git a/component/common/application/matter/project/amebad/make/chip_main/lighting_dm_app/Makefile b/component/common/application/matter/project/amebad/make/chip_main/lighting_dm_app/Makefile
@@ -182,11 +182,11 @@ $(STATIC_LIB):$(OBJS)
 #              CLEAN GENERATED FILES                                          #
 #*****************************************************************************#
 clean:
-	rm -f $(ROOTDIR)/make/chip_main/lighting_dm_app/*.o
-	rm -f $(ROOTDIR)/make/chip_main/lighting_dm_app/*.i
-	rm -f $(ROOTDIR)/make/chip_main/lighting_dm_app/*.s
-	rm -f $(ROOTDIR)/make/chip_main/lighting_dm_app/*.d
-	rm -f $(ROOTDIR)/make/chip_main/lighting_dm_app/*.ii
-	rm -f $(ROOTDIR)/make/chip_main/lighting_dm_app/*.su
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/lighting_dm_app/*.o
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/lighting_dm_app/*.i
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/lighting_dm_app/*.s
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/lighting_dm_app/*.d
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/lighting_dm_app/*.ii
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/lighting_dm_app/*.su
 
 -include $(DEPS)
diff --git a/component/common/application/matter/project/amebad/make/chip_main/lighting_port/Makefile b/component/common/application/matter/project/amebad/make/chip_main/lighting_port/Makefile
@@ -179,11 +179,11 @@ $(STATIC_LIB):$(OBJS)
 #              CLEAN GENERATED FILES                                          #
 #*****************************************************************************#
 clean:
-	rm -f $(ROOTDIR)/make/chip_main/lighting_port/*.o
-	rm -f $(ROOTDIR)/make/chip_main/lighting_port/*.i
-	rm -f $(ROOTDIR)/make/chip_main/lighting_port/*.s
-	rm -f $(ROOTDIR)/make/chip_main/lighting_port/*.d
-	rm -f $(ROOTDIR)/make/chip_main/lighting_port/*.ii
-	rm -f $(ROOTDIR)/make/chip_main/lighting_port/*.su
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/lighting_port/*.o
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/lighting_port/*.i
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/lighting_port/*.s
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/lighting_port/*.d
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/lighting_port/*.ii
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/lighting_port/*.su
 
 -include $(DEPS)
diff --git a/component/common/application/matter/project/amebad/make/chip_main/ota_requestor_app/Makefile b/component/common/application/matter/project/amebad/make/chip_main/ota_requestor_app/Makefile
@@ -184,11 +184,11 @@ $(STATIC_LIB):$(OBJS)
 #              CLEAN GENERATED FILES                                          #
 #*****************************************************************************#
 clean:
-	rm -f $(ROOTDIR)/make/chip_main/ota_requestor_app/*.o
-	rm -f $(ROOTDIR)/make/chip_main/ota_requestor_app/*.i
-	rm -f $(ROOTDIR)/make/chip_main/ota_requestor_app/*.s
-	rm -f $(ROOTDIR)/make/chip_main/ota_requestor_app/*.d
-	rm -f $(ROOTDIR)/make/chip_main/ota_requestor_app/*.ii
-	rm -f $(ROOTDIR)/make/chip_main/ota_requestor_app/*.su
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/ota_requestor_app/*.o
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/ota_requestor_app/*.i
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/ota_requestor_app/*.s
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/ota_requestor_app/*.d
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/ota_requestor_app/*.ii
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/ota_requestor_app/*.su
 
 -include $(DEPS)
diff --git a/component/common/application/matter/project/amebad/make/chip_main/refrigerator_port/Makefile b/component/common/application/matter/project/amebad/make/chip_main/refrigerator_port/Makefile
@@ -180,11 +180,11 @@ $(STATIC_LIB):$(OBJS)
 #              CLEAN GENERATED FILES                                          #
 #*****************************************************************************#
 clean:
-	rm -f $(ROOTDIR)/make/chip_main/refrigerator_port/*.o
-	rm -f $(ROOTDIR)/make/chip_main/refrigerator_port/*.i
-	rm -f $(ROOTDIR)/make/chip_main/refrigerator_port/*.s
-	rm -f $(ROOTDIR)/make/chip_main/refrigerator_port/*.d
-	rm -f $(ROOTDIR)/make/chip_main/refrigerator_port/*.ii
-	rm -f $(ROOTDIR)/make/chip_main/refrigerator_port/*.su
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/refrigerator_port/*.o
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/refrigerator_port/*.i
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/refrigerator_port/*.s
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/refrigerator_port/*.d
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/refrigerator_port/*.ii
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/refrigerator_port/*.su
 
 -include $(DEPS)
diff --git a/component/common/application/matter/project/amebad/make/chip_main/thermostat_port/Makefile b/component/common/application/matter/project/amebad/make/chip_main/thermostat_port/Makefile
@@ -180,11 +180,11 @@ $(STATIC_LIB):$(OBJS)
 #              CLEAN GENERATED FILES                                          #
 #*****************************************************************************#
 clean:
-	rm -f $(ROOTDIR)/make/chip_main/thermostat_port/*.o
-	rm -f $(ROOTDIR)/make/chip_main/thermostat_port/*.i
-	rm -f $(ROOTDIR)/make/chip_main/thermostat_port/*.s
-	rm -f $(ROOTDIR)/make/chip_main/thermostat_port/*.d
-	rm -f $(ROOTDIR)/make/chip_main/thermostat_port/*.ii
-	rm -f $(ROOTDIR)/make/chip_main/thermostat_port/*.su
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/thermostat_port/*.o
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/thermostat_port/*.i
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/thermostat_port/*.s
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/thermostat_port/*.d
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/thermostat_port/*.ii
+	rm -f $(MATTER_BUILDDIR)/make/chip_main/thermostat_port/*.su
 
 -include $(DEPS)
diff --git a/project/realtek_amebaD_va0_example/GCC-RELEASE/project_hp/asdk/Makefile b/project/realtek_amebaD_va0_example/GCC-RELEASE/project_hp/asdk/Makefile
@@ -203,7 +203,7 @@ bridge_dm: build_target_folder copy_ld_img2 check_toolchain build_info.h
 	make -C $(MATTER_BUILDDIR) bridge_dm
 
 dishwasher_port: build_target_folder copy_ld_img2 check_toolchain build_info.h
-	make -C $(MATTER_BUILDDIR) laundrywasher_port
+	make -C $(MATTER_BUILDDIR) dishwasher_port
 
 laundrywasher_port: build_target_folder copy_ld_img2 check_toolchain build_info.h
 	make -C $(MATTER_BUILDDIR) laundrywasher_port