Skip to content

Commit 53d8f85

Browse files
dogusyukseldogusyuksel
committed
fixed sdk path changes
1 parent c2177b0 commit 53d8f85

File tree

6 files changed

+27
-28
lines changed

6 files changed

+27
-28
lines changed

‎.github/workflows/build-and-tests.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ jobs:
2525
- name: clone docker and linting
2626
run: |
2727
git clone https://github.com/dogusyuksel/embedded_docker.git docker
28-
cp -rf docker/* .
2928
git clone https://github.com/dogusyuksel/embedded_linting.git linting
3029
3130
- name: Login to Docker Hub
@@ -51,4 +50,4 @@ jobs:
5150

5251
- name: Build Check
5352
run: |
54-
./docker/sudo_run_docker.sh ${{ secrets.DOCKER_REPO }}:master "cd / && ls -al && cd /workspace && ls -al && tree && source environment && cd firmware/ble5_simple_peripheral_cc2640r2lp_app && make -C ./FlashROM_StackLibrary/ clean && make -C ./FlashROM_StackLibrary/ all"
53+
./docker/run_docker.sh ${{ secrets.DOCKER_REPO }}:master "cd /workspace && source environment && cd firmware/ble5_simple_peripheral_cc2640r2lp_app && make -C ./FlashROM_StackLibrary/ clean && make -C ./FlashROM_StackLibrary/ all"

‎environment

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
export XDCTOOLS_JAVA_HOME="/usr/lib/jvm/default-java"
2-
export CCS_PATH="/workspace/ti_cc2640r2f_sdk/ccs1281"
3-
export TI_SDK_PATH="/workspace/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11"
2+
export CCS_PATH="/thirdparty/ti_cc2640r2f_sdk/ccs1281"
3+
export TI_SDK_PATH="/thirdparty/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11"

‎firmware/ble5_simple_peripheral_cc2640r2lp_app/FlashROM_StackLibrary/configPkg/compiler.opt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
--endian=little -mv7M3 --abi=eabi -I"/workspace/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/source" -I"/workspace/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/kernel/tirtos/packages" -I"/workspace/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/source/ti/ble5stack" -I"/workspace/ti_cc2640r2f_sdk/ccs1281/xdctools_3_62_01_16_core/packages" -I"/workspace/firmware/ble5_simple_peripheral_cc2640r2lp_app/FlashROM_StackLibrary/configPkg/.." -I/workspace/ti_cc2640r2f_sdk/ccs1281/ccs/tools/compiler/ti-cgt-arm_20.2.7.LTS/include -Dxdc_target_types__="ti/targets/arm/elf/std.h" -Dxdc_target_name__=M3 -Dxdc_cfg__xheader__="\"/workspace/firmware/ble5_simple_peripheral_cc2640r2lp_app/FlashROM_StackLibrary/configPkg/package/cfg/app_ble_pem3.h\""
1+
--endian=little -mv7M3 --abi=eabi -I"/thirdparty/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/source" -I"/thirdparty/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/kernel/tirtos/packages" -I"/thirdparty/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/source/ti/ble5stack" -I"/thirdparty/ti_cc2640r2f_sdk/ccs1281/xdctools_3_62_01_16_core/packages" -I"/workspace/firmware/ble5_simple_peripheral_cc2640r2lp_app/FlashROM_StackLibrary/configPkg/.." -I/thirdparty/ti_cc2640r2f_sdk/ccs1281/ccs/tools/compiler/ti-cgt-arm_20.2.7.LTS/include -Dxdc_target_types__="ti/targets/arm/elf/std.h" -Dxdc_target_name__=M3 -Dxdc_cfg__xheader__="\"/workspace/firmware/ble5_simple_peripheral_cc2640r2lp_app/FlashROM_StackLibrary/configPkg/package/cfg/app_ble_pem3.h\""

‎firmware/ble5_simple_peripheral_cc2640r2lp_app/FlashROM_StackLibrary/configPkg/linker.cmd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111

1212
-l"/workspace/firmware/ble5_simple_peripheral_cc2640r2lp_app/FlashROM_StackLibrary/configPkg/package/cfg/app_ble_pem3.oem3"
1313
-l"/workspace/firmware/ble5_simple_peripheral_cc2640r2lp_app/TOOLS/src/sysbios/rom_sysbios.aem3"
14-
-l"/workspace/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/kernel/tirtos/packages/ti/targets/arm/rtsarm/lib/boot.aem3"
15-
-l"/workspace/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/kernel/tirtos/packages/ti/targets/arm/rtsarm/lib/auto_init.aem3"
16-
-l"/workspace/ti_cc2640r2f_sdk/ccs1281/xdctools_3_62_01_16_core/packages/xdc/rov/runtime/lib/xdc.rov.runtime.aem3"
14+
-l"/thirdparty/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/kernel/tirtos/packages/ti/targets/arm/rtsarm/lib/boot.aem3"
15+
-l"/thirdparty/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/kernel/tirtos/packages/ti/targets/arm/rtsarm/lib/auto_init.aem3"
16+
-l"/thirdparty/ti_cc2640r2f_sdk/ccs1281/xdctools_3_62_01_16_core/packages/xdc/rov/runtime/lib/xdc.rov.runtime.aem3"
1717

1818
--retain="*(xdc.meta)"
1919

@@ -109,7 +109,7 @@ ti_sysbios_family_arm_m3_Hwi_nvic = 0xe000e000;
109109

110110
/* Content from ti.sysbios.heaps (null): */
111111

