OpenAMP: Remove hard-coding cmake paths and dependencies

As setup script in surrounding Vitis environment now provide both
LD_LIBRARY_PATH and cmake binary setup, remove any logic of
setting up LD_LIBRARY_PATH or pointing to explicit cmake path.

Signed-off-by: Ben Levinsky <[email protected]>
Acked-by: Arun Kannan <[email protected]>

Author: bentheredonethat

ThirdParty/sw_services/libmetal/data/libmetal.tcl

@@ -99,7 +99,6 @@ proc generate {libhandle} {
 			set shared_lib_dir $::env(XILINX_sdk)
 		}
 
-		set ::env(LD_LIBRARY_PATH) "${shared_lib_dir}/tps/lnx64/cmake-3.3.2/libs/Ubuntu/x86_64-linux-gnu/:${ld_lib_path}"
 	}
 
 	# Run cmake to generate make file

ThirdParty/sw_services/libmetal/src/run_cmake

@@ -1,11 +1,2 @@
 #!/bin/bash
-if [ ! -z "${HDI_APPROOT}" ]
-then
-${HDI_APPROOT}/tps/lnx64/cmake-3.3.2/bin/cmake $@ 2>&1
-elif [ ! -z "${XILINX_VITIS}" ]
-then
-${XILINX_VITIS}/tps/lnx64/cmake-3.3.2/bin/cmake $@ 2>&1
-elif [ ! -z "${XILINX_SDK}" ]
-then
-${XILINX_SDK}/tps/lnx64/cmake-3.3.2/bin/cmake $@ 2>&1
-fi
+cmake $@ 2>&1

ThirdParty/sw_services/libmetal/src/run_cmake.bat

@@ -1,8 +1 @@
-if not "%HDI_APPROOT%" == "" (
-%HDI_APPROOT%\tps\win64\cmake-3.3.2\bin\cmake.exe %* 2>&1
-) else (
-if "%XILINX_SDK%"== "" (
-%XILINX_VITIS%\tps\win64\cmake-3.3.2\bin\cmake.exe %* 2>&1
-) else (
-%XILINX_SDK%\tps\win64\cmake-3.3.2\bin\cmake.exe %* 2>&1
-))
+cmake.exe %* 2>&1

ThirdParty/sw_services/openamp/data/openamp.tcl

@@ -123,7 +123,6 @@ proc generate {libhandle} {
 			set shared_lib_dir $::env(XILINX_sdk)
 		}
 
-		set ::env(LD_LIBRARY_PATH) "${shared_lib_dir}/tps/lnx64/cmake-3.3.2/libs/Ubuntu/x86_64-linux-gnu/:${ld_lib_path}"
 	}
 
 	# Run cmake to generate make file

ThirdParty/sw_services/openamp/src/run_cmake

@@ -1,11 +1,2 @@
 #!/bin/bash
-if [ ! -z "${HDI_APPROOT}" ]
-then
-${HDI_APPROOT}/tps/lnx64/cmake-3.3.2/bin/cmake $@ 2>&1
-elif [ ! -z "${XILINX_VITIS}" ]
-then
-${XILINX_VITIS}/tps/lnx64/cmake-3.3.2/bin/cmake $@ 2>&1
-elif [ ! -z "${XILINX_SDK}" ]
-then
-${XILINX_SDK}/tps/lnx64/cmake-3.3.2/bin/cmake $@ 2>&1
-fi
+cmake $@ 2>&1

ThirdParty/sw_services/openamp/src/run_cmake.bat

@@ -1,8 +1 @@
-if not "%HDI_APPROOT%" == "" (
-%HDI_APPROOT%\tps\win64\cmake-3.3.2\bin\cmake.exe %* 2>&1
-) else (
-if "%XILINX_SDK%"== "" (
-%XILINX_VITIS%\tps\win64\cmake-3.3.2\bin\cmake.exe %* 2>&1
-) else (
-%XILINX_SDK%\tps\win64\cmake-3.3.2\bin\cmake.exe %* 2>&1
-))
+cmake.exe %* 2>&1

XilinxProcessorIPLib/drivers/rfdc/data/rfdc.tcl

@@ -656,7 +656,6 @@ proc generate_libmetal {} {
 			set shared_lib_dir $::env(XILINX_sdk)
 		}
 
-		set ::env(LD_LIBRARY_PATH) "${shared_lib_dir}/tps/lnx64/cmake-3.3.2/libs/Ubuntu/x86_64-linux-gnu/:${ld_lib_path}"
 
 		file attributes ${cmake_cmd} -permissions ugo+rx
 		if { [catch {exec ${cmake_cmd} "../src/libmetal" ${cmake_opt}} msg] } {