Skip to content

Commit c804648

Browse files
committed
add Kconfig option to control logging
Logs have a great impact on image size, so whether to print logs is modified as a compilation option and controlled by Kconfig Signed-off-by: zhanghongyu <[email protected]>
1 parent 429befe commit c804648

File tree

2 files changed

+95
-80
lines changed

2 files changed

+95
-80
lines changed

netutils/connectedhomeip/CMakeLists.txt

Lines changed: 85 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,16 @@ if(CONFIG_MATTER)
6565
endfunction()
6666

6767
get_filename_component(
68-
LOCAL_CHIP_ROOT ${NUTTX_APPS_DIR}/netutils/connectedhomeip/connectedhomeip
68+
CHIP_ROOT ${NUTTX_APPS_DIR}/netutils/connectedhomeip/connectedhomeip
6969
REALPATH)
70-
if(NOT CHIP_ROOT)
71-
set(CHIP_ROOT ${LOCAL_CHIP_ROOT})
72-
endif()
7370

7471
chip_download_and_patch(
7572
NAME
7673
chip
7774
URL
7875
https://github.com/project-chip/connectedhomeip/archive/refs/tags/v1.2.0.1.zip
7976
SOURCE_DIR
80-
${CHIP_ROOT}
77+
${CMAKE_CURRENT_LIST_DIR}/connectedhomeip
8178
BINARY_DIR
8279
${CMAKE_BINARY_DIR}/apps/netutils/connectedhomeip
8380
TIMEOUT
@@ -159,27 +156,29 @@ if(CONFIG_MATTER)
159156
list(APPEND nuttx_include_dirs ${include_dirs})
160157
endif()
161158
list(APPEND nuttx_include_dirs ${NUTTX_DIR}/include
162-
${CMAKE_BINARY_DIR}/include ${CMAKE_BINARY_DIR}/include_arch)
159+
${CMAKE_BINARY_DIR}/include)
163160
list(APPEND nuttx_include_dirs ${NUTTX_APPS_BINDIR}/include/mbedtls)
164161

