Pull request #12: PINDSW-6923 Fix the mcu plus sdk link inside ind comms sdk folder in MCSDK

Merge in PINDSW/motor_control_setup from PINDSW-6923_Fix-the-mcu_plus_sdk-link-inside-ind_comms_sdk-folder-in-MCSDK to next

* commit 'c49415c1ef61940e3feb9eb1c83fc040d2db00ae':
  am64x/am243x/am263x : build : remove RTlibs from manifests
  am243x : build : fix the mcu_plus_sdk link inside ind_comms_sdk folder

README.md

@@ -16,6 +16,8 @@ for Motor Control SDK which includes but are not limited to:
 - TI ARM CLANG
 - SysConfig
 - NodeJS and required packages
+- MCU + SDK
+- Industrial Communications SDK
 
 Currently the scripts only support a Linux / Git Bash environment. Support will 
 be added soon for Windows native environment.

releases/09_00_00/.component_versions

@@ -15,7 +15,47 @@ GCC_AARCH64_VERSION="9.2-2019.12"
 GCC_ARM_VERSION="7-2017-q4-major"
 GCC_ARM_VERSION_FOLDER="7-2017q4"
 
-#MCU PLUS SDK
+#MCU PLUS SDK VERSION
-MCU_PLUS_SDK_AM64X="09.00.00.01"
+MCU_PLUS_SDK_AM64X="09.00.00.35"
-MCU_PLUS_SDK_AM243X="09.00.00.01"
+MCU_PLUS_SDK_AM243X="09.00.00.35"
-MCU_PLUS_SDK_AM263X="09.00.00.01"
+MCU_PLUS_SDK_AM263X="09.00.00.35"
+
+#MCU PLUS SDK NIGHTLY URL
+MCU_PLUS_SDK_AM64X_NIGHTLY_URL="http://mcupnas.dhcp.ti.com/release_area/nightly_builds/mcu_plus_sdk_am64x_nightly/latest/artifacts/output/webgen/exports"
+MCU_PLUS_SDK_AM243X_NIGHTLY_URL="http://mcupnas.dhcp.ti.com/release_area/nightly_builds/mcu_plus_sdk_am243x_nightly/latest/artifacts/output/webgen/exports"
+MCU_PLUS_SDK_AM263X_NIGHTLY_URL="http://mcupnas.dhcp.ti.com/release_area/nightly_builds/mcu_plus_sdk_am263x_nightly/latest/artifacts/output/webgen/exports"
+
+#MCU PLUS SDK RC VERSION
+MCU_PLUS_SDK_RC_AM64X="09.00.00.21"
+MCU_PLUS_SDK_RC_AM243X="09.00.00.22"
+MCU_PLUS_SDK_RC_AM263X="09.00.00.21"
+
+#MCU PLUS SDK RC URL
+MCU_PLUS_SDK_AM64X_RC_URL="http://tigt_qa.dal.englab.ti.com/qacm/test_area/MCU_PLUS_SDK/${MCU_PLUS_SDK_RC_AM64X::8}/am64x/${MCU_PLUS_SDK_RC_AM64X//\./_}/exports"
+MCU_PLUS_SDK_AM243X_RC_URL="http://tigt_qa.dal.englab.ti.com/qacm/test_area/MCU_PLUS_SDK/${MCU_PLUS_SDK_RC_AM243X::8}/am243x/${MCU_PLUS_SDK_RC_AM243X//\./_}/exports"
+MCU_PLUS_SDK_AM263X_RC_URL="http://tigt_qa.dal.englab.ti.com/qacm/test_area/MCU_PLUS_SDK/${MCU_PLUS_SDK_RC_AM263X::8}/am263x/${MCU_PLUS_SDK_RC_AM263X//\./_}/exports"
+
+#MCU PLUS SDK RELEASE URL
+MCU_PLUS_SDK_AM64X_RELEASE_URL="https://dr-download.ti.com/software-development/software-development-kit-sdk/MD-SfkcjYAjGS/${MCU_PLUS_SDK_AM64X}"
+MCU_PLUS_SDK_AM243X_RELEASE_URL="https://dr-download.ti.com/software-development/software-development-kit-sdk/MD-ouHbHEm1PK/${MCU_PLUS_SDK_AM243X}"
+MCU_PLUS_SDK_AM263X_RELEASE_URL="https://dr-download.ti.com/software-development/software-development-kit-sdk/MD-r5FY9rRaGv/${MCU_PLUS_SDK_AM263X}"
+
+#INDUSTRIAK COMMUNICATIONS SDK VERSION
+IND_COMMS_SDK_AM64X="09.00.00.03"
+IND_COMMS_SDK_AM243X="09.00.00.03"
+IND_COMMS_SDK_AM263X="09.00.00.03"
+
+#INDUSTRIAL COMMUNICATIONS SDK NIGHTLY URL
+IND_COMMS_SDK_AM64X_NIGHTLY_URL="http://mcupnas.dhcp.ti.com/release_area/nightly_builds/mcu_plus_sdk_am64x_nightly/latest/artifacts/output/webgen/exports"
+IND_COMMS_SDK_AM243X_NIGHTLY_URL="http://mcupnas.dhcp.ti.com/release_area/nightly_builds/mcu_plus_sdk_am243x_nightly/latest/artifacts/output/webgen/exports"
+IND_COMMS_SDK_AM263X_NIGHTLY_URL="http://mcupnas.dhcp.ti.com/release_area/nightly_builds/mcu_plus_sdk_am263x_nightly/latest/artifacts/output/webgen/exports"
+
+#INDUSTRIAL COMMUNICATIONS SDK RC URL
+IND_COMMS_SDK_AM64X_RC_URL="http://tigt_qa.dal.englab.ti.com/qacm/test_area/INDUSTRIAL-COMMUNICATIONS-SDK/${IND_COMMS_SDK_AM64X::8}/am64x/${IND_COMMS_SDK_AM64X//\./_}/exports"
+IND_COMMS_SDK_AM243X_RC_URL="http://tigt_qa.dal.englab.ti.com/qacm/test_area/INDUSTRIAL-COMMUNICATIONS-SDK/${IND_COMMS_SDK_AM243X::8}/am243x/${IND_COMMS_SDK_AM243X//\./_}/exports"
+IND_COMMS_SDK_AM263X_RC_URL="http://tigt_qa.dal.englab.ti.com/qacm/test_area/INDUSTRIAL-COMMUNICATIONS-SDK/${IND_COMMS_SDK_AM263X::8}/am263x/${IND_COMMS_SDK_AM263X//\./_}/exports"
+
+#INDUSTRIAL COMMUNICATIONS SDK RELEASE URL
+IND_COMMS_SDK_AM64X_RELEASE_URL="https://dr-download.ti.com/software-development/software-development-kit-sdk/MD-SfkcjYAjGS/${IND_COMMS_SDK_AM64X}"
+IND_COMMS_SDK_AM243X_RELEASE_URL="https://dr-download.ti.com/software-development/software-development-kit-sdk/MD-ouHbHEm1PK/${IND_COMMS_SDK_AM243X}"
+IND_COMMS_SDK_AM263X_RELEASE_URL="https://dr-download.ti.com/software-development/software-development-kit-sdk/MD-r5FY9rRaGv/${IND_COMMS_SDK_AM263X}"