112-
/* Content from ti.sysbios.rom.cortexm.cc26xx.r2 (/workspace/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/kernel/tirtos/packages/ti/sysbios/rom/cortexm/cc26xx/r2/golden/CC26xx/CC26xx_link_ti.xdt): */
112+
/* Content from ti.sysbios.rom.cortexm.cc26xx.r2 (/thirdparty/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/kernel/tirtos/packages/ti/sysbios/rom/cortexm/cc26xx/r2/golden/CC26xx/CC26xx_link_ti.xdt): */
113113

114114
-u xdc_runtime_Error_policy__C
115115
-u xdc_runtime_IModule_Interface__BASE__C

‎firmware/ble5_simple_peripheral_cc2640r2lp_app/TOOLS/src/sysbios/makefile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@
66
# template: ti.sysbios.rom.cortexm.cc26xx.r2/CC26xx_custom_makefile.xdt
77
# target: ti.targets.arm.elf.M3
88

9-
vpath % /workspace/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/kernel/tirtos/packages/ti/sysbios/
10-
vpath %.c /workspace/ti_cc2640r2f_sdk/ccs1281/xdctools_3_62_01_16_core/packages/
9+
vpath % /thirdparty/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/kernel/tirtos/packages/ti/sysbios/
10+
vpath %.c /thirdparty/ti_cc2640r2f_sdk/ccs1281/xdctools_3_62_01_16_core/packages/
1111

12-
XOPTS = -I"/workspace/ti_cc2640r2f_sdk/ccs1281/xdctools_3_62_01_16_core/packages/" -Dxdc_target_types__=/workspace/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/kernel/tirtos/packages/ti/targets/arm/elf/std.h -Dxdc_target_name__=M3
12+
XOPTS = -I"/thirdparty/ti_cc2640r2f_sdk/ccs1281/xdctools_3_62_01_16_core/packages/" -Dxdc_target_types__=/thirdparty/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/kernel/tirtos/packages/ti/targets/arm/elf/std.h -Dxdc_target_name__=M3
1313

