[sdk] matter restructure part 2

* add matter_common_flags.mk for better maintenance of common matter config
ambiot · May 20, 2024 · a98f3f4 · a98f3f4
1 parent 9b1b69e
commit a98f3f4
Show file tree

Hide file tree

Showing 32 changed files with 292 additions and 811 deletions.
diff --git a/component/common/application/matter/project/amebaz2/Makefile b/component/common/application/matter/project/amebaz2/Makefile
@@ -279,32 +279,33 @@ chef: toolchain $(CHEF_FILE)
 .PHONY: clean_matter_libs
 clean_matter_libs:
  @$(MAKE) -f $(MATTER_MAKEDIR)/all_clusters/lib_chip_main.mk clean
- @$(MAKE) -f $(MATTER_MAKEDIR)/all_clusters/lib_chip.mk clean
  @$(MAKE) -f $(MATTER_MAKEDIR)/aircon/lib_chip_aircon_main.mk clean
- @$(MAKE) -f $(MATTER_MAKEDIR)/aircon/lib_chip_aircon_core.mk clean
  @$(MAKE) -f $(MATTER_MAKEDIR)/air_purifier/lib_chip_air_purifier_main.mk clean
- @$(MAKE) -f $(MATTER_MAKEDIR)/air_purifier/lib_chip_air_purifier_core.mk clean
  @$(MAKE) -f $(MATTER_MAKEDIR)/bridge_dm/lib_chip_bridge_main.mk clean
- @$(MAKE) -f $(MATTER_MAKEDIR)/bridge_dm/lib_chip_bridge_core.mk clean
  @$(MAKE) -f $(MATTER_MAKEDIR)/chef/lib_chip_chef_main.mk clean
- @$(MAKE) -f $(MATTER_MAKEDIR)/chef/lib_chip_chef_core.mk clean
  @$(MAKE) -f $(MATTER_MAKEDIR)/dishwasher/lib_chip_dishwasher_main.mk clean
- @$(MAKE) -f $(MATTER_MAKEDIR)/dishwasher/lib_chip_dishwasher_core.mk clean
  @$(MAKE) -f $(MATTER_MAKEDIR)/fan/lib_chip_fan_main.mk clean
- @$(MAKE) -f $(MATTER_MAKEDIR)/fan/lib_chip_fan_core.mk clean
  @$(MAKE) -f $(MATTER_MAKEDIR)/laundrywasher/lib_chip_laundrywasher_main.mk clean
- @$(MAKE) -f $(MATTER_MAKEDIR)/laundrywasher/lib_chip_laundrywasher_core.mk clean
  @$(MAKE) -f $(MATTER_MAKEDIR)/light/lib_chip_light_main.mk clean
- @$(MAKE) -f $(MATTER_MAKEDIR)/light/lib_chip_light_core.mk clean
  @$(MAKE) -f $(MATTER_MAKEDIR)/light_dm/lib_chip_light_main.mk clean
- @$(MAKE) -f $(MATTER_MAKEDIR)/light_dm/lib_chip_light_core.mk clean
  @$(MAKE) -f $(MATTER_MAKEDIR)/light_port/lib_chip_light_main.mk clean
- @$(MAKE) -f $(MATTER_MAKEDIR)/light_port/lib_chip_light_core.mk clean
+ @$(MAKE) -f $(MATTER_MAKEDIR)/light_switch/lib_chip_switch_main.mk clean
  @$(MAKE) -f $(MATTER_MAKEDIR)/otar/lib_chip_otar_main.mk clean
- @$(MAKE) -f $(MATTER_MAKEDIR)/otar/lib_chip_otar_core.mk clean
  @$(MAKE) -f $(MATTER_MAKEDIR)/refrigerator/lib_chip_refrigerator_main.mk clean
- @$(MAKE) -f $(MATTER_MAKEDIR)/refrigerator/lib_chip_refrigerator_core.mk clean
- @$(MAKE) -f $(MATTER_MAKEDIR)/light_switch/lib_chip_switch_main.mk clean
- @$(MAKE) -f $(MATTER_MAKEDIR)/light_switch/lib_chip_switch_core.mk clean
  @$(MAKE) -f $(MATTER_MAKEDIR)/thermostat/lib_chip_thermostat_main.mk clean
