[PDK-12011] build: safertos: Updates to set custom SafeRTOS Package path

- Add new safertos_package_path.mk
- SAFERTOS_<SOC>_<ISA>_INSTALL_PATH variable can be set here
- If not set, it will use the default development location
  - i.e, $(SDK_INSTALL_PATH)/safertos_<SOC>_<ISA>_<SAFERTOS_VERSION>

- Add Utility script to setup SDK for SafeRTOS Builds
  - This script can be used to custom SafeRTOS WHIS Package Installation path
  - Also rebuilds required libraries like safertos, osal_safertos
    check-in sciserver_testapp_safertos .xer5f and .rprx to sciclient tools folder
    - This is required since the above libs/binaries won't be included in the public SDK
  - Only enabled for j721e r5f/c66/c7x
    - Can be enhanced in future to support other SOC's

Signed-off-by: Don Dominic <a0486429@ti.com>

diff --git a/packages/ti/build/Rules.make b/packages/ti/build/Rules.make
index 7ed884bc7aba6ddcddd2795843d91dbf8ab42bfd..6f4890a6dc6a45c55a297b412979ceba2992a13a 100755 (executable)
--- a/packages/ti/build/Rules.make
+++ b/packages/ti/build/Rules.make
@@ -135,6 +135,12 @@ export CPLUSPLUS_BUILD ?= no
 
 include $(PDK_INSTALL_PATH)/ti/build/pdk_tools_path.mk
 
+#safertos_package_path.mk will be packaged only for SOCs with SafeRTOS Build is supported.
+#Hence, include only if available 
+ifneq ($(wildcard $(PDK_INSTALL_PATH)/ti/build/safertos_package_path.mk),)
+  include $(PDK_INSTALL_PATH)/ti/build/safertos_package_path.mk
+endif
+
 #use <module>_PATH variable as makefile internally expects PATH variable this way for external component path
 export pdk_PATH := $(PDK_INSTALL_PATH)
 export bios_PATH := $(BIOS_INSTALL_PATH)

