[sdk] matter restructure part 2

* add matter_common_flags.mk for better maintenance of common matter config
* remove DM zap configuration and add copy_gen_files_light_dm to replace files

component/common/application/matter/project/amebaz2/Makefile

@@ -3,9 +3,9 @@ all: all_clusters
 OS := $(shell uname)
 LBITS := $(shell getconf LONG_BIT)
 
-BASEDIR  := $(shell pwd)
-SDKROOTDIR  := $(BASEDIR)/../../../../../..
-CHIPDIR  = $(SDKROOTDIR)/third_party/connectedhomeip
+BASEDIR := $(shell pwd)
+SDKROOTDIR := $(BASEDIR)/../../../../../..
+CHIPDIR = $(SDKROOTDIR)/third_party/connectedhomeip
 MATTER_MAKEDIR = $(BASEDIR)/make
 MATTER_TOOLDIR = $(SDKROOTDIR)/tools/matter
 MATTER_EXAMPLEDIR = $(SDKROOTDIR)/component/common/application/matter/example
@@ -36,14 +36,29 @@ ALL_CLUSTERS_FILE = $(CHIPDIR)/examples/all-clusters-app/ameba/build/chip/codege
 ALL_CLUSTERS_ZAP = $(CHIPDIR)/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
 AIR_PURIFIER_FILE = $(CHIPDIR)/examples/air-purifier-app/ameba/build/chip/codegen/cluster-file.txt
 AIR_PURIFIER_ZAP = $(CHIPDIR)/examples/air-purifier-app/air-purifier-common/air-purifier-app.zap
-CHEF_FILE  = $(CHIPDIR)/examples/chef/ameba/build/chip/codegen/cluster-file.txt
-CHEF_ZAP  = $(CHIPDIR)/examples/chef/devices/$(SAMPLE_NAME).zap
+CHEF_FILE = $(CHIPDIR)/examples/chef/ameba/build/chip/codegen/cluster-file.txt
+CHEF_ZAP = $(CHIPDIR)/examples/chef/devices/$(SAMPLE_NAME).zap
 LIGHTING_FILE = $(CHIPDIR)/examples/lighting-app/ameba/build/chip/codegen/cluster-file.txt
 LIGHTING_ZAP = $(CHIPDIR)/examples/lighting-app/lighting-common/lighting-app.zap
 LIGHT_SWITCH_FILE = $(CHIPDIR)/examples/light-switch-app/ameba/build/chip/codegen/cluster-file.txt
 LIGHT_SWITCH_ZAP = $(CHIPDIR)/examples/light-switch-app/light-switch-common/light-switch-app.zap
-OTAR_FILE = $(CHIPDIR)/examples/ota-requestor-app/ameba/build/chip/codegen/cluster-file.txt
-OTAR_ZAP = $(CHIPDIR)/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap
+OTAR_FILE = $(CHIPDIR)/examples/ota-requestor-app/ameba/build/chip/codegen/cluster-file.txt
+OTAR_ZAP = $(CHIPDIR)/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap
+
+AIRCON_FILE = $(MATTER_MAKEDIR)/aircon/build/chip/codegen/cluster-file.txt
+AIRCON_ZAP = $(MATTER_EXAMPLEDIR)/aircon/aircon-app.zap
+BRIDGE_DM_FILE = $(MATTER_MAKEDIR)/bridge_dm/build/chip/codegen/cluster-file.txt
+BRIDGE_DM_ZAP = $(MATTER_EXAMPLEDIR)/bridge_dm/bridge-app.zap
+DISHWASHER_FILE = $(MATTER_MAKEDIR)/dishwasher/build/chip/codegen/cluster-file.txt
+DISHWASHER_ZAP = $(MATTER_EXAMPLEDIR)/dishwasher/dishwasher-app.zap
+FAN_FILE = $(MATTER_MAKEDIR)/fan/build/chip/codegen/cluster-file.txt
+FAN_ZAP = $(MATTER_EXAMPLEDIR)/fan/fan-app.zap
+LAUNDRYWASHER_FILE = $(MATTER_MAKEDIR)/laundrywasher/build/chip/codegen/cluster-file.txt
+LAUNDRYWASHER_ZAP = $(MATTER_EXAMPLEDIR)/laundrywasher/laundrywasher-app.zap
+REFRIGERATOR_FILE = $(MATTER_MAKEDIR)/refrigerator/build/chip/codegen/cluster-file.txt
+REFRIGERATOR_ZAP = $(MATTER_EXAMPLEDIR)/refrigerator/refrigerator-app.zap
+THERMOSTAT_FILE = $(CHIPDIR)/examples/thermostat/ameba/build/chip/codegen/cluster-file.txt
+THERMOSTAT_ZAP = $(CHIPDIR)/examples/thermostat/thermostat-common/thermostat.zap
 
 #*****************************************************************************#
 # RULES TO MAKE MATTER DIRS #