- @$(MAKE) -f $(MATTER_MAKEDIR)/thermostat/lib_chip_thermostat_core.mk clean
+ @$(MAKE) -f $(MATTER_MAKEDIR)/all_clusters/lib_chip.mk clean
+ @$(MAKE) -f $(MATTER_MAKEDIR)/aircon/lib_chip_aircon_core.mk clean
+ @$(MAKE) -f $(MATTER_MAKEDIR)/air_purifier/lib_chip_air_purifier_core.mk clean
+ @$(MAKE) -f $(MATTER_MAKEDIR)/bridge_dm/lib_chip_bridge_core.mk clean
+ @$(MAKE) -f $(MATTER_MAKEDIR)/chef/lib_chip_chef_core.mk clean
+ @$(MAKE) -f $(MATTER_MAKEDIR)/dishwasher/lib_chip_dishwasher_core.mk clean
+ @$(MAKE) -f $(MATTER_MAKEDIR)/fan/lib_chip_fan_core.mk clean
+ @$(MAKE) -f $(MATTER_MAKEDIR)/laundrywasher/lib_chip_laundrywasher_core.mk clean
+ @$(MAKE) -f $(MATTER_MAKEDIR)/light/lib_chip_light_core.mk clean
+ @$(MAKE) -f $(MATTER_MAKEDIR)/light_dm/lib_chip_light_core.mk clean
+ @$(MAKE) -f $(MATTER_MAKEDIR)/light_port/lib_chip_light_core.mk clean
+ @$(MAKE) -f $(MATTER_MAKEDIR)/light_switch/lib_chip_switch_core.mk clean
+ @$(MAKE) -f $(MATTER_MAKEDIR)/otar/lib_chip_otar_core.mk clean
+ @$(MAKE) -f $(MATTER_MAKEDIR)/refrigerator/lib_chip_refrigerator_core.mk clean
+ @$(MAKE) -f $(MATTER_MAKEDIR)/thermostat/lib_chip_thermostat_core.mk clean
+ @$(MAKE) -f $(MATTER_MAKEDIR)/thermostat/lib_chip_thermostat_core.mk clean
diff --git a/...common/application/matter/project/amebaz2/make/air_purifier/lib_chip_air_purifier_core.mk b/...common/application/matter/project/amebaz2/make/air_purifier/lib_chip_air_purifier_core.mk
@@ -23,8 +23,6 @@ GDB = $(CROSS_COMPILE)gdb
 OBJCOPY = $(CROSS_COMPILE)objcopy
 OBJDUMP = $(CROSS_COMPILE)objdump
 
-OS := $(shell uname)
-
 # Initialize target name and target object files
 # -------------------------------------------------------------------
 
@@ -67,7 +65,7 @@ INCLUDES += -I$(SDKROOTDIR)/component/common/network/lwip/lwip_v2.1.2/port/realt
 INCLUDES += -I$(SDKROOTDIR)/component/common/network/lwip/lwip_v2.1.2/port/realtek/freertos
 INCLUDES += -I$(SDKROOTDIR)/component/common/network/ssl/mbedtls-2.28.1/include
 INCLUDES += -I$(SDKROOTDIR)/component/common/network/ssl/mbedtls-2.28.1/include/mbedtls
-#INCLUDES += -I$(SDKROOTDIR)/component/common/network/ssl/ssl_ram_map/rom
+INCLUDES += -I$(SDKROOTDIR)/component/common/network/ssl/ssl_ram_map/rom
 INCLUDES += -I$(SDKROOTDIR)/component/common/drivers/wlan/realtek/include
 INCLUDES += -I$(SDKROOTDIR)/component/common/drivers/wlan/realtek/src/osdep
 INCLUDES += -I$(SDKROOTDIR)/component/common/drivers/wlan/realtek/src/core/option
@@ -181,34 +179,10 @@ else
 CFLAGS += -DCONFIG_SYSTEM_TIME64=0
 endif
 
-# for matter blemgr adapter
-#CFLAGS += -DCONFIG_MATTER_BLEMGR_ADAPTER=1
-
 # CHIP options
 # -------------------------------------------------------------------
