Skip to content
This repository was archived by the owner on Aug 5, 2022. It is now read-only.

Commit 33d88b0

Browse files
James PrestwoodJimmy Huang
James Prestwood
authored and
Jimmy Huang
committed
[ocf] Fix OCF on QEMU build (#1040)
Fixes #1035 Signed-off-by: James Prestwood <[email protected]>
1 parent 46c8cc2 commit 33d88b0

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

scripts/analyze.sh

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,20 @@ if check_for_require ocf || check_config_file ZJS_OCF; then
170170
echo "CONFIG_NET_LOG=y" >> $PRJFILE
171171
echo "CONFIG_NET_SLIP=y" >> $PRJFILE
172172
echo "CONFIG_NET_SLIP_TAP=y" >> $PRJFILE
173+
elif [ $BOARD = "arduino_101" ] || [ $BOARD = "nrf52_pca10040" ]; then
174+
echo "CONFIG_BLUETOOTH=y" >> $PRJFILE
175+
echo "CONFIG_BLUETOOTH_SMP=y" >> $PRJFILE
176+
echo "CONFIG_BLUETOOTH_SIGNING=y" >> $PRJFILE
177+
echo "CONFIG_BLUETOOTH_PERIPHERAL=y" >> $PRJFILE
178+
echo "CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL=y" >> $PRJFILE
179+
echo "CONFIG_NETWORKING_WITH_6LOWPAN=y" >> $PRJFILE
180+
echo "CONFIG_6LOWPAN_COMPRESSION_IPHC=y" >> $PRJFILE
181+
echo "CONFIG_NET_L2_BLUETOOTH_ZEP1656=y" >> $PRJFILE
182+
echo "CONFIG_NET_L2_BLUETOOTH=y" >> $PRJFILE
183+
elif [ $BOARD = "frdm_k64f" ]; then
184+
echo "CONFIG_NET_L2_ETHERNET=y" >> $PRJFILE
173185
fi
186+
174187
echo "CONFIG_NETWORKING=y" >> $PRJFILE
175188
echo "CONFIG_NET_IPV6=y" >> $PRJFILE
176189
echo "CONFIG_NET_UDP=y" >> $PRJFILE
@@ -182,16 +195,6 @@ if check_for_require ocf || check_config_file ZJS_OCF; then
182195
echo "CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=1" >> $PRJFILE
183196
echo "CONFIG_NET_MAX_CONTEXTS=3" >> $PRJFILE
184197

185-
echo "CONFIG_BLUETOOTH=y" >> $PRJFILE
186-
echo "CONFIG_BLUETOOTH_SMP=y" >> $PRJFILE
187-
echo "CONFIG_BLUETOOTH_SIGNING=y" >> $PRJFILE
188-
echo "CONFIG_BLUETOOTH_PERIPHERAL=y" >> $PRJFILE
189-
echo "CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL=y" >> $PRJFILE
190-
echo "CONFIG_NETWORKING_WITH_6LOWPAN=y" >> $PRJFILE
191-
echo "CONFIG_6LOWPAN_COMPRESSION_IPHC=y" >> $PRJFILE
192-
echo "CONFIG_NET_L2_BLUETOOTH_ZEP1656=y" >> $PRJFILE
193-
echo "CONFIG_NET_L2_BLUETOOTH=y" >> $PRJFILE
194-
195198
echo "export ZJS_OCF=y" >> $CONFFILE
196199
echo "export ZJS_EVENTS=y" >> $CONFFILE
197200
echo "export ZJS_NET_CONFIG=y" >> $CONFFILE

src/zjs_ocf_common.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -459,9 +459,11 @@ jerry_value_t zjs_ocf_init()
459459
#endif
460460

461461
#ifndef ZJS_LINUX_BUILD
462+
#if defined(CONFIG_NET_L2_BLUETOOTH)
462463
// init BLE address
463464
zjs_init_ble_address();
464465
zjs_obj_add_function(ocf_object, zjs_set_ble_address, "setBleAddress");
466+
#endif
465467
#endif
466468
return ocf_object;
467469
}

0 commit comments

Comments
 (0)