Patch 3 (#2617)

Author: austino1976

src/CMake/config/postinst-aws.in

@@ -36,6 +36,11 @@ if [ $? -eq 1 ]; then
     fi
 fi
 
+#Move the /opt/xilinx/xrt/lib/libxrt_aws.so out of way so that sw/hw emulation can work
+#In the future, this .so file, as well as aws shim related src code will be removed. We keep/rename
+#it so far in case somebody still requires it
+mv /opt/xilinx/xrt/lib/libxrt_aws.so /opt/xilinx/xrt/lib/libxrt_aws.so.bak > /dev/null 2>&1
+
 #create sym link to /opt/xilinx/xrt/lib/libmpd_plugin and restart mpd service
 echo "Install aws mpd plugin"
 rm -rf /opt/xilinx/xrt/lib/libmpd_plugin.so > /dev/null 2>&1

src/runtime_src/ert/CMakeLists.txt

@@ -1,5 +1,4 @@
-if ((EXISTS /tools/batonroot/rodin/devkits) AND (${XRT_NATIVE_BUILD} STREQUAL "yes") AND (${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86_64"))
-
+if (((EXISTS /tools/batonroot/rodin/devkits) AND (${XRT_NATIVE_BUILD} STREQUAL "yes") AND (${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86_64")) OR ((DEFINED ENV{AWS_FPGA_REPO_DIR}) AND (EXISTS $ENV{XILINX_VITIS}/gnu/microblaze/lin)))
 message("-- Rodin devkits found, preparing ERT build")
 
 set(ERT_INSTALL_PREFIX "/opt/xilinx/xrt/share/fw")

src/runtime_src/ert/ert.mk

@@ -2,6 +2,13 @@ RDI_DEVKITS_HOME := /tools/batonroot/rodin/devkits
 MB_HOME := $(RDI_DEVKITS_HOME)/lnx64/cross/RHEL6/microblaze/lin
 MB_PREFIX := mb-
 
+ifdef AWS_FPGA_REPO_DIR
+ifndef XILINX_VITIS
+  $(error  Environment variable XILINX_VITIS should point to Vitis install area)
+endif
+  MB_HOME := $(XILINX_VITIS)/gnu/microblaze/lin
+endif
+
 CFLAGS   := -c -Wall -mlittle-endian -mxl-soft-mul -mcpu=v10.0
 LFLAGS   := -mlittle-endian -Wl,--no-relax,--gc-sections