-CFLAGS += -DCHIP_PROJECT=1
-CFLAGS += -DCONFIG_MATTER=1
-CFLAGS += -DCONFIG_BT=1
-
-CFLAGS += -DCHIP_DEVICE_LAYER_TARGET=Ameba
-CFLAGS += -DMBEDTLS_CONFIG_FILE=\"mbedtls_config.h\"
-
-CFLAGS += -DLWIP_IPV6_ND=1
-CFLAGS += -DLWIP_IPV6_SCOPES=0
-CFLAGS += -DLWIP_PBUF_FROM_CUSTOM_POOLS=0
-CFLAGS += -DLWIP_IPV6_ROUTE_TABLE_SUPPORT=1
-
-CFLAGS += -DCHIP_DEVICE_LAYER_NONE=0
-CFLAGS += -DCHIP_SYSTEM_CONFIG_USE_ZEPHYR_NET_IF=0
-CFLAGS += -DCHIP_SYSTEM_CONFIG_USE_BSD_IFADDRS=0
-CFLAGS += -DCHIP_SYSTEM_CONFIG_USE_ZEPHYR_SOCKET_EXTENSIONS=0
-
-CFLAGS += -DCHIP_SYSTEM_CONFIG_USE_LWIP=1
-CFLAGS += -DCHIP_SYSTEM_CONFIG_USE_SOCKETS=0
-CFLAGS += -DCHIP_SYSTEM_CONFIG_USE_NETWORK_FRAMEWORK=0
-
-CFLAGS += -DCHIP_SHELL_MAX_TOKENS=11
-CFLAGS += -DCONFIG_ENABLE_AMEBA_FACTORY_DATA=0
+# common flags
+include matter_common_flags.mk
 
 CXXFLAGS += -DFD_SETSIZE=10
 

diff --git a/...common/application/matter/project/amebaz2/make/air_purifier/lib_chip_air_purifier_main.mk b/...common/application/matter/project/amebaz2/make/air_purifier/lib_chip_air_purifier_main.mk
@@ -9,8 +9,6 @@ CHIPDIR = $(SDKROOTDIR)/third_party/connectedhomeip
 OUTPUT_DIR = $(CHIPDIR)/examples/air-purifier-app/ameba/build/chip
 CODEGENDIR = $(OUTPUT_DIR)/codegen
 
-CHIP_ENABLE_OTA_REQUESTOR = $(shell grep 'chip_enable_ota_requestor' $(OUTPUT_DIR)/args.gn | cut -d' ' -f3)
-
 OS := $(shell uname)
 
 #CROSS_COMPILE = $(ARM_GCC_TOOLCHAIN)/arm-none-eabi-
@@ -26,8 +24,6 @@ GDB = $(CROSS_COMPILE)gdb
 OBJCOPY = $(CROSS_COMPILE)objcopy
 OBJDUMP = $(CROSS_COMPILE)objdump
 
-OS := $(shell uname)
-
 # Initialize target name and target object files
 # -------------------------------------------------------------------
 
@@ -39,6 +35,10 @@ OBJ_DIR=$(TARGET)/Debug/obj
 BIN_DIR=$(TARGET)/Debug/bin
 INFO_DIR=$(TARGET)/Debug/info
 
+# Build Definition
+# -------------------------------------------------------------------
+CHIP_ENABLE_OTA_REQUESTOR = $(shell grep 'chip_enable_ota_requestor' $(OUTPUT_DIR)/args.gn | cut -d' ' -f3)
+
 # Include folder list
 # -------------------------------------------------------------------
 
@@ -75,7 +75,7 @@ INCLUDES += -I$(SDKROOTDIR)/component/common/network/lwip/lwip_v2.1.2/port/realt
 INCLUDES += -I$(SDKROOTDIR)/component/common/network/lwip/lwip_v2.1.2/port/realtek/freertos
 INCLUDES += -I$(SDKROOTDIR)/component/common/network/ssl/mbedtls-2.28.1/include
 INCLUDES += -I$(SDKROOTDIR)/component/common/network/ssl/mbedtls-2.28.1/include/mbedtls
-#INCLUDES += -I$(SDKROOTDIR)/component/common/network/ssl/ssl_ram_map/rom
+INCLUDES += -I$(SDKROOTDIR)/component/common/network/ssl/ssl_ram_map/rom
 INCLUDES += -I$(SDKROOTDIR)/component/common/drivers/wlan/realtek/include
 INCLUDES += -I$(SDKROOTDIR)/component/common/drivers/wlan/realtek/src/osdep
 INCLUDES += -I$(SDKROOTDIR)/component/common/drivers/wlan/realtek/src/core/option