@@ -97,31 +112,6 @@ $(OTAR_FILE): $(OTAR_ZAP)
  @python3 $(CHIPDIR)/src/app/zap_cluster_list.py --zap_file $^ > $(CHIPDIR)/examples/ota-requestor-app/ameba/build/chip/codegen/cluster-file.txt
  @python3 $(MATTER_TOOLDIR)/codegen_helpers/parse_clusters.py --cluster_file $@ --chip_path $(CHIPDIR)
 
-#*****************************************************************************#
-# MATTER Porting Layer ZAP files #
-#*****************************************************************************#
-AIRCON_FILE = $(MATTER_MAKEDIR)/aircon/build/chip/codegen/cluster-file.txt
-AIRCON_ZAP = $(MATTER_EXAMPLEDIR)/aircon/aircon-app.zap
-BRIDGE_DM_FILE = $(MATTER_MAKEDIR)/bridge_dm/build/chip/codegen/cluster-file.txt
-BRIDGE_DM_ZAP = $(MATTER_EXAMPLEDIR)/bridge_dm/bridge-app.zap
-DISHWASHER_FILE = $(MATTER_MAKEDIR)/dishwasher/build/chip/codegen/cluster-file.txt
-DISHWASHER_ZAP = $(MATTER_EXAMPLEDIR)/dishwasher/dishwasher-app.zap
-FAN_FILE = $(MATTER_MAKEDIR)/fan/build/chip/codegen/cluster-file.txt
-FAN_ZAP = $(MATTER_EXAMPLEDIR)/fan/fan-app.zap
-LAUNDRYWASHER_FILE = $(MATTER_MAKEDIR)/laundrywasher/build/chip/codegen/cluster-file.txt
-LAUNDRYWASHER_ZAP = $(MATTER_EXAMPLEDIR)/laundrywasher/laundrywasher-app.zap
-REFRIGERATOR_FILE = $(MATTER_MAKEDIR)/refrigerator/build/chip/codegen/cluster-file.txt
-REFRIGERATOR_ZAP = $(MATTER_EXAMPLEDIR)/refrigerator/refrigerator-app.zap
-LIGHTING_FILE = $(CHIPDIR)/examples/lighting-app/ameba/build/chip/codegen/cluster-file.txt
-LIGHTING_ZAP = $(CHIPDIR)/examples/lighting-app/lighting-common/lighting-app.zap
-LIGHTING_DM_FILE = $(CHIPDIR)/examples/lighting-app/ameba/build/chip/codegen/cluster-file.txt
-LIGHTING_DM_ZAP = $(CHIPDIR)/examples/lighting-app/lighting-common/lighting-app.zap
-THERMOSTAT_FILE = $(CHIPDIR)/examples/thermostat/ameba/build/chip/codegen/cluster-file.txt
-THERMOSTAT_ZAP = $(CHIPDIR)/examples/thermostat/thermostat-common/thermostat.zap
-#*****************************************************************************#
-# RULES TO MAKE MATTER DIRS FOR PORTING LAYER #
-#*****************************************************************************#
-
 $(AIRCON_FILE): $(AIRCON_ZAP)
  @mkdir -p $(MATTER_MAKEDIR)/aircon/build/chip/codegen/zap-generated
  @python3 $(CHIPDIR)/scripts/tools/zap/generate.py --no-prettify-output --templates src/app/zap-templates/matter-idl-server.json -z $(CHIPDIR)/src/app/zap-templates/zcl/zcl.json --output-dir $(MATTER_MAKEDIR)/aircon/build/chip/codegen/zap-generated $^
@@ -164,24 +154,6 @@ $(LAUNDRYWASHER_FILE): $(LAUNDRYWASHER_ZAP)
  @python3 $(CHIPDIR)/src/app/zap_cluster_list.py --zap_file $^ > $@
  @python3 $(MATTER_TOOLDIR)/codegen_helpers/parse_clusters.py --cluster_file $@ --chip_path $(CHIPDIR)
 