1414
BIOS_DEFS = -Dti_sysbios_BIOS_swiEnabled__D=TRUE -Dti_sysbios_BIOS_taskEnabled__D=TRUE -Dti_sysbios_BIOS_clockEnabled__D=TRUE -Dti_sysbios_BIOS_runtimeCreatesEnabled__D=TRUE -Dti_sysbios_knl_Task_moduleStateCheckFlag__D=FALSE -Dti_sysbios_knl_Task_objectCheckFlag__D=FALSE -Dti_sysbios_hal_Hwi_DISABLE_ALL_HOOKS -Dti_sysbios_knl_Swi_DISABLE_ALL_HOOKS -Dti_sysbios_BIOS_smpEnabled__D=FALSE -Dti_sysbios_Build_useHwiMacros -Dti_sysbios_Build_useIndirectReferences=FALSE -Dti_sysbios_knl_Swi_numPriorities__D=6 -Dti_sysbios_knl_Task_deleteTerminatedTasks__D=FALSE -Dti_sysbios_knl_Task_numPriorities__D=6 -Dti_sysbios_knl_Task_checkStackFlag__D=FALSE -Dti_sysbios_knl_Task_initStackFlag__D=TRUE -Dti_sysbios_knl_Task_DISABLE_ALL_HOOKS -Dti_sysbios_knl_Clock_TICK_SOURCE=ti_sysbios_knl_Clock_TickSource_TIMER -Dti_sysbios_knl_Clock_TICK_MODE=ti_sysbios_knl_Clock_TickMode_DYNAMIC -Dti_sysbios_hal_Core_delegate_getId=ti_sysbios_hal_CoreNull_getId__E -Dti_sysbios_hal_Core_delegate_interruptCore=ti_sysbios_hal_CoreNull_interruptCore__E -Dti_sysbios_hal_Core_delegate_lock=ti_sysbios_hal_CoreNull_lock__E -Dti_sysbios_hal_Core_delegate_unlock=ti_sysbios_hal_CoreNull_unlock__E -Dti_sysbios_hal_Core_numCores__D=1 -Dti_sysbios_hal_CoreNull_numCores__D=1 -Dti_sysbios_utils_Load_taskEnabled__D=TRUE -Dti_sysbios_utils_Load_swiEnabled__D=FALSE -Dti_sysbios_utils_Load_hwiEnabled__D=FALSE -Dti_sysbios_family_arm_m3_Hwi_dispatcherSwiSupport__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_dispatcherTaskSupport__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_dispatcherAutoNestingSupport__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_dispatcherIrpTrackingSupport__D=TRUE -Dti_sysbios_knl_Semaphore_supportsEvents__D=FALSE -Dti_sysbios_knl_Semaphore_supportsPriority__D=FALSE -Dxdc_runtime_Assert_DISABLE_ALL -Dxdc_runtime_Log_DISABLE_ALL --define=DeviceFamily_CC26X0R2
1515

1616
CCOPTS = --endian=little -mv7M3 --abi=eabi -q -ms --opt_for_speed=0 --program_level_compile -o3 -g -Dti_sysbios_family_arm_cc26xx_Boot_driverlibVersion=2 -Dti_sysbios_knl_Clock_stopCheckNext__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_enableException__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_disablePriority__D=32U -Dti_sysbios_family_arm_m3_Hwi_numSparseInterrupts__D=0U -Dti_sysbios_knl_Task_minimizeLatency__D=FALSE
1717

18-
BIOS_INC = -I"/workspace/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/kernel/tirtos/packages/"
18+
BIOS_INC = -I"/thirdparty/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/kernel/tirtos/packages/"
1919
ANNEX_INCS =
20-
INCS = $(BIOS_INC) $(ANNEX_INCS) -I"/workspace/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/source/" -I"/workspace/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/kernel/tirtos/packages/" -I"/workspace/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/source/ti/ble5stack/" -I"/workspace/ti_cc2640r2f_sdk/ccs1281/xdctools_3_62_01_16_core/packages/" -I"../" -I"/packages//" -I/workspace/ti_cc2640r2f_sdk/ccs1281/ccs/tools/compiler/ti-cgt-arm_20.2.7.LTS/include
20+
INCS = $(BIOS_INC) $(ANNEX_INCS) -I"/thirdparty/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/source/" -I"/thirdparty/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/kernel/tirtos/packages/" -I"/thirdparty/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/source/ti/ble5stack/" -I"/thirdparty/ti_cc2640r2f_sdk/ccs1281/xdctools_3_62_01_16_core/packages/" -I"../" -I"/packages//" -I/thirdparty/ti_cc2640r2f_sdk/ccs1281/ccs/tools/compiler/ti-cgt-arm_20.2.7.LTS/include
2121

22-
CC = /workspace/ti_cc2640r2f_sdk/ccs1281/ccs/tools/compiler/ti-cgt-arm_20.2.7.LTS/bin/armcl -c $(CCOPTS)
23-
ASM = /workspace/ti_cc2640r2f_sdk/ccs1281/ccs/tools/compiler/ti-cgt-arm_20.2.7.LTS/bin/armcl -c $(CCOPTS)
24-
AR = /workspace/ti_cc2640r2f_sdk/ccs1281/ccs/tools/compiler/ti-cgt-arm_20.2.7.LTS/bin/armar rq
22+
CC = /thirdparty/ti_cc2640r2f_sdk/ccs1281/ccs/tools/compiler/ti-cgt-arm_20.2.7.LTS/bin/armcl -c $(CCOPTS)
23+
ASM = /thirdparty/ti_cc2640r2f_sdk/ccs1281/ccs/tools/compiler/ti-cgt-arm_20.2.7.LTS/bin/armcl -c $(CCOPTS)
24+
AR = /thirdparty/ti_cc2640r2f_sdk/ccs1281/ccs/tools/compiler/ti-cgt-arm_20.2.7.LTS/bin/armar rq
2525

