From 56eb0578cbc57f7d541fbe99e57070ff66acaaf1 Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Fri, 11 Nov 2016 14:11:04 +0100 Subject: [PATCH] nrf5-zephyr: Makefiles to compile classic part (to get memory footprint on ARM Cortex) --- port/nrf5-zephyr/Makefile.bluedroid | 2 ++ port/nrf5-zephyr/Makefile.bluedroid-decoder | 17 +++++++++++++++++ port/nrf5-zephyr/Makefile.bluedroid-encoder | 11 +++++++++++ port/nrf5-zephyr/Makefile.src | 5 +++-- port/nrf5-zephyr/integrate_btstack.sh | 14 +++++++++++--- 5 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 port/nrf5-zephyr/Makefile.bluedroid create mode 100644 port/nrf5-zephyr/Makefile.bluedroid-decoder create mode 100644 port/nrf5-zephyr/Makefile.bluedroid-encoder diff --git a/port/nrf5-zephyr/Makefile.bluedroid b/port/nrf5-zephyr/Makefile.bluedroid new file mode 100644 index 000000000..5b691b451 --- /dev/null +++ b/port/nrf5-zephyr/Makefile.bluedroid @@ -0,0 +1,2 @@ +obj-y += encoder/srce/ +obj-y += decoder/srce/ diff --git a/port/nrf5-zephyr/Makefile.bluedroid-decoder b/port/nrf5-zephyr/Makefile.bluedroid-decoder new file mode 100644 index 000000000..3246ebf60 --- /dev/null +++ b/port/nrf5-zephyr/Makefile.bluedroid-decoder @@ -0,0 +1,17 @@ +obj-y += \ + alloc.o \ + bitalloc.o \ + bitalloc-sbc.o \ + bitstream-decode.o \ + decoder-oina.o \ + decoder-private.o \ + decoder-sbc.o \ + dequant.o \ + framing.o \ + framing-sbc.o \ + oi_codec_version.o \ + synthesis-sbc.o \ + synthesis-dct8.o \ + synthesis-8-generated.o \ + +ccflags-y += -I${ZEPHYR_BASE}/subsys/btstack/bluedroid/decoder/include diff --git a/port/nrf5-zephyr/Makefile.bluedroid-encoder b/port/nrf5-zephyr/Makefile.bluedroid-encoder new file mode 100644 index 000000000..ef222dda1 --- /dev/null +++ b/port/nrf5-zephyr/Makefile.bluedroid-encoder @@ -0,0 +1,11 @@ +obj-y += \ + sbc_analysis.o \ + sbc_dct.o \ + sbc_dct_coeffs.o \ + sbc_enc_bit_alloc_mono.o \ + sbc_enc_bit_alloc_ste.o \ + sbc_enc_coeffs.o \ + sbc_encoder.o \ + sbc_packing.o \ + +ccflags-y += -I${ZEPHYR_BASE}/subsys/btstack/bluedroid/encoder/include diff --git a/port/nrf5-zephyr/Makefile.src b/port/nrf5-zephyr/Makefile.src index 968ea77c4..bf0d072f1 100644 --- a/port/nrf5-zephyr/Makefile.src +++ b/port/nrf5-zephyr/Makefile.src @@ -5,17 +5,18 @@ obj-y += \ btstack_memory_pool.o \ btstack_ring_buffer.o \ btstack_run_loop.o \ - btstack_slip.o \ btstack_util.o \ hci.o \ hci_cmd.o \ hci_dump.o \ hci_transport_h4.o \ - hci_transport_h5.o \ l2cap.o \ l2cap_signaling.o \ btstack_run_loop_embedded.o \ obj-y += ble/ +# obj-y += classic/ +# obj-y += bluedroid/ + ccflags-y += -I${ZEPHYR_BASE}/subsys/btstack ccflags-y += -I${ZEPHYR_BASE}/ext/hal/nordic/mdk diff --git a/port/nrf5-zephyr/integrate_btstack.sh b/port/nrf5-zephyr/integrate_btstack.sh index 581a43d08..55dddf5a2 100755 --- a/port/nrf5-zephyr/integrate_btstack.sh +++ b/port/nrf5-zephyr/integrate_btstack.sh @@ -4,6 +4,7 @@ ZEPHYR_BASE=../../.. echo "Adding BTstack sources as subsys/btstack" + # add btstack folder to subsys/Makefile MAKEFILE_ADD_ON='obj-$(CONFIG_BTSTACK) += btstack/' NET_MAKEFILE=${ZEPHYR_BASE}/subsys/Makefile @@ -17,7 +18,8 @@ grep -q -F btstack ${SUBSYS_KCONFIG} || echo 'source "subsys/btstack/Kconfig"' > CTRL_H=${ZEPHYR_BASE}/subsys/bluetooth/controller/ll/ctrl.h sed -i "s|#define RADIO_BLE_COMPANY_ID.*0xFFFF.|#define RADIO_BLE_COMPANY_ID (0x0059) // Nordic Semiconductor ASA|g" ${CTRL_H} -# create net/btstack + +# create subsys/btstack mkdir -p ${ZEPHYR_BASE}/subsys/btstack # copy sources @@ -30,6 +32,9 @@ rsync -a ../../platform/embedded/hal_tick.h ${ZEPHYR_BASE}/subsys/btstack rsync -a ../../platform/embedded/btstack_run_loop_embedded.h ${ZEPHYR_BASE}/subsys/btstack rsync -a ../../platform/embedded/btstack_run_loop_embedded.c ${ZEPHYR_BASE}/subsys/btstack +# copy bludroid +rsync -a ../../3rd-party/bluedroid ${ZEPHYR_BASE}/subsys/btstack + # copy btstack_config.h rsync -a btstack_config.h ${ZEPHYR_BASE}/subsys/btstack @@ -38,9 +43,12 @@ rsync -a Kconfig ${ZEPHYR_BASE}/subsys/btstack # copy Makefiles rsync -a Makefile.src ${ZEPHYR_BASE}/subsys/btstack/Makefile +rsync -a Makefile.classic ${ZEPHYR_BASE}/subsys/btstack/classic/Makefile rsync -a Makefile.ble ${ZEPHYR_BASE}/subsys/btstack/ble/Makefile -rsync -a Makefile.gatt-service ${ZEPHYR_BASE}/subsys/btstack/ble/gatt-service/Makefile - +rsync -a Makefile.gatt-service ${ZEPHYR_BASE}/subsys/btstack/ble/gatt-service/Makefile +rsync -a Makefile.bluedroid ${ZEPHYR_BASE}/subsys/btstack/bluedroid/Makefile +rsync -a Makefile.bluedroid-encoder ${ZEPHYR_BASE}/subsys/btstack/bluedroid/encoder/srce/Makefile +rsync -a Makefile.bluedroid-decoder ${ZEPHYR_BASE}/subsys/btstack/bluedroid/decoder/srce/Makefile # create samples/btstack ./create_examples.py