releases/09_00_00/am243x/download_components.sh

@@ -63,11 +63,21 @@ clang_url_folder="${CGT_TI_ARM_CLANG_VERSION}.${CGT_TI_ARM_CLANG_VERSION_SUFFIX}
 clang_install_folder="ti-cgt-armllvm_${CGT_TI_ARM_CLANG_VERSION}.${CGT_TI_ARM_CLANG_VERSION_SUFFIX}"
 clang_install_file="ti_cgt_armllvm_${CGT_TI_ARM_CLANG_VERSION}.${CGT_TI_ARM_CLANG_VERSION_SUFFIX}_linux-x64_installer.bin"
 
-
 # MCU + SDK
+mcu_plus_sdk_url="${MCU_PLUS_SDK_AM243X_RELEASE_URL}"
 mcu_sdk_version="${MCU_PLUS_SDK_AM243X}"
+
+# IND COMMS SDK
+ind_comms_sdk_url="${IND_COMMS_SDK_AM243X_RC_URL}"
+ind_comms_sdk_version="${IND_COMMS_SDK_AM243X}"
+
 platform="am243x"
 
+
+# RTLibs
+rtlibs_script_file="sitara-mcsdk-release.py"
+rtlibs_generated_folder="temp_sitara_mcsdk"
+
 if [ "${OS}" = "Windows_NT" ]; then
     echo "Installing windows packages"
     #TODO
@@ -76,7 +86,8 @@ else
     #install_clang   ${CGT_TI_ARM_CLANG_VERSION} ${clang_url_folder} ${clang_install_folder} ${clang_install_file} ${install_dir}
     install_gcc_arm ${GCC_ARM_VERSION} ${gcc_arm_install_folder} ${gcc_arm_download_file} ${install_dir} ${GCC_ARM_VERSION_FOLDER}
     install_syscfg  ${SYSCFG_VERSION} ${install_dir}