2626
DEL = rm -f
2727
CP = cp -f
@@ -62,7 +62,7 @@ rom_sysbios.obj: BIOS.c knl/Clock.c knl/Idle.c knl/Intrinsics.c knl/Event.c knl/
6262
rom_sysbios.aem3: rom_sysbios.obj m3_Hwi_asm.obj m3_Hwi_asm_switch.obj m3_IntrinsicsSupport_asm.obj m3_TaskSupport_asm.obj
6363
@-$(call RM, $@)
6464
@echo arem3 $^ ...
65-
@$(AR) $@ $^ /workspace/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/kernel/tirtos/packages/ti/sysbios/rom/cortexm/cc26xx/r2/golden/CC26xx/rom_sysbios_config.obj
65+
@$(AR) $@ $^ /thirdparty/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/kernel/tirtos/packages/ti/sysbios/rom/cortexm/cc26xx/r2/golden/CC26xx/rom_sysbios_config.obj
6666

6767
clean:
6868
@$(DEL) ../makefile.libs

‎firmware/ble5_simple_peripheral_cc2640r2lp_stack_library/FlashROM_Library/lib_linker.cmd

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11

2-
"/workspace/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/source/ti/ble5stack/blelib/cc26x0r2/ctrl/ll_pxxx.a"
3-
"/workspace/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/source/ti/ble5stack/blelib/cc26x0r2/ctrl/hci_pxxx.a"
4-
"/workspace/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/source/ti/ble5stack/blelib/cc26x0r2/hci_tl/hci_tl_none.a"
5-
"/workspace/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/source/ti/ble5stack/blelib/cc26x0r2/host/sm_pxxx.a"
6-
"/workspace/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/source/ti/ble5stack/blelib/cc26x0r2/host/l2cap_pxxx.a"
7-
"/workspace/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/source/ti/ble5stack/blelib/cc26x0r2/host/gap_pxxx.a"
8-
"/workspace/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/source/ti/ble5stack/blelib/cc26x0r2/host/gatt_pxxx.a"
9-
"/workspace/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/source/ti/ble5stack/blelib/cc26x0r2/host/smp_pxxx.a"
10-
"/workspace/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/source/ti/ble5stack/blelib/cc26x0r2/host/profiles_pxxx.a"
11-
"/workspace/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/source/ti/ble5stack/blelib/cc26x0r2/host/att_pxxx.a"
2+
"/thirdparty/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/source/ti/ble5stack/blelib/cc26x0r2/ctrl/ll_pxxx.a"
3+
"/thirdparty/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/source/ti/ble5stack/blelib/cc26x0r2/ctrl/hci_pxxx.a"
4+
"/thirdparty/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/source/ti/ble5stack/blelib/cc26x0r2/hci_tl/hci_tl_none.a"
5+
"/thirdparty/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/source/ti/ble5stack/blelib/cc26x0r2/host/sm_pxxx.a"
6+
"/thirdparty/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/source/ti/ble5stack/blelib/cc26x0r2/host/l2cap_pxxx.a"
7+
"/thirdparty/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/source/ti/ble5stack/blelib/cc26x0r2/host/gap_pxxx.a"
8+
"/thirdparty/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/source/ti/ble5stack/blelib/cc26x0r2/host/gatt_pxxx.a"
9+
"/thirdparty/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/source/ti/ble5stack/blelib/cc26x0r2/host/smp_pxxx.a"
10+
"/thirdparty/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/source/ti/ble5stack/blelib/cc26x0r2/host/profiles_pxxx.a"
11+
"/thirdparty/ti_cc2640r2f_sdk/simplelink_cc2640r2_sdk_5_30_01_11/source/ti/ble5stack/blelib/cc26x0r2/host/att_pxxx.a"

0 commit comments

Comments
 (0)