From 36c8a70fe0e50121634358d17c605432da49ea8e Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Fri, 20 May 2016 11:27:32 +0200 Subject: [PATCH] cc256x:use v1.4 init script for CC2560B and CC2564B ports --- .gitignore | 5 +++-- port/ez430-rf2560/Makefile | 4 ++-- port/msp-exp430f5438-cc2564b/Makefile | 4 ++-- port/msp430f5229lp-cc2564b/Makefile | 4 ++-- port/posix-h4/Makefile | 2 +- port/posix-h5/Makefile | 2 +- port/stm32-f103rb-nucleo/Makefile | 2 +- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index a4c85c315..0c0823b52 100644 --- a/.gitignore +++ b/.gitignore @@ -15,7 +15,8 @@ *.map .theos .stamp -bluetooth_init_cc2560B_1.2_BT_Spec_4.1.c -bluetooth_init_cc2564B_1.2_BT_Spec_4.1.c +.bts +bluetooth_init_cc2560B_1.*_BT_Spec_4.1.c +bluetooth_init_cc2564B_1.*_BT_Spec_4.1.c TIInit_11.8.32.c initscripts_TIInit_6.7.16_bt_spec_4.1.c diff --git a/port/ez430-rf2560/Makefile b/port/ez430-rf2560/Makefile index b53f0136a..88c7786f7 100644 --- a/port/ez430-rf2560/Makefile +++ b/port/ez430-rf2560/Makefile @@ -4,8 +4,8 @@ # # init scripts -CC2560B = bluetooth_init_cc2560B_1.2_BT_Spec_4.1.o -CC2564B = bluetooth_init_cc2564B_1.2_BT_Spec_4.1.o +CC2560B = bluetooth_init_cc2560B_1.4_BT_Spec_4.1.o +CC2564B = bluetooth_init_cc2564B_1.4_BT_Spec_4.1.o CC2567 = CC256x_BT_Service_Pack_2.8_ANT_1.16.o BTSTACK_ROOT = ../.. diff --git a/port/msp-exp430f5438-cc2564b/Makefile b/port/msp-exp430f5438-cc2564b/Makefile index 470e8cc74..433c9fe41 100644 --- a/port/msp-exp430f5438-cc2564b/Makefile +++ b/port/msp-exp430f5438-cc2564b/Makefile @@ -4,8 +4,8 @@ # # init scripts -CC2560B = bluetooth_init_cc2560B_1.2_BT_Spec_4.1.o -CC2564B = bluetooth_init_cc2564B_1.2_BT_Spec_4.1.o +CC2560B = bluetooth_init_cc2560B_1.4_BT_Spec_4.1.o +CC2564B = bluetooth_init_cc2564B_1.4_BT_Spec_4.1.o CC2567 = CC256x_BT_Service_Pack_2.8_ANT_1.16.o BTSTACK_ROOT = ../.. diff --git a/port/msp430f5229lp-cc2564b/Makefile b/port/msp430f5229lp-cc2564b/Makefile index 9b0d95e94..abe9e94bf 100644 --- a/port/msp430f5229lp-cc2564b/Makefile +++ b/port/msp430f5229lp-cc2564b/Makefile @@ -4,8 +4,8 @@ # # init scripts -CC2560B = bluetooth_init_cc2560B_1.2_BT_Spec_4.1.o -CC2564B = bluetooth_init_cc2564B_1.2_BT_Spec_4.1.o +CC2560B = bluetooth_init_cc2560B_1.4_BT_Spec_4.1.o +CC2564B = bluetooth_init_cc2564B_1.4_BT_Spec_4.1.o CC2567 = CC256x_BT_Service_Pack_2.8_ANT_1.16.o BTSTACK_ROOT = ../.. diff --git a/port/posix-h4/Makefile b/port/posix-h4/Makefile index 810b5aa2b..9002a15ad 100644 --- a/port/posix-h4/Makefile +++ b/port/posix-h4/Makefile @@ -2,7 +2,7 @@ BTSTACK_ROOT = ../.. CORE += \ - bluetooth_init_cc2564B_1.2_BT_Spec_4.1.c \ + bluetooth_init_cc2564B_1.4_BT_Spec_4.1.c \ btstack_chipset_cc256x.c \ btstack_chipset_csr.c \ btstack_chipset_em9301.c \ diff --git a/port/posix-h5/Makefile b/port/posix-h5/Makefile index b98920889..b335fd85a 100644 --- a/port/posix-h5/Makefile +++ b/port/posix-h5/Makefile @@ -2,7 +2,7 @@ BTSTACK_ROOT = ../.. CORE += \ - bluetooth_init_cc2564B_1.2_BT_Spec_4.1.c \ + bluetooth_init_cc2564B_1.4_BT_Spec_4.1.c \ btstack_chipset_cc256x.c \ btstack_chipset_csr.c \ btstack_chipset_em9301.c \ diff --git a/port/stm32-f103rb-nucleo/Makefile b/port/stm32-f103rb-nucleo/Makefile index 4e78f7df2..907371543 100644 --- a/port/stm32-f103rb-nucleo/Makefile +++ b/port/stm32-f103rb-nucleo/Makefile @@ -24,7 +24,7 @@ CORE = \ btstack_run_loop_embedded.c \ COMMON = \ - bluetooth_init_cc2564B_1.2_BT_Spec_4.1.c \ + bluetooth_init_cc2564B_1.4_BT_Spec_4.1.c \ btstack_chipset_cc256x.c \ btstack_link_key_db_memory.c \ rfcomm.c \