@@ -269,34 +269,15 @@ CFLAGS += -DV8M_STKOVF
 
 # CHIP options
 # -------------------------------------------------------------------
-CFLAGS += -DCHIP_PROJECT=1
-CFLAGS += -DCONFIG_MATTER=1
-CFLAGS += -DCONFIG_BT=1
+# common flags
+include matter_common_flags.mk
 
+# for matter ota
+ifeq ($(CHIP_ENABLE_OTA_REQUESTOR), true)
 CFLAGS += -DCONFIG_ENABLE_OTA_REQUESTOR=1
-CFLAGS += -DCONFIG_ENABLE_CHIP_SHELL=1
-CFLAGS += -DCONFIG_ENABLE_AMEBA_FACTORY_DATA=0
-CFLAGS += -DCONFIG_ENABLE_AMEBA_TEST_EVENT_TRIGGER=0
-CFLAGS += -DCHIP_DEVICE_LAYER_TARGET=Ameba
-CFLAGS += -DMBEDTLS_CONFIG_FILE=\"mbedtls_config.h\"
-CFLAGS += -DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=\"lib/address_resolve/AddressResolve_DefaultImpl.h\"
+endif
 
-CFLAGS += -DLWIP_IPV6_ND=1
-CFLAGS += -DLWIP_IPV6_SCOPES=0
-CFLAGS += -DLWIP_PBUF_FROM_CUSTOM_POOLS=0
-CFLAGS += -DLWIP_IPV6_ROUTE_TABLE_SUPPORT=1
-
-CFLAGS += -DCHIP_DEVICE_LAYER_NONE=0
-CFLAGS += -DCHIP_SYSTEM_CONFIG_USE_ZEPHYR_NET_IF=0
-CFLAGS += -DCHIP_SYSTEM_CONFIG_USE_BSD_IFADDRS=0
-CFLAGS += -DCHIP_SYSTEM_CONFIG_USE_ZEPHYR_SOCKET_EXTENSIONS=0
-
-CFLAGS += -DCHIP_SYSTEM_CONFIG_USE_LWIP=1
-CFLAGS += -DCHIP_SYSTEM_CONFIG_USE_SOCKETS=0
-CFLAGS += -DCHIP_SYSTEM_CONFIG_USE_NETWORK_FRAMEWORK=0
-CFLAGS += -DCHIP_SYSTEM_CONFIG_POSIX_LOCKING=0
-CFLAGS += -DINET_CONFIG_ENABLE_IPV4=0
-CFLAGS += -DCHIP_SHELL_MAX_TOKENS=11
+CFLAGS += -DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=\"lib/address_resolve/AddressResolve_DefaultImpl.h\"
 
 CFLAGS += -DUSE_ZAP_CONFIG
 CFLAGS += -DCHIP_HAVE_CONFIG_H

diff --git a/component/common/application/matter/project/amebaz2/make/aircon/lib_chip_aircon_core.mk b/component/common/application/matter/project/amebaz2/make/aircon/lib_chip_aircon_core.mk
@@ -69,7 +69,7 @@ INCLUDES += -I$(SDKROOTDIR)/component/common/network/lwip/lwip_v2.1.2/port/realt
 INCLUDES += -I$(SDKROOTDIR)/component/common/network/lwip/lwip_v2.1.2/port/realtek/freertos
 INCLUDES += -I$(SDKROOTDIR)/component/common/network/ssl/mbedtls-2.28.1/include
 INCLUDES += -I$(SDKROOTDIR)/component/common/network/ssl/mbedtls-2.28.1/include/mbedtls
-#INCLUDES += -I$(SDKROOTDIR)/component/common/network/ssl/ssl_ram_map/rom
+INCLUDES += -I$(SDKROOTDIR)/component/common/network/ssl/ssl_ram_map/rom
 INCLUDES += -I$(SDKROOTDIR)/component/common/drivers/wlan/realtek/include
 INCLUDES += -I$(SDKROOTDIR)/component/common/drivers/wlan/realtek/src/osdep
 INCLUDES += -I$(SDKROOTDIR)/component/common/drivers/wlan/realtek/src/core/option
@@ -183,32 +183,10 @@ else
 CFLAGS += -DCONFIG_SYSTEM_TIME64=0
 endif
 