165162
set(MATTER_INCDIR
166163
${nuttx_include_dirs}
167164
${CMAKE_BINARY_DIR}/apps/netutils/connectedhomeip/gen/include
165+
${NUTTX_APPS_DIR}/include
168166
${NUTTX_APPS_DIR}/netutils/jsoncpp/jsoncpp/include
169167
inipp
170168
nlio/include
171169
nlassert/include
172-
${CHIP_ROOT}/src
173-
${CHIP_ROOT}/src/include
174-
${CHIP_ROOT}/src/lib/dnssd
175-
${CHIP_ROOT}/src/app/util/mock/include
176-
${CHIP_ROOT}/zzz_generated
177-
${CHIP_ROOT}/zzz_generated/lighting-app
178-
${CHIP_ROOT}/zzz_generated/app-common
179-
${CHIP_ROOT}/src/platform/Linux
180-
${CHIP_ROOT}/examples/platform/linux
181-
${CHIP_ROOT}/examples/lighting-app/lighting-common/include)
182-
170+
connectedhomeip/src
171+
connectedhomeip/src/include
172+
connectedhomeip/src/lib/dnssd
173+
connectedhomeip/src/app/util/mock/include
174+
connectedhomeip/zzz_generated
175+
connectedhomeip/zzz_generated/lighting-app
176+
connectedhomeip/zzz_generated/app-common
177+
connectedhomeip/src/platform/Linux
178+
connectedhomeip/examples/platform/linux
179+
connectedhomeip/examples/lighting-app/lighting-common/include)
180+
181+
set(gn_depens mbedtls)
183182
set(MATTER_FLAGS
184183
-DCHIP_HAVE_CONFIG_H
185184
-std=${CONFIG_CXX_STANDARD}
@@ -241,9 +240,18 @@ if(CONFIG_MATTER)
241240
endif()
242241

243242
matter_add_gn_arg_bool("chip_inet_config_enable_ipv4" CONFIG_NET_IPv4)
243+
matter_add_gn_arg_bool("enable_eventlist_attribute" true)
244244
matter_add_gn_arg_bool("chip_enable_ble")
245245
matter_add_gn_arg_bool("chip_example_lighting" true)
246246
matter_add_gn_arg_bool("chip_config_network_layer_ble")
247+
if(NOT CONFIG_MATTER_LOG)
248+
matter_add_gn_arg_bool("chip_error_logging")
249+
matter_add_gn_arg_bool("chip_progress_logging")
250+
matter_add_gn_arg_bool("chip_detail_logging")
251+
matter_add_gn_arg_bool("chip_automation_logging")
252+
matter_add_gn_arg_bool("chip_pw_tokenizer_logging")
253+
matter_add_gn_arg_bool("chip_use_pw_logging")
254+
endif()
247255

248256
matter_get_compiler_flags_from_targets(nuttx)
249257
matter_common_gn_args(PROJECT_CONFIG_INC_DIR ${EXTERNAL_MATTER_INCDIR})
@@ -260,69 +268,66 @@ if(CONFIG_MATTER)
260268
${CONFIG_CHIP_BUILD_TESTS}
261269
LIB_MBEDTLS
262270
GN_DEPENDENCIES
263-
mbedtls)
264-
265-
if(${CHIP_ROOT} STREQUAL ${LOCAL_CHIP_ROOT})
266-
add_custom_command(
267-
OUTPUT connectedhomeip/third_party/pigweed/repo
268-
COMMAND rm ${CHIP_ROOT}/third_party/pigweed/repo -rf
269-
COMMAND ln -s ${NUTTX_APPS_DIR}/netutils/connectedhomeip/pigweed
270-
${CHIP_ROOT}/third_party/pigweed/repo)
271-
272-
add_custom_target(chippigweed ALL
273-
DEPENDS connectedhomeip/third_party/pigweed/repo)
274-
ExternalProject_Add_StepDependencies(chip-gn configure chippigweed)
275-
276-
add_custom_command(
277-
OUTPUT ${CHIP_ROOT}/build_overrides/pigweed_environment.gni
278-
COMMAND touch ${CHIP_ROOT}/build_overrides/pigweed_environment.gni)
279-
280-
add_custom_target(
281-
chipnpigweedenv ALL
282-
DEPENDS ${CHIP_ROOT}/build_overrides/pigweed_environment.gni)
283-
ExternalProject_Add_StepDependencies(chip-gn configure chipnpigweedenv)
284-
add_dependencies(chippigweed chipnpigweedenv)
285-
286-
add_custom_command(
287-
OUTPUT connectedhomeip/third_party/nlassert/repo
288-
COMMAND rm ${CHIP_ROOT}/third_party/nlassert/repo -rf
289-
COMMAND ln -s ${NUTTX_APPS_DIR}/netutils/connectedhomeip/nlassert
290-
${CHIP_ROOT}/third_party/nlassert/repo)
291-
292-
add_custom_target(chipnlassert ALL
293-
DEPENDS connectedhomeip/third_party/nlassert/repo)
294-
ExternalProject_Add_StepDependencies(chip-gn configure chipnlassert)
295-
296-
add_custom_command(
297-
OUTPUT connectedhomeip/third_party/nlio/repo
298-
COMMAND rm ${CHIP_ROOT}/third_party/nlio/repo -rf
299-
COMMAND ln -s ${NUTTX_APPS_DIR}/netutils/connectedhomeip/nlio
300-
${CHIP_ROOT}/third_party/nlio/repo)
301-
302-
add_custom_target(chipnlio ALL
303-
DEPENDS connectedhomeip/third_party/nlio/repo)
304-
ExternalProject_Add_StepDependencies(chip-gn configure chipnlio)
305-
306-
add_custom_command(
307-
OUTPUT connectedhomeip/third_party/nlunit-test/repo
308-
COMMAND rm ${CHIP_ROOT}/third_party/nlunit-test/repo -rf
309-
COMMAND ln -s ${NUTTX_APPS_DIR}/netutils/connectedhomeip/nlunit-test
310-
${CHIP_ROOT}/third_party/nlunit-test/repo)
311-
312-
add_custom_target(chipnlunit-test ALL
313-
DEPENDS connectedhomeip/third_party/nlunit-test/repo)
314-
ExternalProject_Add_StepDependencies(chip-gn configure chipnlunit-test)
315-
316-
add_custom_command(
317-
OUTPUT connectedhomeip/third_party/jsoncpp/repo
318-
COMMAND rm -rf ${CHIP_ROOT}/third_party/jsoncpp/repo
319-
COMMAND ln -s ${NUTTX_APPS_DIR}/netutils/jsoncpp/jsoncpp
320-
${CHIP_ROOT}/third_party/jsoncpp/repo)
321-
322-
add_custom_target(chipjsoncpp ALL
323-
DEPENDS connectedhomeip/third_party/jsoncpp/repo)
324-
ExternalProject_Add_StepDependencies(chip-gn configure chipjsoncpp)
325-
endif()
271+
${gn_depens})
272+
273+
add_custom_command(
274+
OUTPUT connectedhomeip/third_party/pigweed/repo
275+
COMMAND rm ${CHIP_ROOT}/third_party/pigweed/repo -rf
276+
COMMAND ln -s ${NUTTX_APPS_DIR}/netutils/connectedhomeip/pigweed
277+
${CHIP_ROOT}/third_party/pigweed/repo)
278+
279+
add_custom_target(chippigweed ALL
280+
DEPENDS connectedhomeip/third_party/pigweed/repo)
281+
ExternalProject_Add_StepDependencies(chip-gn configure chippigweed)
282+
283+
add_custom_command(
284+
OUTPUT ${CHIP_ROOT}/build_overrides/pigweed_environment.gni
285+
COMMAND touch ${CHIP_ROOT}/build_overrides/pigweed_environment.gni)
286+
287+
add_custom_target(
288+
chipnpigweedenv ALL
289+
DEPENDS ${CHIP_ROOT}/build_overrides/pigweed_environment.gni)
290+
ExternalProject_Add_StepDependencies(chip-gn configure chipnpigweedenv)
291+
add_dependencies(chippigweed chipnpigweedenv)
292+
293+
add_custom_command(
294+
OUTPUT connectedhomeip/third_party/nlassert/repo
295+
COMMAND rm ${CHIP_ROOT}/third_party/nlassert/repo -rf
296+
COMMAND ln -s ${NUTTX_APPS_DIR}/netutils/connectedhomeip/nlassert
297+
${CHIP_ROOT}/third_party/nlassert/repo)
298+
299+
add_custom_target(chipnlassert ALL
300+
DEPENDS connectedhomeip/third_party/nlassert/repo)
301+
ExternalProject_Add_StepDependencies(chip-gn configure chipnlassert)
302+
303+
add_custom_command(
304+
OUTPUT connectedhomeip/third_party/nlio/repo
305+
COMMAND rm ${CHIP_ROOT}/third_party/nlio/repo -rf
306+
COMMAND ln -s ${NUTTX_APPS_DIR}/netutils/connectedhomeip/nlio
307+
${CHIP_ROOT}/third_party/nlio/repo)
308+
309+
add_custom_target(chipnlio ALL DEPENDS connectedhomeip/third_party/nlio/repo)
310+
ExternalProject_Add_StepDependencies(chip-gn configure chipnlio)
311+
312+
add_custom_command(
313+
OUTPUT connectedhomeip/third_party/nlunit-test/repo
314+
COMMAND rm ${CHIP_ROOT}/third_party/nlunit-test/repo -rf
315+
COMMAND ln -s ${NUTTX_APPS_DIR}/netutils/connectedhomeip/nlunit-test
316+
${CHIP_ROOT}/third_party/nlunit-test/repo)
317+
318+
add_custom_target(chipnlunit-test ALL
319+
DEPENDS connectedhomeip/third_party/nlunit-test/repo)
320+
ExternalProject_Add_StepDependencies(chip-gn configure chipnlunit-test)
321+
322+
add_custom_command(
323+
OUTPUT connectedhomeip/third_party/jsoncpp/repo
324+
COMMAND rm -rf ${CHIP_ROOT}/third_party/jsoncpp/repo
325+
COMMAND ln -s ${NUTTX_APPS_DIR}/netutils/jsoncpp/jsoncpp
326+
${CHIP_ROOT}/third_party/jsoncpp/repo)
327+
328+
add_custom_target(chipjsoncpp ALL
329+
DEPENDS connectedhomeip/third_party/jsoncpp/repo)
330+
ExternalProject_Add_StepDependencies(chip-gn configure chipjsoncpp)
326331

327332
set(DEMOSRC
328333
${CHIP_ROOT}/examples/lighting-app/linux/main.cpp

netutils/connectedhomeip/Kconfig

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,13 @@ config MATTER
88
default n
99
---help---
1010
Enable the Connected Home over IP (CHIP)
11+
12+
if MATTER
13+
14+
config MATTER_LOG
15+
bool "Build matter with logs"
16+
default n
17+
---help---
18+
To reduce flash size, logs are not opened by default
19+
20+
endif

0 commit comments

Comments
 (0)