diff --git a/packages/ti/build/makefile b/packages/ti/build/makefile
index b3390b817c7783dc09aacdea19a0e714dbadedf7..8f3a3123cd7868e39648d3c8eab5e765f11fbbdc 100644 (file)
--- a/packages/ti/build/makefile
+++ b/packages/ti/build/makefile
@@ -198,7 +198,6 @@ all_libs_clean:
        $(RM) -rf ../*/*/*/*/lib
        $(RM) -rf ../drv/emac/firmware/icss_dualmac/bin/
        $(RM) -rf ../boot/sbl/binary
-       $(RM) -rf $(SAFERTOS_KERNEL_INSTALL_PATH)/lib
 
 package: $(FINAL_PKG_LIST_PACKAGE) $(FINAL_DUP_EXAMPLE_LIST_PACKAGE)
 

diff --git a/packages/ti/build/pdk_tools_path.mk b/packages/ti/build/pdk_tools_path.mk
index 80f7a89d0cac600f5ced39d9836f533c572a89d0..9ce445c6d0b7a1c37c9023478bbc413c7c5d40f7 100644 (file)
--- a/packages/ti/build/pdk_tools_path.mk
+++ b/packages/ti/build/pdk_tools_path.mk
@@ -18,12 +18,6 @@ endif
   XDC_VERSION=3_61_04_40_core
   MMWAVE_DFP_VERSION=02_04_00_01
 
-ifeq ($(BOARD),$(filter $(BOARD), j721e_evm ))
-  SAFERTOS_VERSION_r5f=009-002-199-024-219-004
-  SAFERTOS_VERSION_c66=009-002-201-005-219-002
-  SAFERTOS_VERSION_c7x=009-002-230-005-219-003
-endif
-
   CGT_C7X_VERSION=2.1.1.LTS
   CGT_ARM_VERSION=20.2.0.LTS
   CGT_ARMLLVM_VERSION=1.3.0.LTS
@@ -122,7 +116,6 @@ endif
   export M4_TOOLCHAIN_INSTALL_DIR  ?= $(TOOLCHAIN_PATH_M4)
   export FREERTOS_KERNEL_INSTALL_PATH   ?= $(PDK_INSTALL_PATH)/ti/kernel/freertos/FreeRTOS-LTS
   export FREERTOS_LABS_INSTALL_PATH     ?= $(PDK_INSTALL_PATH)/ti/kernel/freertos/FreeRTOS-Labs
-  export SAFERTOS_KERNEL_INSTALL_PATH   ?= $(SDK_INSTALL_PATH)/safertos_$(SOC)_$(ISA)_$(SAFERTOS_VERSION_$(ISA))
   export MMWAVE_DFP_INSTALL_PATH        ?= $(SDK_INSTALL_PATH)/mmwave_dfp_$(MMWAVE_DFP_VERSION)
 
 ifeq ($(SOC),$(filter $(SOC), am335x))

diff --git a/packages/ti/build/safertos_package_path.mk b/packages/ti/build/safertos_package_path.mk
new file mode 100644 (file)
index 0000000..7292d39
--- /dev/null
+++ b/packages/ti/build/safertos_package_path.mk
@@ -0,0 +1,41 @@
+################################################################################
+# Configure SafeRTOS Package paths for various SOC/ISA
+################################################################################
+
+# Update the following to set custom path to SafeRTOS Package.
+# Else the default path will be set to $(SDK_INSTALL_PATH)/safertos_$(SOC)_$(ISA)_$(SAFERTOS_VERSION_$(ISA))
+# IMPORTANT:
+#   Make sure the paths specified below DO NOT have any spaces in them.
+ifeq ($(BOARD),$(filter $(BOARD), j721e_evm ))
+  export SAFERTOS_j721e_r5f_INSTALL_PATH = 
+  export SAFERTOS_j721e_c66_INSTALL_PATH = 
+  export SAFERTOS_j721e_c7x_INSTALL_PATH = 
+endif
+
+# This release is validated on below mentioned SafeRTOS Version on said SOC's/ISA's 
+ifeq ($(BOARD),$(filter $(BOARD), j721e_evm ))
+  SAFERTOS_VERSION_r5f = 009-002-199-024-219-004
+  SAFERTOS_VERSION_c66 = 009-002-201-005-219-002
+  SAFERTOS_VERSION_c7x = 009-002-230-005-219-005
+endif
+
+include $(PDK_INSTALL_PATH)/ti/build/makerules/platform.mk
+
+ifeq ($(ISA),$(filter $(ISA), r5f c66 c7x))
+  ifneq ($(SAFERTOS_$(SOC)_$(ISA)_INSTALL_PATH),)
+    export SAFERTOS_KERNEL_INSTALL_PATH         = $(SAFERTOS_$(SOC)_$(ISA)_INSTALL_PATH)
+    export SAFERTOS_KERNEL_INSTALL_PATH_$(ISA) ?= $(SAFERTOS_$(SOC)_$(ISA)_INSTALL_PATH)
+  else
+    export SAFERTOS_KERNEL_INSTALL_PATH         = $(SDK_INSTALL_PATH)/safertos_$(SOC)_$(ISA)_$(SAFERTOS_VERSION_$(ISA))
+    export SAFERTOS_KERNEL_INSTALL_PATH_$(ISA) ?= $(SDK_INSTALL_PATH)/safertos_$(SOC)_$(ISA)_$(SAFERTOS_VERSION_$(ISA))
+  endif
+endif
+
+# ISA based directory extensions used in SafeRTOS Package 
+SAFERTOS_ISA_EXT_r5f = 199_TI_CR5
+SAFERTOS_ISA_EXT_c66 = 201_C66x
+SAFERTOS_ISA_EXT_c7x = 230_C7x
+# Compiler based directory extensions used in SafeRTOS Package 
+SAFERTOS_COMPILER_EXT_r5f = 024_Clang
+SAFERTOS_COMPILER_EXT_c66 = 005_TI_CGT
+SAFERTOS_COMPILER_EXT_c7x = 005_TI_CGT
\ No newline at end of file

diff --git a/packages/ti/build/safertos_setup.sh b/packages/ti/build/safertos_setup.sh
new file mode 100755 (executable)
index 0000000..dea239c
--- /dev/null
+++ b/packages/ti/build/safertos_setup.sh
@@ -0,0 +1,103 @@
+#!/bin/bash
+#
+# Utility script to setup SDK for SafeRTOS Builds
+#
+# Prerequisites:-
+# - Make sure you have installed the SafeRTOS Packages from WHIS
+#
+# Note:-
+# - Make sure the paths provided DO NOT have any spaces in them
+
+# Example usage
+# ./safertos-setup.sh --j721e_r5f_path=path/to/whis/safertos/j721e/r5f/pacakge --j721e_c66_path=path/to/whis/safertos/j721e/c66/pacakge --j721e_c7x_path=path/to/whis/safertos/j721e/c7x/pacakge
+# ./safertos-setup.sh --j721e_r5f_path=path/to/whis/safertos/j721e/r5f/pacakge 
+# ./safertos-setup.sh --j721e_c66_path=path/to/whis/safertos/j721e/c66/pacakge 
+# ./safertos-setup.sh --j721e_c7x_path=path/to/whis/safertos/j721e/c7x/pacakge
+
+
+#Environmental variables
+pdk_build_path=`pwd`
+
+#Get user input
+while [ $# -gt 0 ]; do
+  case "$1" in
+    --j721e_r5f_path=*)
+      j721e_r5f_path="${1#*=}"
+      ;;
+    --j721e_c66_path=*)
+      j721e_c66_path="${1#*=}"
+      ;;
+    --j721e_c7x_path=*)
+      j721e_c7x_path="${1#*=}"
+      ;;    
+    -h|--help)
+      echo Usage: $0 [options]
+      echo
+      echo Options:
+      echo "--j721e_r5f_path       Path to J721E(TDA4VM) R5F SafeRTOS Package from WHIS"
+      echo "--j721e_c66_path       Path to J721E(TDA4VM) C66 SafeRTOS Package from WHIS"
+      echo "--j721e_c7x_path       Path to J721E(TDA4VM) C7x SafeRTOS Package from WHIS"
+      exit 0
+      ;;
+    *)
+      printf "Error: Invalid argument $1!!\n"
+  esac
+  shift
+done
+
+printf "\n pdk_build_path = $pdk_build_path \n"
+
+if [ ! "${j721e_r5f_path}" == "" ]; then
+  printf "\n j721e_r5f_path = $j721e_r5f_path \n\n"
+  if [ !  -d ${j721e_r5f_path} ] ; then
+    printf "\n Error: Invalid j721e_r5f_path!!\n\n"
+  else
+    #Update R5F Install Path
+    sed -i -e "s|SAFERTOS_j721e_r5f_INSTALL_PATH =.*|SAFERTOS_j721e_r5f_INSTALL_PATH = ${j721e_r5f_path}|g" safertos_package_path.mk
+    #Build safertos lib for all R5F cores
+    make safertos -sj8 CORE=mcu1_0 BUILD_PROFILE=release BOARD=j721e_evm
+    make safertos -sj8 CORE=mcu1_1 BUILD_PROFILE=release BOARD=j721e_evm
+    make safertos -sj8 CORE=mcu2_0 BUILD_PROFILE=release BOARD=j721e_evm
+    make safertos -sj8 CORE=mcu2_1 BUILD_PROFILE=release BOARD=j721e_evm
+    make safertos -sj8 CORE=mcu3_0 BUILD_PROFILE=release BOARD=j721e_evm
+    make safertos -sj8 CORE=mcu3_1 BUILD_PROFILE=release BOARD=j721e_evm
+    #Build osal_safertos for R5F
+    make osal_safertos -sj8 CORE=mcu1_0 BUILD_PROFILE=release BOARD=j721e_evm
+    #Build sciserver_testapp_safertos and check-in
+    make sciserver_testapp_safertos -sj8 CORE=mcu1_0 BUILD_PROFILE=release BOARD=j721e_evm
+    cp ${pdk_build_path}/../binary/sciserver_testapp_safertos/bin/j721e/sciserver_testapp_safertos_mcu1_0_release.xer5f ${pdk_build_path}/../drv/sciclient/tools/ccsLoadDmsc/j721e/
+    cp ${pdk_build_path}/../binary/sciserver_testapp_safertos/bin/j721e/sciserver_testapp_safertos_mcu1_0_release.rprc  ${pdk_build_path}/../drv/sciclient/tools/ccsLoadDmsc/j721e/
+    printf "\n Successfully completed setup SafeRTOS Builds for J721E R5F\n\n"
+  fi
+fi
+if [ ! "${j721e_c66_path}" == "" ]; then
+  printf "\n j721e_c66_path = $j721e_c66_path \n\n"
+  if [ !  -d ${j721e_c66_path} ] ; then
+    printf "\n Error: Invalid j721e_c66_path!!\n\n"
+  else
+    #Update C66 Install Path
+    sed -i -e "s|SAFERTOS_j721e_c66_INSTALL_PATH =.*|SAFERTOS_j721e_c66_INSTALL_PATH = ${j721e_c66_path}|g" safertos_package_path.mk
+    #Build safertos lib for all c66 cores
+    make safertos -sj8 CORE=c66xdsp_1 BUILD_PROFILE=release;
+    make safertos -sj8 CORE=c66xdsp_2 BUILD_PROFILE=release;
+    #Build osal_safertos for c66
+    make osal_safertos -sj8 CORE=c66xdsp_1 BUILD_PROFILE=release;
+    printf "\n Successfully completed setup SafeRTOS Builds for J721E C66\n\n"
+  fi
+fi
+if [ ! "${j721e_c7x_path}" == "" ]; then
+  printf "\n j721e_c7x_path = $j721e_c7x_path \n\n"
+  if [ !  -d ${j721e_c7x_path} ] ; then
+    printf "\n Error: Invalid j721e_c7x_path!!\n\n"
+  else
+    #Update C7x install Path
+    sed -i -e "s|SAFERTOS_j721e_c7x_INSTALL_PATH =.*|SAFERTOS_j721e_c7x_INSTALL_PATH = ${j721e_c7x_path}|g" safertos_package_path.mk
+    #Build safertos lib for all c7x cores
+    make safertos -sj8 CORE=c7x_1 BUILD_PROFILE=release;
+    #Build osal_safertos for c7x
+    make osal_safertos -sj8 CORE=c7x_1 BUILD_PROFILE=release;
+    printf "\n Successfully completed setup SafeRTOS Builds for J721E C7x\n\n"
+  fi
+fi
+
+exit

diff --git a/packages/ti/kernel/safertos/safertos.mak b/packages/ti/kernel/safertos/safertos.mak
index 63908b817c72ead27e10bd19cd2bd22b8ca6a9ee..b9c80071670d4d7ac70fa157f07e529f2e846563 100644 (file)
--- a/packages/ti/kernel/safertos/safertos.mak
+++ b/packages/ti/kernel/safertos/safertos.mak
@@ -7,41 +7,28 @@ MODULE_NAME = safertos
 
 BUILD_OS_TYPE = safertos
 
+SRCDIR = ${SAFERTOS_KERNEL_INSTALL_PATH_$(ISA)}/source_code_and_projects/SafeRTOS/api/PrivWrapperStd
+SRCDIR += ${SAFERTOS_KERNEL_INSTALL_PATH_$(ISA)}/source_code_and_projects/SafeRTOS/kernel
+SRCDIR += ${SAFERTOS_KERNEL_INSTALL_PATH_$(ISA)}/source_code_and_projects/SafeRTOS/portable/$(SAFERTOS_ISA_EXT_$(ISA))
+SRCDIR += ${SAFERTOS_KERNEL_INSTALL_PATH_$(ISA)}/source_code_and_projects/SafeRTOS/portable/$(SAFERTOS_ISA_EXT_$(ISA))/$(SAFERTOS_COMPILER_EXT_$(ISA))
 ifeq ($(ISA),$(filter $(ISA), r5f))
-SAFERTOS_ISA_EXT=199_TI_CR5
-SAFERTOS_COMPILER_EXT=024_Clang
-endif
-ifeq ($(ISA),$(filter $(ISA), c66))
-SAFERTOS_ISA_EXT=201_C66x
-SAFERTOS_COMPILER_EXT=005_TI_CGT
-endif
-ifeq ($(ISA),$(filter $(ISA), c7x))
-SAFERTOS_ISA_EXT=230_C7x
-SAFERTOS_COMPILER_EXT=005_TI_CGT
-endif
-
-SRCDIR = ${SAFERTOS_KERNEL_INSTALL_PATH}/source_code_and_projects/SafeRTOS/api/PrivWrapperStd
-SRCDIR += ${SAFERTOS_KERNEL_INSTALL_PATH}/source_code_and_projects/SafeRTOS/kernel
-SRCDIR += ${SAFERTOS_KERNEL_INSTALL_PATH}/source_code_and_projects/SafeRTOS/portable/$(SAFERTOS_ISA_EXT)
-SRCDIR += ${SAFERTOS_KERNEL_INSTALL_PATH}/source_code_and_projects/SafeRTOS/portable/$(SAFERTOS_ISA_EXT)/$(SAFERTOS_COMPILER_EXT)
-ifeq ($(ISA),$(filter $(ISA), r5f))
-SRCDIR += ${SAFERTOS_KERNEL_INSTALL_PATH}/source_code_and_projects/SafeRTOS/api/${SAFERTOS_ISA_EXT}
+SRCDIR += ${SAFERTOS_KERNEL_INSTALL_PATH_$(ISA)}/source_code_and_projects/SafeRTOS/api/${SAFERTOS_ISA_EXT_$(ISA)}
 endif
 ifeq ($(ISA),$(filter $(ISA), c7x))
-SRCDIR += ${SAFERTOS_KERNEL_INSTALL_PATH}/source_code_and_projects/demo_projects/SafeRTOS_TDA4VM_C7x_Demo/TI_c7x_Support
+SRCDIR += ${SAFERTOS_KERNEL_INSTALL_PATH_$(ISA)}/source_code_and_projects/demo_projects/SafeRTOS_TDA4VM_C7x_Demo/TI_c7x_Support
 endif
 
-INCDIR = ${SAFERTOS_KERNEL_INSTALL_PATH}/source_code_and_projects/SafeRTOS/api/$(SAFERTOS_ISA_EXT)
-INCDIR += ${SAFERTOS_KERNEL_INSTALL_PATH}/source_code_and_projects/SafeRTOS/api/PrivWrapperStd
-INCDIR += ${SAFERTOS_KERNEL_INSTALL_PATH}/source_code_and_projects/SafeRTOS/config
-INCDIR += ${SAFERTOS_KERNEL_INSTALL_PATH}/source_code_and_projects/SafeRTOS/kernel/include_api
-INCDIR += ${SAFERTOS_KERNEL_INSTALL_PATH}/source_code_and_projects/SafeRTOS/kernel/include_prv
-INCDIR += ${SAFERTOS_KERNEL_INSTALL_PATH}/source_code_and_projects/SafeRTOS/portable/$(SAFERTOS_ISA_EXT)
-INCDIR += ${SAFERTOS_KERNEL_INSTALL_PATH}/source_code_and_projects/SafeRTOS/portable/$(SAFERTOS_ISA_EXT)/$(SAFERTOS_COMPILER_EXT)
+INCDIR = ${SAFERTOS_KERNEL_INSTALL_PATH_$(ISA)}/source_code_and_projects/SafeRTOS/api/$(SAFERTOS_ISA_EXT_$(ISA))
+INCDIR += ${SAFERTOS_KERNEL_INSTALL_PATH_$(ISA)}/source_code_and_projects/SafeRTOS/api/PrivWrapperStd
+INCDIR += ${SAFERTOS_KERNEL_INSTALL_PATH_$(ISA)}/source_code_and_projects/SafeRTOS/config
+INCDIR += ${SAFERTOS_KERNEL_INSTALL_PATH_$(ISA)}/source_code_and_projects/SafeRTOS/kernel/include_api
+INCDIR += ${SAFERTOS_KERNEL_INSTALL_PATH_$(ISA)}/source_code_and_projects/SafeRTOS/kernel/include_prv
+INCDIR += ${SAFERTOS_KERNEL_INSTALL_PATH_$(ISA)}/source_code_and_projects/SafeRTOS/portable/$(SAFERTOS_ISA_EXT_$(ISA))
+INCDIR += ${SAFERTOS_KERNEL_INSTALL_PATH_$(ISA)}/source_code_and_projects/SafeRTOS/portable/$(SAFERTOS_ISA_EXT_$(ISA))/$(SAFERTOS_COMPILER_EXT_$(ISA))
 ifeq ($(ISA),$(filter $(ISA), c7x))
-INCDIR += ${SAFERTOS_KERNEL_INSTALL_PATH}/source_code_and_projects/SafeRTOS/api/NoWrapper
-INCDIR += ${SAFERTOS_KERNEL_INSTALL_PATH}/source_code_and_projects/demo_projects/SafeRTOS_TDA4VM_C7x_Demo/TI_c7x_Support
-INCDIR += ${SAFERTOS_KERNEL_INSTALL_PATH}/source_code_and_projects/demo_projects/SafeRTOS_TDA4VM_C7x_Demo
+INCDIR += ${SAFERTOS_KERNEL_INSTALL_PATH_$(ISA)}/source_code_and_projects/SafeRTOS/api/NoWrapper
+INCDIR += ${SAFERTOS_KERNEL_INSTALL_PATH_$(ISA)}/source_code_and_projects/demo_projects/SafeRTOS_TDA4VM_C7x_Demo/TI_c7x_Support
+INCDIR += ${SAFERTOS_KERNEL_INSTALL_PATH_$(ISA)}/source_code_and_projects/demo_projects/SafeRTOS_TDA4VM_C7x_Demo
 endif
 
 # List all the external components/interfaces, whose interface header files

diff --git a/packages/ti/kernel/safertos/safertos_component.mk b/packages/ti/kernel/safertos/safertos_component.mk
index a611b693e2e014b0067bcaa189009518d1a0f37d..848b6a5fe1f521a6d2c0d3ec4e4a0b0a33769983 100644 (file)
--- a/packages/ti/kernel/safertos/safertos_component.mk
+++ b/packages/ti/kernel/safertos/safertos_component.mk
@@ -122,22 +122,16 @@ export safertos_CORE_DEPENDENCY
 export safertos_SOC_DEPENDENCY
 safertos_PKG_LIST = safertos
 export safertos_PKG_LIST
-safertos_ISA_EXT_r5f = 199_TI_CR5
-safertos_COMPILER_EXT_r5f = 024_Clang
-safertos_ISA_EXT_c66 = 201_C66x
-safertos_COMPILER_EXT_c66 = 005_TI_CGT
-safertos_ISA_EXT_c7x = 230_C7x
-safertos_COMPILER_EXT_c7x = 005_TI_CGT 
-safertos_INCLUDE =  ${SAFERTOS_KERNEL_INSTALL_PATH}/source_code_and_projects/SafeRTOS/api/$(safertos_ISA_EXT_$(ISA))
-safertos_INCLUDE += ${SAFERTOS_KERNEL_INSTALL_PATH}/source_code_and_projects/SafeRTOS/kernel/include_api
-safertos_INCLUDE += ${SAFERTOS_KERNEL_INSTALL_PATH}/source_code_and_projects/SafeRTOS/portable/$(safertos_ISA_EXT_$(ISA))
-safertos_INCLUDE += ${SAFERTOS_KERNEL_INSTALL_PATH}/source_code_and_projects/SafeRTOS/portable/$(safertos_ISA_EXT_$(ISA))/$(safertos_COMPILER_EXT_$(ISA))
-safertos_INCLUDE += ${SAFERTOS_KERNEL_INSTALL_PATH}/source_code_and_projects/SafeRTOS/api/PrivWrapperStd
-safertos_INCLUDE += ${SAFERTOS_KERNEL_INSTALL_PATH}/source_code_and_projects/SafeRTOS/api/NoWrapper
-safertos_INCLUDE += ${SAFERTOS_KERNEL_INSTALL_PATH}/source_code_and_projects/demo_projects/SafeRTOS_TDA4VM_C7x_Demo/TI_c7x_Support
-safertos_INCLUDE += ${SAFERTOS_KERNEL_INSTALL_PATH}/source_code_and_projects/demo_projects/SafeRTOS_TDA4VM_C7x_Demo
-safertos_INCLUDE += ${SAFERTOS_KERNEL_INSTALL_PATH}/source_code_and_projects/SafeRTOS/kernel/include_prv
-safertos_INCLUDE +=  ${SAFERTOS_KERNEL_INSTALL_PATH}/source_code_and_projects/SafeRTOS/config
+safertos_INCLUDE =  ${SAFERTOS_KERNEL_INSTALL_PATH_${ISA}}/source_code_and_projects/SafeRTOS/api/$(SAFERTOS_ISA_EXT_$(ISA))
+safertos_INCLUDE += ${SAFERTOS_KERNEL_INSTALL_PATH_${ISA}}/source_code_and_projects/SafeRTOS/kernel/include_api
+safertos_INCLUDE += ${SAFERTOS_KERNEL_INSTALL_PATH_${ISA}}/source_code_and_projects/SafeRTOS/portable/$(SAFERTOS_ISA_EXT_$(ISA))
+safertos_INCLUDE += ${SAFERTOS_KERNEL_INSTALL_PATH_${ISA}}/source_code_and_projects/SafeRTOS/portable/$(SAFERTOS_ISA_EXT_$(ISA))/$(SAFERTOS_COMPILER_EXT_$(ISA))
+safertos_INCLUDE += ${SAFERTOS_KERNEL_INSTALL_PATH_${ISA}}/source_code_and_projects/SafeRTOS/api/PrivWrapperStd
+safertos_INCLUDE += ${SAFERTOS_KERNEL_INSTALL_PATH_${ISA}}/source_code_and_projects/SafeRTOS/api/NoWrapper
+safertos_INCLUDE += ${SAFERTOS_KERNEL_INSTALL_PATH_${ISA}}/source_code_and_projects/demo_projects/SafeRTOS_TDA4VM_C7x_Demo/TI_c7x_Support
+safertos_INCLUDE += ${SAFERTOS_KERNEL_INSTALL_PATH_${ISA}}/source_code_and_projects/demo_projects/SafeRTOS_TDA4VM_C7x_Demo
+safertos_INCLUDE += ${SAFERTOS_KERNEL_INSTALL_PATH_${ISA}}/source_code_and_projects/SafeRTOS/kernel/include_prv
+safertos_INCLUDE += ${SAFERTOS_KERNEL_INSTALL_PATH_${ISA}}/source_code_and_projects/SafeRTOS/config
 
 export safertos_SOCLIST
 export safertos_$(SOC)_CORELIST

diff --git a/packages/ti/kernel/test/safertos/safertos_demo/makefile b/packages/ti/kernel/test/safertos/safertos_demo/makefile
index 9d910c808201b6e0868dfacdb2b396351ffca510..441c60cbbd4bb7aee9a3c8ce8ad9a9022b7e39db 100644 (file)
--- a/packages/ti/kernel/test/safertos/safertos_demo/makefile
+++ b/packages/ti/kernel/test/safertos/safertos_demo/makefile
@@ -15,11 +15,11 @@ SAFERTOS_DEMO_EXT_r5f=SafeRTOS_TDA4VM_R5_Demo
 SAFERTOS_DEMO_EXT_c66=SafeRTOS_TDA4VM_C66x_Demo
 SAFERTOS_DEMO_EXT_c7x=SafeRTOS_TDA4VM_C7x_Demo
 
-SRCDIR = ${SAFERTOS_KERNEL_INSTALL_PATH}/source_code_and_projects/demo_projects/$(SAFERTOS_DEMO_EXT_$(ISA))/Common/
-SRCDIR += ${SAFERTOS_KERNEL_INSTALL_PATH}/source_code_and_projects/demo_projects/$(SAFERTOS_DEMO_EXT_$(ISA))/source/
+SRCDIR = ${SAFERTOS_KERNEL_INSTALL_PATH_$(ISA)}/source_code_and_projects/demo_projects/$(SAFERTOS_DEMO_EXT_$(ISA))/Common/
+SRCDIR += ${SAFERTOS_KERNEL_INSTALL_PATH_$(ISA)}/source_code_and_projects/demo_projects/$(SAFERTOS_DEMO_EXT_$(ISA))/source/
 
-INCDIR = ${SAFERTOS_KERNEL_INSTALL_PATH}/source_code_and_projects/demo_projects/$(SAFERTOS_DEMO_EXT_$(ISA))/Common/include/
-INCDIR += ${SAFERTOS_KERNEL_INSTALL_PATH}/source_code_and_projects/demo_projects/$(SAFERTOS_DEMO_EXT_$(ISA))/include/
+INCDIR = ${SAFERTOS_KERNEL_INSTALL_PATH_$(ISA)}/source_code_and_projects/demo_projects/$(SAFERTOS_DEMO_EXT_$(ISA))/Common/include/
+INCDIR += ${SAFERTOS_KERNEL_INSTALL_PATH_$(ISA)}/source_code_and_projects/demo_projects/$(SAFERTOS_DEMO_EXT_$(ISA))/include/
 
 
 # List all the external components/interfaces, whose interface header files
@@ -33,13 +33,13 @@ else
 endif
 
 ifeq ($(ISA),$(filter $(ISA), r5f))
-  EXTERNAL_LNKCMD_FILE_LOCAL = ${SAFERTOS_KERNEL_INSTALL_PATH}/source_code_and_projects/demo_projects/SafeRTOS_TDA4VM_R5_Demo/linker_core_r5.lds
+  EXTERNAL_LNKCMD_FILE_LOCAL = ${SAFERTOS_KERNEL_INSTALL_PATH_$(ISA)}/source_code_and_projects/demo_projects/SafeRTOS_TDA4VM_R5_Demo/linker_core_r5.lds
 endif
 ifeq ($(ISA),$(filter $(ISA), c66))
-  EXTERNAL_LNKCMD_FILE_LOCAL = ${SAFERTOS_KERNEL_INSTALL_PATH}/source_code_and_projects/demo_projects/SafeRTOS_TDA4VM_C66x_Demo/linker_c66_safertos.cmd
+  EXTERNAL_LNKCMD_FILE_LOCAL = ${SAFERTOS_KERNEL_INSTALL_PATH_$(ISA)}/source_code_and_projects/demo_projects/SafeRTOS_TDA4VM_C66x_Demo/linker_c66_safertos.cmd
 endif
 ifeq ($(ISA),$(filter $(ISA), c7x))
-  EXTERNAL_LNKCMD_FILE_LOCAL = ${SAFERTOS_KERNEL_INSTALL_PATH}/source_code_and_projects/demo_projects/SafeRTOS_TDA4VM_C7x_Demo/linker_c7x_safertos.cmd
+  EXTERNAL_LNKCMD_FILE_LOCAL = ${SAFERTOS_KERNEL_INSTALL_PATH_$(ISA)}/source_code_and_projects/demo_projects/SafeRTOS_TDA4VM_C7x_Demo/linker_c7x_safertos.cmd
 endif
 
 # Common source files and CFLAGS across all platforms and cores