-    #install_mcu_plus_sdk  ${mcu_sdk_version} ${platform} ${motor_control_folder}
+    install_mcu_plus_sdk  ${mcu_sdk_version} ${platform} ${motor_control_folder} ${mcu_plus_sdk_url}
+    install_ind_comms_sdk  ${ind_comms_sdk_version} ${platform} ${motor_control_folder} ${ind_comms_sdk_url}
     if [ "$skip_nodejs" == "false" ]; then
         install_nodejs  ${NODEJS_VERSION} ${motor_control_folder}
     fi

releases/09_00_00/am263x/download_components.sh

@@ -60,11 +60,20 @@ clang_url_folder="${CGT_TI_ARM_CLANG_VERSION}.${CGT_TI_ARM_CLANG_VERSION_SUFFIX}
 clang_install_folder="ti-cgt-armllvm_${CGT_TI_ARM_CLANG_VERSION}.${CGT_TI_ARM_CLANG_VERSION_SUFFIX}"
 clang_install_file="ti_cgt_armllvm_${CGT_TI_ARM_CLANG_VERSION}.${CGT_TI_ARM_CLANG_VERSION_SUFFIX}_linux-x64_installer.bin"
 
-
 # MCU + SDK
+mcu_plus_sdk_url=${MCU_PLUS_SDK_AM263X_RELEASE_URL}
 mcu_sdk_version="${MCU_PLUS_SDK_AM263X}"
+
+# IND COMMS SDK
+ind_comms_sdk_url="${IND_COMMS_SDK_AM263X_RC_URL}"
+ind_comms_sdk_version="${IND_COMMS_SDK_AM263X}"
+
 platform="am263x"
 
+# RTLibs
+rtlibs_script_file="sitara-mcsdk-release.py"
+rtlibs_generated_folder="temp_sitara_mcsdk"
+
 if [ "${OS}" = "Windows_NT" ]; then
     echo "Installing windows packages"
     #TODO
@@ -72,7 +81,8 @@ else
     install_ccs     ${CCS_VERSION} ${install_dir}
     #install_clang   ${CGT_TI_ARM_CLANG_VERSION} ${clang_url_folder} ${clang_install_folder} ${clang_install_file} ${install_dir}
     install_syscfg  ${SYSCFG_VERSION} ${install_dir}
-    #install_mcu_plus_sdk  ${mcu_sdk_version} ${platform} ${motor_control_folder}
+    install_mcu_plus_sdk  ${mcu_sdk_version} ${platform} ${motor_control_folder} ${mcu_plus_sdk_url}
+    install_ind_comms_sdk  ${ind_comms_sdk_version} ${platform} ${motor_control_folder} ${ind_comms_sdk_url}
     if [ "$skip_nodejs" == "false" ]; then
         install_nodejs  ${NODEJS_VERSION} ${motor_control_folder}
     fi

releases/09_00_00/am64x/download_components.sh

@@ -65,11 +65,20 @@ clang_url_folder="${CGT_TI_ARM_CLANG_VERSION}.${CGT_TI_ARM_CLANG_VERSION_SUFFIX}
 clang_install_folder="ti-cgt-armllvm_${CGT_TI_ARM_CLANG_VERSION}.${CGT_TI_ARM_CLANG_VERSION_SUFFIX}"
 clang_install_file="ti_cgt_armllvm_${CGT_TI_ARM_CLANG_VERSION}.${CGT_TI_ARM_CLANG_VERSION_SUFFIX}_linux-x64_installer.bin"
 
-
 # MCU + SDK
+mcu_plus_sdk_url="${MCU_PLUS_SDK_AM64X_RELEASE_URL}"
 mcu_sdk_version="${MCU_PLUS_SDK_AM64X}"
+
+# IND COMMS SDK
+ind_comms_sdk_url="${IND_COMMS_SDK_AM64X_RC_URL}"
+ind_comms_sdk_version="${IND_COMMS_SDK_AM64X}"
+
 platform="am64x"
 
+# RTLibs
+rtlibs_script_file="sitara-mcsdk-release.py"
+rtlibs_generated_folder="temp_sitara_mcsdk"
+
 if [ "${OS}" = "Windows_NT" ]; then
     echo "Installing windows packages"
     #TODO
@@ -79,7 +88,8 @@ else
     install_gcc_aarch64 ${GCC_AARCH64_VERSION} ${gcc_aarch64_install_folder} ${gcc_aarch64_download_file} ${install_dir}
     install_gcc_arm     ${GCC_ARM_VERSION}     ${gcc_arm_install_folder}     ${gcc_arm_download_file}     ${install_dir} ${GCC_ARM_VERSION_FOLDER}
     install_syscfg  ${SYSCFG_VERSION} ${install_dir}
