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

[ocf] Fix OCF on QEMU build #1040

Merged
merged 1 commit into from
Apr 21, 2017
Merged

[ocf] Fix OCF on QEMU build #1040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions scripts/analyze.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,20 @@ if check_for_require ocf || check_config_file ZJS_OCF; then
echo "CONFIG_NET_LOG=y" >> $PRJFILE
echo "CONFIG_NET_SLIP=y" >> $PRJFILE
echo "CONFIG_NET_SLIP_TAP=y" >> $PRJFILE
elif [ $BOARD = "arduino_101" ] || [ $BOARD = "nrf52_pca10040" ]; then
echo "CONFIG_BLUETOOTH=y" >> $PRJFILE
echo "CONFIG_BLUETOOTH_SMP=y" >> $PRJFILE
echo "CONFIG_BLUETOOTH_SIGNING=y" >> $PRJFILE
echo "CONFIG_BLUETOOTH_PERIPHERAL=y" >> $PRJFILE
echo "CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL=y" >> $PRJFILE
echo "CONFIG_NETWORKING_WITH_6LOWPAN=y" >> $PRJFILE
echo "CONFIG_6LOWPAN_COMPRESSION_IPHC=y" >> $PRJFILE
echo "CONFIG_NET_L2_BLUETOOTH_ZEP1656=y" >> $PRJFILE
echo "CONFIG_NET_L2_BLUETOOTH=y" >> $PRJFILE
elif [ $BOARD = "frdm_k64f" ]; then
echo "CONFIG_NET_L2_ETHERNET=y" >> $PRJFILE
fi

echo "CONFIG_NETWORKING=y" >> $PRJFILE
echo "CONFIG_NET_IPV6=y" >> $PRJFILE
echo "CONFIG_NET_UDP=y" >> $PRJFILE
Expand All @@ -182,16 +195,6 @@ if check_for_require ocf || check_config_file ZJS_OCF; then
echo "CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=1" >> $PRJFILE
echo "CONFIG_NET_MAX_CONTEXTS=3" >> $PRJFILE

echo "CONFIG_BLUETOOTH=y" >> $PRJFILE
echo "CONFIG_BLUETOOTH_SMP=y" >> $PRJFILE
echo "CONFIG_BLUETOOTH_SIGNING=y" >> $PRJFILE
echo "CONFIG_BLUETOOTH_PERIPHERAL=y" >> $PRJFILE
echo "CONFIG_BLUETOOTH_L2CAP_DYNAMIC_CHANNEL=y" >> $PRJFILE
echo "CONFIG_NETWORKING_WITH_6LOWPAN=y" >> $PRJFILE
echo "CONFIG_6LOWPAN_COMPRESSION_IPHC=y" >> $PRJFILE
echo "CONFIG_NET_L2_BLUETOOTH_ZEP1656=y" >> $PRJFILE
echo "CONFIG_NET_L2_BLUETOOTH=y" >> $PRJFILE

echo "export ZJS_OCF=y" >> $CONFFILE
echo "export ZJS_EVENTS=y" >> $CONFFILE
echo "export ZJS_NET_CONFIG=y" >> $CONFFILE
Expand Down
2 changes: 2 additions & 0 deletions src/zjs_ocf_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,9 +459,11 @@ jerry_value_t zjs_ocf_init()
#endif

#ifndef ZJS_LINUX_BUILD
#if defined(CONFIG_NET_L2_BLUETOOTH)
// init BLE address
zjs_init_ble_address();
zjs_obj_add_function(ocf_object, zjs_set_ble_address, "setBleAddress");
#endif
#endif
return ocf_object;
}
Expand Down