Skip to content

Commit 57881e1

Browse files
authored
fixed sdk path changes (#12)
1 parent 9174c79 commit 57881e1

File tree

20 files changed

+37
-9238
lines changed

20 files changed

+37
-9238
lines changed

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,21 @@ jobs:
1010
build-and-test-build-job:
1111
runs-on: ubuntu-latest
1212
steps:
13+
1314
- uses: actions/checkout@v4
1415
with:
1516
github-server-url: https://github.com/dogusyuksel/cc2640r2f_ble.git
1617
lfs: true
18+
19+
- name: clone docker and linting
20+
run: |
21+
git clone https://github.com/dogusyuksel/embedded_docker.git docker
22+
cp -rf docker/* .
23+
git clone https://github.com/dogusyuksel/embedded_linting.git linting
1724
18-
- name: Setup Environment
25+
- name: free space
1926
run: |
20-
./setup_environment.sh
27+
./free_space.sh
2128
2229
- name: Login to Docker Hub
2330
uses: docker/login-action@v3
@@ -42,4 +49,4 @@ jobs:
4249

4350
- name: Build Check
4451
run: |
45-
./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"
52+
./docker/sudo_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/.xdcenv.mak

Lines changed: 0 additions & 16 deletions
This file was deleted.
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/compiler.opt.defs

Lines changed: 0 additions & 1 deletion
This file was deleted.

firmware/ble5_simple_peripheral_cc2640r2lp_app/FlashROM_StackLibrary/configPkg/config.bld

Lines changed: 0 additions & 24 deletions
This file was deleted.

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

0 commit comments

Comments
 (0)