-# for matter blemgr adapter
-#CFLAGS += -DCONFIG_MATTER_BLEMGR_ADAPTER=1
-
 # CHIP options
 # -------------------------------------------------------------------
-CFLAGS += -DCHIP_PROJECT=1
-CFLAGS += -DCONFIG_MATTER=1
-CFLAGS += -DCONFIG_BT=1
-
-CFLAGS += -DCONFIG_ENABLE_AMEBA_FACTORY_DATA=0
-CFLAGS += -DCHIP_DEVICE_LAYER_TARGET=Ameba
-CFLAGS += -DMBEDTLS_CONFIG_FILE=\"mbedtls_config.h\"
-
-CFLAGS += -DLWIP_IPV6_ND=1
-CFLAGS += -DLWIP_IPV6_SCOPES=0
-CFLAGS += -DLWIP_PBUF_FROM_CUSTOM_POOLS=0
-CFLAGS += -DLWIP_IPV6_ROUTE_TABLE_SUPPORT=1
-
-CFLAGS += -DCHIP_DEVICE_LAYER_NONE=0
-CFLAGS += -DCHIP_SYSTEM_CONFIG_USE_ZEPHYR_NET_IF=0
-CFLAGS += -DCHIP_SYSTEM_CONFIG_USE_BSD_IFADDRS=0
-CFLAGS += -DCHIP_SYSTEM_CONFIG_USE_ZEPHYR_SOCKET_EXTENSIONS=0
-
-CFLAGS += -DCHIP_SYSTEM_CONFIG_USE_LWIP=1
-CFLAGS += -DCHIP_SYSTEM_CONFIG_USE_SOCKETS=0
-CFLAGS += -DCHIP_SYSTEM_CONFIG_USE_NETWORK_FRAMEWORK=0
+# common flags
+include matter_common_flags.mk
 
 CXXFLAGS += -DFD_SETSIZE=10
 

diff --git a/component/common/application/matter/project/amebaz2/make/aircon/lib_chip_aircon_main.mk b/component/common/application/matter/project/amebaz2/make/aircon/lib_chip_aircon_main.mk
@@ -10,8 +10,6 @@ MATTER_MAKEDIR = $(BASEDIR)/make
 OUTPUT_DIR = $(MATTER_MAKEDIR)/aircon/build/chip
 CODEGENDIR = $(OUTPUT_DIR)/codegen
 
-CHIP_ENABLE_OTA_REQUESTOR = $(shell grep 'chip_enable_ota_requestor' $(OUTPUT_DIR)/args.gn | cut -d' ' -f3)
-
 OS := $(shell uname)
 
 #CROSS_COMPILE = $(ARM_GCC_TOOLCHAIN)/arm-none-eabi-
@@ -27,7 +25,9 @@ GDB = $(CROSS_COMPILE)gdb
 OBJCOPY = $(CROSS_COMPILE)objcopy
 OBJDUMP = $(CROSS_COMPILE)objdump
 
-OS := $(shell uname)
+# Build Definition
+# -------------------------------------------------------------------
+CHIP_ENABLE_OTA_REQUESTOR = $(shell grep 'chip_enable_ota_requestor' $(OUTPUT_DIR)/args.gn | cut -d' ' -f3)
 
 # Initialize target name and target object files
 # -------------------------------------------------------------------
@@ -76,7 +76,7 @@ INCLUDES += -I$(SDKROOTDIR)/component/common/network/lwip/lwip_v2.1.2/port/realt
 INCLUDES += -I$(SDKROOTDIR)/component/common/network/lwip/lwip_v2.1.2/port/realtek/freertos
 INCLUDES += -I$(SDKROOTDIR)/component/common/network/ssl/mbedtls-2.28.1/include
 INCLUDES += -I$(SDKROOTDIR)/component/common/network/ssl/mbedtls-2.28.1/include/mbedtls
-#INCLUDES += -I$(SDKROOTDIR)/component/common/network/ssl/ssl_ram_map/rom
+INCLUDES += -I$(SDKROOTDIR)/component/common/network/ssl/ssl_ram_map/rom
 INCLUDES += -I$(SDKROOTDIR)/component/common/drivers/wlan/realtek/include
 INCLUDES += -I$(SDKROOTDIR)/component/common/drivers/wlan/realtek/src/osdep
 INCLUDES += -I$(SDKROOTDIR)/component/common/drivers/wlan/realtek/src/core/option
