Skip to content

Commit 5dd08e8

Browse files
wy-hhwy-hh
authored
[Bouffalolab] Enable -Wundef and fix compile error (project-chip#29756)
* fix build error on bl602 for undef enabled * build pass if undef enabled for bl702 and bl702l * correct factory data return and update pt table number * fix cflags operation * Fix restyle * Remove CONFIG_ENABLE_CHIP_SHELL from CHIPDevicePlatformConfig.h
1 parent 5ef4681 commit 5dd08e8

File tree

27 files changed

+315
-358
lines changed

27 files changed

+315
-358
lines changed

‎examples/lighting-app/bouffalolab/bl602/BUILD.gn

+12-19
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ bl_iot_sdk("sdk") {
7979
"CHIP_SYSTEM_CRYPTO_HEADER_RESERVE_SIZE=48",
8080
]
8181

82+
defines += [ "PW_RPC_ENABLED=${chip_enable_pw_rpc}" ]
8283
if (chip_enable_pw_rpc) {
8384
include_dirs += [ "${examples_plat_dir}/common/rpc" ]
84-
defines += [ "PW_RPC_ENABLED=1" ]
8585
defines += [ "DISABLE_PRINT=1" ]
8686
} else if (chip_build_libshell) {
8787
include_dirs += [ "${examples_plat_dir}/common/plat" ]
@@ -101,26 +101,20 @@ bouffalolab_executable("lighting_app") {
101101
defines = [
102102
"APP_TASK_STACK_SIZE=2044",
103103
"CHIP_UART_BAUDRATE=${baudrate}",
104-
"BL602_ENABLE=1",
105104
"START_ENTRY=bfl_main",
106105
"SYS_AOS_LOOP_ENABLE",
107106
]
108107

109-
if (enable_debug_frame_ptr) {
110-
defines += [ "CONF_ENABLE_FRAME_PTR=1" ]
111-
}
112-
113108
if (false == enable_reset_counter) {
114109
defines += [ "BOOT_PIN_RESET=8" ]
115110
}
116111

117-
if (chip_enable_factory_data) {
118-
defines += [ "CONFIG_BOUFFALOLAB_FACTORY_DATA_ENABLE=1" ]
119-
}
120-
121-
if (chip_enable_factory_data_test) {
122-
defines += [ "CONFIG_BOUFFALOLAB_FACTORY_DATA_TEST=1" ]
123-
}
112+
defines += [ "CONF_ENABLE_FRAME_PTR=${enable_debug_frame_ptr}" ]
113+
defines +=
114+
[ "CONFIG_BOUFFALOLAB_FACTORY_DATA_ENABLE=${chip_enable_factory_data}" ]
115+
defines += [
116+
"CONFIG_BOUFFALOLAB_FACTORY_DATA_TEST=${chip_enable_factory_data_test}",
117+
]
124118

125119
bl_plat_name = "bl602"
126120
sources = [
@@ -140,8 +134,8 @@ bouffalolab_executable("lighting_app") {
140134
"${example_dir}/common/ZclCallbacks.cpp",
141135
"${examples_plat_dir}/common/iot_sdk/aos_task.c",
142136
"${examples_plat_dir}/common/iot_sdk/demo_pwm.c",
143-
"${examples_plat_dir}/common/iot_sdk/platform_port.c",
144-
"${examples_plat_dir}/common/iot_sdk/uart.c",
137+
"${examples_plat_dir}/common/iot_sdk/platform_port.cpp",
138+
"${examples_plat_dir}/common/iot_sdk/uart.cpp",
145139
"${examples_plat_dir}/common/plat/LEDWidget.cpp",
146140
"${examples_plat_dir}/common/plat/OTAConfig.cpp",
147141
"${examples_plat_dir}/common/plat/main.cpp",
@@ -167,9 +161,10 @@ bouffalolab_executable("lighting_app") {
167161
"${examples_plat_dir}/common/iot_sdk",
168162
]
169163

164+
defines += [ "CONFIG_ENABLE_CHIP_SHELL=${chip_build_libshell}" ]
165+
defines += [ "PW_RPC_ENABLED=${chip_enable_pw_rpc}" ]
170166
if (chip_enable_pw_rpc) {
171167
defines += [
172-
"PW_RPC_ENABLED",
173168
"PW_RPC_ATTRIBUTE_SERVICE=1",
174169
"PW_RPC_BUTTON_SERVICE=1",
175170
"PW_RPC_DESCRIPTOR_SERVICE=1",
@@ -216,8 +211,6 @@ bouffalolab_executable("lighting_app") {
216211
"${chip_root}/examples/common/pigweed/bouffalolab",
217212
]
218213
} else if (chip_build_libshell) {
219-
defines += [ "CONFIG_ENABLE_CHIP_SHELL=1" ]
220-
221214
deps += [ "${chip_root}/examples/shell/shell_common:shell_common" ]
222215

223216
include_dirs += [
@@ -226,9 +219,9 @@ bouffalolab_executable("lighting_app") {
226219
]
227220
}
228221

222+
defines += [ "HEAP_MONITORING=${enable_heap_monitoring}" ]
229223
if (enable_heap_monitoring) {
230224
sources += [ "${examples_plat_dir}/common/plat/MemMonitoring.cpp" ]
231-
defines += [ "HEAP_MONITORING=1" ]
232225
}
233226

234227
cflags_c = [ "-Wno-sign-compare" ]

‎examples/lighting-app/bouffalolab/bl702/BUILD.gn

+26-34
Original file line numberDiff line numberDiff line change
@@ -82,20 +82,21 @@ bl_iot_sdk("sdk") {
8282
"PRINT_DEBUG=0",
8383
]
8484

85+
defines += [ "PW_RPC_ENABLED=${chip_enable_pw_rpc}" ]
8586
if (chip_enable_pw_rpc) {
8687
include_dirs += [ "${examples_plat_dir}/common/rpc" ]
87-
defines += [ "PW_RPC_ENABLED=1" ]
8888
defines += [ "DISABLE_PRINT=1" ]
89-
} else if (chip_build_libshell) {
90-
include_dirs += [ "${examples_plat_dir}/common/plat" ]
89+
} else {
90+
if (chip_build_libshell) {
91+
include_dirs += [ "${examples_plat_dir}/common/plat" ]
92+
}
9193
}
9294

93-
defines += [ "CHIP_DEVICE_CONFIG_ENABLE_ETHERNET=${chip_enable_ethernet}" ]
94-
9595
if (chip_enable_wifi || chip_enable_ethernet) {
9696
include_dirs += [ "${examples_plat_dir}/bl702/lwipopts" ]
9797
}
9898

99+
defines += [ "CHIP_DEVICE_CONFIG_ENABLE_ETHERNET=${chip_enable_ethernet}" ]
99100
if (chip_enable_ethernet) {
100101
defines += [ "CHIP_SYSTEM_CRYPTO_HEADER_RESERVE_SIZE=48" ]
101102
}
@@ -133,14 +134,15 @@ bouffalolab_executable("lighting_app") {
133134
defines = [
134135
"APP_TASK_STACK_SIZE=2048",
135136
"CHIP_UART_BAUDRATE=${baudrate}",
136-
"BL702_ENABLE=1",
137137
"START_ENTRY=bl702_main",
138138
]
139139

140-
if (enable_debug_frame_ptr) {
141-
defines += [ "CONF_ENABLE_FRAME_PTR=1" ]
142-
}
143-
140+
defines += [ "CONF_ENABLE_FRAME_PTR=${enable_debug_frame_ptr}" ]
141+
defines +=
142+
[ "CONFIG_BOUFFALOLAB_FACTORY_DATA_ENABLE=${chip_enable_factory_data}" ]
143+
defines += [
144+
"CONFIG_BOUFFALOLAB_FACTORY_DATA_TEST=${chip_enable_factory_data_test}",
145+
]
144146
if (chip_config_network_layer_ble) {
145147
defines += [ "CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE=1" ]
146148
}
@@ -149,14 +151,6 @@ bouffalolab_executable("lighting_app") {
149151
defines += [ "BOOT_PIN_RESET=31" ]
150152
}
151153

152-
if (chip_enable_factory_data) {
153-
defines += [ "CONFIG_BOUFFALOLAB_FACTORY_DATA_ENABLE=1" ]
154-
}
155-
156-
if (chip_enable_factory_data_test) {
157-
defines += [ "CONFIG_BOUFFALOLAB_FACTORY_DATA_TEST=1" ]
158-
}
159-
160154
if ("XT-ZB6-DevKit" == board) {
161155
defines += [ "XT_ZB6_DevKit" ]
162156
} else if ("BL706-NIGHT-LIGHT" == board) {
@@ -168,8 +162,8 @@ bouffalolab_executable("lighting_app") {
168162
"${example_dir}/common/ZclCallbacks.cpp",
169163
"${examples_plat_dir}/common/iot_sdk/aos_task.c",
170164
"${examples_plat_dir}/common/iot_sdk/demo_pwm.c",
171-
"${examples_plat_dir}/common/iot_sdk/platform_port.c",
172-
"${examples_plat_dir}/common/iot_sdk/uart.c",
165+
"${examples_plat_dir}/common/iot_sdk/platform_port.cpp",
166+
"${examples_plat_dir}/common/iot_sdk/uart.cpp",
173167
"${examples_plat_dir}/common/plat/LEDWidget.cpp",
174168
"${examples_plat_dir}/common/plat/OTAConfig.cpp",
175169
"${examples_plat_dir}/common/plat/main.cpp",
@@ -196,10 +190,6 @@ bouffalolab_executable("lighting_app") {
196190
include_dirs += [ "${examples_plat_dir}/bl702/lwipopts" ]
197191
}
198192

199-
if (enable_psram) {
200-
defines += [ "CFG_USE_PSRAM=1" ]
201-
}
202-
203193
if (defined(enable_cdc_module) && enable_cdc_module) {
204194
defines += [ "CFG_USB_CDC_ENABLE" ]
205195
}
@@ -238,9 +228,10 @@ bouffalolab_executable("lighting_app") {
238228
}
239229
}
240230

231+
defines += [ "CONFIG_ENABLE_CHIP_SHELL=${chip_build_libshell}" ]
232+
defines += [ "PW_RPC_ENABLED=${chip_enable_pw_rpc}" ]
241233
if (chip_enable_pw_rpc) {
242234
defines += [
243-
"PW_RPC_ENABLED=1",
244235
"PW_RPC_ATTRIBUTE_SERVICE=1",
245236
"PW_RPC_BUTTON_SERVICE=1",
246237
"PW_RPC_DESCRIPTOR_SERVICE=1",
@@ -289,23 +280,24 @@ bouffalolab_executable("lighting_app") {
289280
"${chip_root}/examples/common",
290281
"${chip_root}/examples/common/pigweed/bouffalolab",
291282
]
292-
} else if (chip_build_libshell) {
293-
defines += [ "CONFIG_ENABLE_CHIP_SHELL=${chip_build_libshell}" ]
294-
295-
include_dirs += [
296-
"${chip_root}/src/lib/shell",
297-
"${chip_root}/examples/shell/shell_common/include",
298-
]
283+
} else {
284+
if (chip_build_libshell) {
285+
include_dirs += [
286+
"${chip_root}/src/lib/shell",
287+
"${chip_root}/examples/shell/shell_common/include",
288+
]
299289

300-
deps += [ "${chip_root}/examples/shell/shell_common:shell_common" ]
290+
deps += [ "${chip_root}/examples/shell/shell_common:shell_common" ]
291+
}
301292
}
302293

294+
defines += [ "HEAP_MONITORING=${enable_heap_monitoring}" ]
303295
if (enable_heap_monitoring) {
304296
sources += [ "${examples_plat_dir}/common/plat/MemMonitoring.cpp" ]
305-
defines += [ "HEAP_MONITORING=1" ]
306297
}
307298

308299
if (enable_psram) {
300+
defines += [ "CFG_USE_PSRAM=1" ]
309301
ldscript = "${examples_plat_dir}/bl702/ldscripts/psram_flash.ld"
310302
} else {
311303
ldscript = "${examples_plat_dir}/bl702/ldscripts/flash.ld"

‎examples/lighting-app/bouffalolab/bl702l/BUILD.gn

+21-30
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ bl_iot_sdk("sdk") {
8080
"PRINT_DEBUG=0",
8181
]
8282

83+
defines += [ "PW_RPC_ENABLED=${chip_enable_pw_rpc}" ]
8384
if (chip_enable_pw_rpc) {
8485
include_dirs += [ "${examples_plat_dir}/common/rpc" ]
85-
defines += [ "PW_RPC_ENABLED=1" ]
8686
defines += [ "DISABLE_PRINT=1" ]
8787
} else if (chip_build_libshell) {
8888
include_dirs += [ "${examples_plat_dir}/common/plat" ]
@@ -111,14 +111,15 @@ bouffalolab_executable("lighting_app") {
111111
defines = [
112112
"APP_TASK_STACK_SIZE=2048",
113113
"CHIP_UART_BAUDRATE=${baudrate}",
114-
"BL702L_ENABLE=1",
115114
"START_ENTRY=bl702_main",
116115
]
117116

118-
if (enable_debug_frame_ptr) {
119-
defines += [ "CONF_ENABLE_FRAME_PTR=1" ]
120-
}
121-
117+
defines += [ "CONF_ENABLE_FRAME_PTR=${enable_debug_frame_ptr}" ]
118+
defines +=
119+
[ "CONFIG_BOUFFALOLAB_FACTORY_DATA_ENABLE=${chip_enable_factory_data}" ]
120+
defines += [
121+
"CONFIG_BOUFFALOLAB_FACTORY_DATA_TEST=${chip_enable_factory_data_test}",
122+
]
122123
if (chip_config_network_layer_ble) {
123124
defines += [ "CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE=1" ]
124125
}
@@ -127,14 +128,6 @@ bouffalolab_executable("lighting_app") {
127128
defines += [ "BOOT_PIN_RESET=16" ]
128129
}
129130

130-
if (chip_enable_factory_data) {
131-
defines += [ "CONFIG_BOUFFALOLAB_FACTORY_DATA_ENABLE=1" ]
132-
}
133-
134-
if (chip_enable_factory_data_test) {
135-
defines += [ "CONFIG_BOUFFALOLAB_FACTORY_DATA_TEST=1" ]
136-
}
137-
138131
if ("BL704LDK" == board) {
139132
defines += [ "XT_ZB6_DevKit" ]
140133
}
@@ -144,8 +137,8 @@ bouffalolab_executable("lighting_app") {
144137
"${example_dir}/common/ZclCallbacks.cpp",
145138
"${examples_plat_dir}/common/iot_sdk/aos_task.c",
146139
"${examples_plat_dir}/common/iot_sdk/demo_pwm.c",
147-
"${examples_plat_dir}/common/iot_sdk/platform_port.c",
148-
"${examples_plat_dir}/common/iot_sdk/uart.c",
140+
"${examples_plat_dir}/common/iot_sdk/platform_port.cpp",
141+
"${examples_plat_dir}/common/iot_sdk/uart.cpp",
149142
"${examples_plat_dir}/common/plat/LEDWidget.cpp",
150143
"${examples_plat_dir}/common/plat/OTAConfig.cpp",
151144
"${examples_plat_dir}/common/plat/main.cpp",
@@ -168,10 +161,6 @@ bouffalolab_executable("lighting_app") {
168161
"${examples_plat_dir}/common/iot_sdk",
169162
]
170163

171-
if (enable_psram) {
172-
defines += [ "CFG_USE_PSRAM=1" ]
173-
}
174-
175164
if (chip_enable_openthread) {
176165
deps += [
177166
"${chip_root}/third_party/openthread/platforms:libopenthread-platform",
@@ -201,9 +190,10 @@ bouffalolab_executable("lighting_app") {
201190
]
202191
}
203192

193+
defines += [ "CONFIG_ENABLE_CHIP_SHELL=${chip_build_libshell}" ]
194+
defines += [ "PW_RPC_ENABLED=${chip_enable_pw_rpc}" ]
204195
if (chip_enable_pw_rpc) {
205196
defines += [
206-
"PW_RPC_ENABLED=1",
207197
"PW_RPC_ATTRIBUTE_SERVICE=1",
208198
"PW_RPC_BUTTON_SERVICE=1",
209199
"PW_RPC_DESCRIPTOR_SERVICE=1",
@@ -252,23 +242,24 @@ bouffalolab_executable("lighting_app") {
252242
"${chip_root}/examples/common",
253243
"${chip_root}/examples/common/pigweed/bouffalolab",
254244
]
255-
} else if (chip_build_libshell) {
256-
defines += [ "CONFIG_ENABLE_CHIP_SHELL=${chip_build_libshell}" ]
257-
258-
deps += [ "${chip_root}/examples/shell/shell_common:shell_common" ]
245+
} else {
246+
if (chip_build_libshell) {
247+
include_dirs += [
248+
"${chip_root}/src/lib/shell",
249+
"${chip_root}/examples/shell/shell_common/include",
250+
]
259251

260-
include_dirs += [
261-
"${chip_root}/src/lib/shell",
262-
"${chip_root}/examples/shell/shell_common/include",
263-
]
252+
deps += [ "${chip_root}/examples/shell/shell_common:shell_common" ]
253+
}
264254
}
265255

256+
defines += [ "HEAP_MONITORING=${enable_heap_monitoring}" ]
266257
if (enable_heap_monitoring) {
267258
sources += [ "${examples_plat_dir}/common/plat/MemMonitoring.cpp" ]
268-
defines += [ "HEAP_MONITORING=1" ]
269259
}
270260

271261
if (enable_psram) {
262+
defines += [ "CFG_USE_PSRAM=1" ]
272263
ldscript = "${examples_plat_dir}/bl702l/ldscripts/psram_flash_rom.ld"
273264
} else {
274265
ldscript = "${examples_plat_dir}/bl702l/ldscripts/flash_rom.ld"

‎examples/lighting-app/bouffalolab/common/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ void AppTask::AppTaskMain(void * pvParameter)
135135
app_event_t appEvent;
136136
bool onoff = false;
137137

138-
#if !(BL702_ENABLE && CHIP_DEVICE_CONFIG_ENABLE_ETHERNET)
138+
#if !(CHIP_DEVICE_LAYER_TARGET_BL702 && CHIP_DEVICE_CONFIG_ENABLE_ETHERNET)
139139
sLightLED.Init();
140140
#endif
141141

‎examples/platform/bouffalolab/bl602/lwipopts/lwipopts.h

+3
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,7 @@ a lot of data that needs to be copied, this should be set high. */
249249
#define LWIP_NETIF_LINK_CALLBACK 1
250250

251251
/*Enable dns*/
252+
#define LWIP_DNS_SERVER 0
252253
#define LWIP_DNS 1
253254
#define LWIP_DNS_SECURE 0
254255

@@ -271,6 +272,8 @@ a lot of data that needs to be copied, this should be set high. */
271272
/* PBUF_POOL_BUFSIZE: the size of each pbuf in the pbuf pool. */
272273
#define PBUF_POOL_BUFSIZE LWIP_MEM_ALIGN_SIZE(TCP_MSS + 40 + PBUF_LINK_ENCAPSULATION_HLEN + PBUF_LINK_HLEN)
273274

275+
#define LWIP_PBUF_FROM_CUSTOM_POOLS (0)
276+
274277
/*
275278
---------------------------------
276279
---------- MISC. options ----------

‎examples/platform/bouffalolab/bl702/lwipopts/lwipopts.h

+2
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@ a lot of data that needs to be copied, this should be set high. */
261261
#define LWIP_NETIF_LINK_CALLBACK 1
262262

263263
/*Enable dns*/
264+
#define LWIP_DNS_SERVER 0
264265
#define LWIP_DNS 1
265266
#define LWIP_DNS_SECURE 0
266267

@@ -283,6 +284,7 @@ a lot of data that needs to be copied, this should be set high. */
283284
/* PBUF_POOL_BUFSIZE: the size of each pbuf in the pbuf pool. */
284285
#define PBUF_POOL_BUFSIZE LWIP_MEM_ALIGN_SIZE(TCP_MSS + 40 + PBUF_LINK_ENCAPSULATION_HLEN + PBUF_LINK_HLEN)
285286

287+
#define LWIP_PBUF_FROM_CUSTOM_POOLS (0)
286288
/*
287289
---------------------------------
288290
---------- MISC. options ----------

0 commit comments

Comments
 (0)