-$(LIGHTING_FILE): $(LIGHTING_ZAP)
- @mkdir -p $(CHIPDIR)/examples/lighting-app/ameba/build/chip/codegen/zap-generated
- @python3 $(CHIPDIR)/scripts/tools/zap/generate.py --no-prettify-output --templates src/app/zap-templates/matter-idl-server.json --output-dir examples/lighting-app/ameba/build/chip/codegen/zap-generated $^
- @python3 $(CHIPDIR)/scripts/tools/zap/generate.py --no-prettify-output --templates src/app/zap-templates/app-templates.json --output-dir examples/lighting-app/ameba/build/chip/codegen/zap-generated $^
- @python3 $(CHIPDIR)/scripts/codegen.py --generator cpp-app --output-dir $(CHIPDIR)/examples/lighting-app/ameba/build/chip/codegen --expected-outputs $(MATTER_TOOLDIR)/codegen_helpers/expected.outputs $(CHIPDIR)/examples/lighting-app/lighting-common/lighting-app.matter
- @python3 $(CHIPDIR)/src/app/zap_cluster_list.py --zap_file $^ > $(CHIPDIR)/examples/lighting-app/ameba/build/chip/codegen/cluster-file.txt
- @python3 $(MATTER_TOOLDIR)/codegen_helpers/parse_clusters.py --cluster_file $@ --chip_path $(CHIPDIR)
-
-$(LIGHTING_DM_FILE): $(LIGHTING_DM_ZAP)
- @mkdir -p $(CHIPDIR)/examples/lighting-app/ameba/build/chip/codegen/zap-generated
- @python3 $(CHIPDIR)/scripts/tools/zap/generate.py --no-prettify-output --templates src/app/zap-templates/matter-idl-server.json --output-dir examples/lighting-app/ameba/build/chip/codegen/zap-generated $^
- @python3 $(CHIPDIR)/scripts/tools/zap/generate.py --no-prettify-output --templates src/app/zap-templates/app-templates.json --output-dir examples/lighting-app/ameba/build/chip/codegen/zap-generated $^
- @python3 $(CHIPDIR)/scripts/codegen.py --generator cpp-app --output-dir $(CHIPDIR)/examples/lighting-app/ameba/build/chip/codegen --expected-outputs $(MATTER_TOOLDIR)/codegen_helpers/expected.outputs $(CHIPDIR)/examples/lighting-app/lighting-common/lighting-app.matter
- @python3 $(CHIPDIR)/src/app/zap_cluster_list.py --zap_file $^ > $(CHIPDIR)/examples/lighting-app/ameba/build/chip/codegen/cluster-file.txt
- @python3 $(MATTER_TOOLDIR)/codegen_helpers/parse_clusters.py --cluster_file $@ --chip_path $(CHIPDIR)
- @cp $(MATTER_EXAMPLEDIR)/light_dm/endpoint_config.h $(CHIPDIR)/examples/lighting-app/ameba/build/chip/codegen/zap-generated
- @cp $(MATTER_EXAMPLEDIR)/light_dm/gen_config.h $(CHIPDIR)/examples/lighting-app/ameba/build/chip/codegen/zap-generated
-
 $(REFRIGERATOR_FILE): $(REFRIGERATOR_ZAP)
  @mkdir -p $(MATTER_MAKEDIR)/refrigerator/build/chip/codegen/zap-generated
  @python3 $(CHIPDIR)/scripts/tools/zap/generate.py --no-prettify-output --templates src/app/zap-templates/matter-idl-server.json -z $(CHIPDIR)/src/app/zap-templates/zcl/zcl.json --output-dir $(MATTER_MAKEDIR)/refrigerator/build/chip/codegen/zap-generated $^
@@ -198,6 +170,10 @@ $(THERMOSTAT_FILE): $(THERMOSTAT_ZAP)
  @python3 $(CHIPDIR)/src/app/zap_cluster_list.py --zap_file $^ > $(CHIPDIR)/examples/thermostat/ameba/build/chip/codegen/cluster-file.txt
  @python3 $(MATTER_TOOLDIR)/codegen_helpers/parse_clusters.py --cluster_file $@ --chip_path $(CHIPDIR)
 
+copy_gen_files_light_dm:
+ @cp $(MATTER_EXAMPLEDIR)/light_dm/endpoint_config.h $(CHIPDIR)/examples/lighting-app/ameba/build/chip/codegen/zap-generated
+ @cp $(MATTER_EXAMPLEDIR)/light_dm/gen_config.h $(CHIPDIR)/examples/lighting-app/ameba/build/chip/codegen/zap-generated
+
 #*****************************************************************************#
 # MATTER MAKE DEFINES #
 #*****************************************************************************#
@@ -242,7 +218,7 @@ light: toolchain $(LIGHTING_FILE)
  $(MAKE) -f $(MATTER_MAKEDIR)/light/lib_chip_light_main.mk all
 
 .PHONY: light_dm
-light_dm: toolchain $(LIGHTING_DM_FILE)
+light_dm: toolchain $(LIGHTING_FILE) copy_gen_files_light_dm
  $(MAKE) -f $(MATTER_MAKEDIR)/light_dm/lib_chip_light_core.mk all
  $(MAKE) -f $(MATTER_MAKEDIR)/light_dm/lib_chip_light_main.mk all
 
@@ -279,32 +255,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

component/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
 

component/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