@@ -267,31 +267,15 @@ CFLAGS += -DV8M_STKOVF
 
 # CHIP options
 # -------------------------------------------------------------------
-CFLAGS += -DCHIP_PROJECT=1
-CFLAGS += -DCONFIG_MATTER=1
-CFLAGS += -DCONFIG_BT=1
+# common flags
+include matter_common_flags.mk
 
+# for matter ota
+ifeq ($(CHIP_ENABLE_OTA_REQUESTOR), true)
 CFLAGS += -DCONFIG_ENABLE_OTA_REQUESTOR=1
-CFLAGS += -DCONFIG_ENABLE_AMEBA_FACTORY_DATA=0
-CFLAGS += -DCHIP_DEVICE_LAYER_TARGET=Ameba
-CFLAGS += -DMBEDTLS_CONFIG_FILE=\"mbedtls_config.h\"
-CFLAGS += -DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=\"lib/address_resolve/AddressResolve_DefaultImpl.h\"
+endif
 
-CFLAGS += -DLWIP_IPV6_ND=1
-CFLAGS += -DLWIP_IPV6_SCOPES=0
-CFLAGS += -DLWIP_PBUF_FROM_CUSTOM_POOLS=0
-CFLAGS += -DLWIP_IPV6_ROUTE_TABLE_SUPPORT=1
-
-CFLAGS += -DCHIP_DEVICE_LAYER_NONE=0
-CFLAGS += -DCHIP_SYSTEM_CONFIG_USE_ZEPHYR_NET_IF=0
-CFLAGS += -DCHIP_SYSTEM_CONFIG_USE_BSD_IFADDRS=0
-CFLAGS += -DCHIP_SYSTEM_CONFIG_USE_ZEPHYR_SOCKET_EXTENSIONS=0
-
-CFLAGS += -DCHIP_SYSTEM_CONFIG_USE_LWIP=1
-CFLAGS += -DCHIP_SYSTEM_CONFIG_USE_SOCKETS=0
-CFLAGS += -DCHIP_SYSTEM_CONFIG_USE_NETWORK_FRAMEWORK=0
-CFLAGS += -DCHIP_SYSTEM_CONFIG_POSIX_LOCKING=0
-CFLAGS += -DINET_CONFIG_ENABLE_IPV4=0
+CFLAGS += -DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=\"lib/address_resolve/AddressResolve_DefaultImpl.h\"
 
 CFLAGS += -DUSE_ZAP_CONFIG
 CFLAGS += -DCHIP_HAVE_CONFIG_H

diff --git a/component/common/application/matter/project/amebaz2/make/all_clusters/lib_chip.mk b/component/common/application/matter/project/amebaz2/make/all_clusters/lib_chip.mk
@@ -182,34 +182,13 @@ else
 CFLAGS += -DCONFIG_SYSTEM_TIME64=0
 endif
 
-# for matter blemgr adapter
-#CFLAGS += -DCONFIG_MATTER_BLEMGR_ADAPTER=1
-
 # CHIP options
 # -------------------------------------------------------------------
-CFLAGS += -DCHIP_PROJECT=1
-CFLAGS += -DCONFIG_MATTER=1
-CFLAGS += -DCONFIG_BT=1
-
-CFLAGS += -DCHIP_DEVICE_LAYER_TARGET=Ameba
-CFLAGS += -DMBEDTLS_CONFIG_FILE=\"mbedtls_config.h\"
-
-CFLAGS += -DLWIP_IPV6_ND=1
-CFLAGS += -DLWIP_IPV6_SCOPES=0
-CFLAGS += -DLWIP_PBUF_FROM_CUSTOM_POOLS=0
-CFLAGS += -DLWIP_IPV6_ROUTE_TABLE_SUPPORT=1
-
-CFLAGS += -DCHIP_DEVICE_LAYER_NONE=0
-CFLAGS += -DCHIP_SYSTEM_CONFIG_USE_ZEPHYR_NET_IF=0
-CFLAGS += -DCHIP_SYSTEM_CONFIG_USE_BSD_IFADDRS=0
-CFLAGS += -DCHIP_SYSTEM_CONFIG_USE_ZEPHYR_SOCKET_EXTENSIONS=0
-
-CFLAGS += -DCHIP_SYSTEM_CONFIG_USE_LWIP=1
-CFLAGS += -DCHIP_SYSTEM_CONFIG_USE_SOCKETS=0
-CFLAGS += -DCHIP_SYSTEM_CONFIG_USE_NETWORK_FRAMEWORK=0
+# common flags
+include matter_common_flags.mk
 