-    #install_mcu_plus_sdk  ${mcu_sdk_version} ${platform} ${motor_control_folder}
+    install_mcu_plus_sdk  ${mcu_sdk_version} ${platform} ${motor_control_folder} ${mcu_plus_sdk_url}
+    install_ind_comms_sdk  ${ind_comms_sdk_version} ${platform} ${motor_control_folder} ${ind_comms_sdk_url}
     if [ "$skip_nodejs" == "false" ]; then
         install_nodejs  ${NODEJS_VERSION} ${motor_control_folder}
     fi

scripts/common.sh

@@ -243,22 +243,22 @@ install_mcu_plus_sdk() {
     local version=$1
     local platform=$2
     local install_dir=$3
+    local mcu_plus_sdk_url=$4
     local version_underscore=`echo ${version} | sed -e "s|\.|_|g"`
-	local mcu_plus_sdk_url="http://mcupnas.dhcp.ti.com/release_area/nightly_builds/mcu_plus_sdk_${platform}_nightly/latest/artifacts/output/webgen/exports"
+    local mcu_plus_sdk_download_file="mcu_plus_sdk_${platform}_${version_underscore}-linux-x64-installer.run"
-	local mcu_plus_sdk_download_file="mcu_plus_sdk_${platform}_${version_underscore}-linux-x64-installer.run"
 
     echo "[mcu_plus_sdk_${platform}_${version_underscore}] Checking ..."
 
-    if [ ! -d ./motor_control_sdk/mcu_plus_sdk_${platform}_${version_underscore} ]
+    if [ ! -d "${install_dir}"/mcu_plus_sdk_${platform}_${version_underscore} ]
     then
         echo "[ mcu_plus_sdk_${platform}_${version_underscore} ]  Downloading ..."
-        wget ${mcu_plus_sdk_url}/${mcu_plus_sdk_download_file} 1>/dev/null
+        wget -q ${mcu_plus_sdk_url}/${mcu_plus_sdk_download_file} 1>/dev/null
         chmod +x ${mcu_plus_sdk_download_file}
         echo "[ mcu_plus_sdk_${platform}_${version_underscore} ]  Installing ..."
-        ./${mcu_plus_sdk_download_file} --mode unattended --prefix ./motor_control_sdk
+        ./${mcu_plus_sdk_download_file} --mode unattended --prefix ${install_dir}
         # Remove version value from MCU + SDK installation path
-        pushd motor_control_sdk
+        pushd ${install_dir}
-        mv mcu_plus_sdk_${platform}_${version_underscore} mcu_plus_sdk
+        mv mcu_plus_sdk_${platform}_${version_underscore} mcu_plus_sdk 1>/dev/null
         popd
         #Clean-up
         rm ${mcu_plus_sdk_download_file} 1>/dev/null
@@ -267,6 +267,38 @@ install_mcu_plus_sdk() {
     echo
 }
 
+install_ind_comms_sdk() {
+    local version=$1
+    local platform=$2
+    local install_dir=$3
+    local ind_comms_sdk_url=$4
+    local version_underscore=`echo ${version} | sed -e "s|\.|_|g"`
+    local ind_comms_sdk_download_file="ind_comms_sdk_${platform}_${version_underscore}-linux-x64-installer.run"
+
+    echo "[ind_comms_sdk_${platform}_${version_underscore}] Checking ..."
+
+    if [ ! -d "${install_dir}"/ind_comms_sdk_${platform}_${version_underscore} ]
+    then
+        echo "[ ind_comms_sdk_${platform}_${version_underscore} ]  Downloading ..."
+        wget -q ${ind_comms_sdk_url}/${ind_comms_sdk_download_file} 1>/dev/null
+        chmod +x ${ind_comms_sdk_download_file}
+        echo "[ ind_comms_sdk_${platform}_${version_underscore} ]  Installing ..."
+        ./${ind_comms_sdk_download_file} --mode unattended --prefix ${install_dir}
+        # Remove version value from MCU + SDK installation path
+        pushd ${install_dir}
+        mv ind_comms_sdk_${platform}_${version_underscore} ind_comms_sdk 1>/dev/null
+        popd
+        pushd ${install_dir}/ind_comms_sdk 1>/dev/null
+        rm -rf mcu_plus_sdk 1>/dev/null
+        ln -s ../mcu_plus_sdk mcu_plus_sdk 1>/dev/null
+        popd
+        #Clean-up
+        rm ${ind_comms_sdk_download_file} 1>/dev/null
+        echo "[ ind_comms_sdk_${platform}_${version_underscore} ]  Done ..."
+    fi
+    echo
+}
+
 #
 # This function is used to replace the tag/reference in a repo manifest file
 #