+# for matter shell
 CFLAGS += -DCHIP_SHELL_MAX_TOKENS=11
-CFLAGS += -DCONFIG_ENABLE_AMEBA_FACTORY_DATA=0
 
 CXXFLAGS += -DFD_SETSIZE=10
 

diff --git a/component/common/application/matter/project/amebaz2/make/all_clusters/lib_chip_main.mk b/component/common/application/matter/project/amebaz2/make/all_clusters/lib_chip_main.mk
@@ -39,6 +39,10 @@ OBJ_DIR=$(TARGET)/Debug/obj
 BIN_DIR=$(TARGET)/Debug/bin
 INFO_DIR=$(TARGET)/Debug/info
 
+# Build Definition
+# -------------------------------------------------------------------
+CHIP_ENABLE_OTA_REQUESTOR = $(shell grep 'chip_enable_ota_requestor' $(OUTPUT_DIR)/args.gn | cut -d' ' -f3)
+
 # Include folder list
 # -------------------------------------------------------------------
 
@@ -295,35 +299,20 @@ CFLAGS += -DV8M_STKOVF
 
 # CHIP options
 # -------------------------------------------------------------------
-CFLAGS += -DCHIP_PROJECT=1
-CFLAGS += -DCONFIG_MATTER=1
-CFLAGS += -DCONFIG_BT=1
+# common flags
+include matter_common_flags.mk
 
+# for matter ota
+ifeq ($(CHIP_ENABLE_OTA_REQUESTOR), true)
 CFLAGS += -DCONFIG_ENABLE_OTA_REQUESTOR=1
-CFLAGS += -DCONFIG_ENABLE_CHIP_SHELL=1
-CFLAGS += -DCONFIG_ENABLE_AMEBA_FACTORY_DATA=0
-CFLAGS += -DCONFIG_ENABLE_AMEBA_TEST_EVENT_TRIGGER=0
-CFLAGS += -DCHIP_DEVICE_LAYER_TARGET=Ameba
-CFLAGS += -DMBEDTLS_CONFIG_FILE=\"mbedtls_config.h\"
-CFLAGS += -DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=\"lib/address_resolve/AddressResolve_DefaultImpl.h\"
+endif
 
-CFLAGS += -DLWIP_IPV6_ND=1
-CFLAGS += -DLWIP_IPV6_SCOPES=0
-CFLAGS += -DLWIP_PBUF_FROM_CUSTOM_POOLS=0
-CFLAGS += -DLWIP_IPV6_ROUTE_TABLE_SUPPORT=1
-
-CFLAGS += -DCHIP_DEVICE_LAYER_NONE=0
-CFLAGS += -DCHIP_SYSTEM_CONFIG_USE_ZEPHYR_NET_IF=0
-CFLAGS += -DCHIP_SYSTEM_CONFIG_USE_BSD_IFADDRS=0
-CFLAGS += -DCHIP_SYSTEM_CONFIG_USE_ZEPHYR_SOCKET_EXTENSIONS=0
-
-CFLAGS += -DCHIP_SYSTEM_CONFIG_USE_LWIP=1
-CFLAGS += -DCHIP_SYSTEM_CONFIG_USE_SOCKETS=0
-CFLAGS += -DCHIP_SYSTEM_CONFIG_USE_NETWORK_FRAMEWORK=0
-CFLAGS += -DCHIP_SYSTEM_CONFIG_POSIX_LOCKING=0
-CFLAGS += -DINET_CONFIG_ENABLE_IPV4=0
+# for matter shell
+CFLAGS += -DCONFIG_ENABLE_CHIP_SHELL=1
 CFLAGS += -DCHIP_SHELL_MAX_TOKENS=11
 
+CFLAGS += -DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=\"lib/address_resolve/AddressResolve_DefaultImpl.h\"
+
 CFLAGS += -DUSE_ZAP_CONFIG
 CFLAGS += -DCHIP_HAVE_CONFIG_H