HDK 1.4.7 updates. (#452)

AWSaalluri · kristopk · commit a9c3a00d78cf · 2019-02-11T17:14:38.000-06:00
diff --git a/FAQs.md b/FAQs.md
@@ -281,7 +281,7 @@ Neither, no FPGA internal design code is exposed. AWS Marketplace customers that
 ## F1 Instance and Runtime Tools FAQs
 **Q: What OS can run on the F1 instance?**
 
-Amazon Linux 2016.09 and CentOS 7.3 are supported and tested on AWS EC2 F1 instance. Developers can utilize the source code in the SDK directory to compile other variants of Linux for use on F1. Windows OSs are not supported on F1.
+CentOS 7.x is supported and tested on AWS EC2 F1 instance. Please see [release notes](./RELEASE_NOTES.md) for a description of compatible kernel & OS versions supported by a specific Developer kit version.  Developers can utilize the source code in the SDK directory to compile other variants of Linux for use on F1. Windows OSs are not supported on F1.
 
 
 **Q: What are the interfaces between the F1 instance host CPU and the FPGAs?**
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -26,6 +26,19 @@
          *    1 DDR controller implemented in the SH (always available)
          *    3 DDR controllers implemented in the CL (configurable number of implemented controllers allowed)
 
+## Release 1.4.7 (See [ERRATA](./ERRATA.md) for unsupported features)
+
+  * Adds [Xilinx Runtime (XRT)](https://github.com/Xilinx/XRT/releases/tag/2018.2_XDF.RC5) Support for Linux kernel 3.10.0-957.1.3.el7.x86_64 & Centos 7.6
+  * Package versions used to validate SDAccel runtime
+  
+   | Package | AMI 1.5.0 [SDx 2018.2] | AMI 1.4.0 [SDx 2017.4] |
+   |---------|------------------------|------------------------|
+   | OS      | Centos 7.5, 7.6 | Centos 7.4 |
+   | kernel  | 3.10.0-862.11.6.el7.x86_64, 3.10.0-957.1.3.el7.x86_64  | 3.10.0-693.21.1.el7.x86_64 |
+   | kernel-devel | 3.10.0-862.11.6.el7.x86_64, 3.10.0-957.1.3.el7.x86_64 | 3.10.0-693.21.1.el7.x86_64 |
+   | LIBSTDC++ | libstdc++-4.8.5-36.el7.x86_64 | libstdc++-4.8.5-16.el7_4.2.x86_64 |
+
+
 ## Release 1.4.6 (See [ERRATA](./ERRATA.md) for unsupported features)
 
   * Fixes SDx 2018.2 [missing profile report items in SDAccel](https://forums.aws.amazon.com/thread.jspa?threadID=293541&tstart=0)
diff --git a/SDAccel/docs/On_Premises_Development_Steps.md b/SDAccel/docs/On_Premises_Development_Steps.md
@@ -18,7 +18,7 @@ Before going through the steps described in this document, the user should have
 * SDAccel is supported on the following 64-bit Linux Operating Systems only:
    * 2018.2
       * Red Hat Enterprise Linux 7.3, 7.4		 
-      * CentOS 7.3, 7.4		 
+      * CentOS 7.3, 7.4, 7.5, 7.6		 
       * Ubuntu Linux 16.04.3 LTS (Linux kernel 4.4.0)
       * More information can be found at https://www.xilinx.com/support/documentation/sw_manuals/xilinx2018_2/ug1238-sdx-rnil.pdf
    * 2017.4
diff --git a/SDAccel/kernel_version.txt b/SDAccel/kernel_version.txt
@@ -1,2 +1,3 @@
 3.10.0-862.11.6.el7.x86_64
 3.10.0-693.21.1.el7.x86_64
+3.10.0-957.1.3.el7.x86_64
diff --git a/SDAccel/sdaccel_xrt_version.txt b/SDAccel/sdaccel_xrt_version.txt
@@ -1 +1,2 @@
 343186f76f59edd01bc48d84cf67fe22a0a3f338
+65ffad62f427c0bd1bc65b6ea555a810295468b7
diff --git a/hdk/README.md b/hdk/README.md
@@ -312,6 +312,8 @@ Now, you can verify that the AFI was loaded properly.  The output shows the FPGA
 <a name="step6"></a>
 #### Step 6. Validating using the CL Example Software
 
+Developers using AMI 1.5.0 or Later Instances that come with pre-installed Xilinx Runtime Environment (XRT) should [refer to this note](../sdk/linux_kernel_drivers/xdma/xdma_install.md#xdmainstallfail) before installing XDMA driver.
+
 Each CL Example comes with a runtime software under `$CL_DIR/software/runtime/` subdirectory. You will need to build the runtime application that matches your loaded AFI.   
 
 ```
diff --git a/hdk/docs/SDxPatch_AR71715_and_XRT_installation_instructions.md b/hdk/docs/SDxPatch_AR71715_and_XRT_installation_instructions.md
@@ -65,4 +65,24 @@
    sudo yum reinstall -y xrt_201802.2.1.0_7.5.1804-xrt.rpm
    sudo yum reinstall -y xrt_201802.2.1.0_7.5.1804-aws.rpm
    
-  ``` 
+  ```
+
+# Installing Xilinx Runtime (XRT) 2018.2_XDF.RC5
+   
+  Instructions to install XRT on Centos/RedHat & Ubuntu/Debian can be found [here](https://www.xilinx.com/html_docs/xilinx2018_2_xdf/sdaccel_doc/ejy1538090924727.html).
+  
+  Xilinx Runtime (XRT) 2018.2_XDF.RC5 release can be found [here](https://github.com/Xilinx/XRT/releases/tag/2018.2_XDF.RC5)
+  
+  ### Centos/RedHat Linux
+  
+  Run following commands to download and install XRT 2018.2_XDF.RC4 for 'Centos/RHEL' based distributions
+  
+  ```
+   curl -s https://s3.amazonaws.com/aws-fpga-developer-ami/1.5.0/Patches/XRT_2018_2_XDF_RC5/xrt_201802.2.1.0_7.5.1804-xrt.rpm -o xrt_201802.2.1.0_7.5.1804-xrt.rpm
+   curl -s https://s3.amazonaws.com/aws-fpga-developer-ami/1.5.0/Patches/XRT_2018_2_XDF_RC5/xrt_201802.2.1.0_7.5.1804-aws.rpm -o xrt_201802.2.1.0_7.5.1804-aws.rpm
+   sudo yum reinstall -y xrt_201802.2.1.0_7.5.1804-xrt.rpm
+   sudo yum reinstall -y xrt_201802.2.1.0_7.5.1804-aws.rpm
+   
+  ```
+
+ 
diff --git a/hdk/hdk_version.txt b/hdk/hdk_version.txt
@@ -1 +1 @@
-HDK_VERSION=1.4.6
+HDK_VERSION=1.4.7
diff --git a/sdaccel_runtime_setup.sh b/sdaccel_runtime_setup.sh
@@ -63,12 +63,12 @@ function help {
 }
 
 function xrt_install_instructions_2018_2 {
-    err_msg "AWS recommended XRT version release: https://github.com/Xilinx/XRT/releases/tag/2018.2_XDF.RC4"
+    err_msg "AWS recommended XRT version release: https://github.com/Xilinx/XRT/releases/tag/2018.2_XDF.RC5"
     err_msg "refer to following link for instructions to install XRT"
     err_msg "https://www.xilinx.com/html_docs/xilinx2018_2_xdf/sdaccel_doc/ejy1538090924727.html"
     err_msg "use following command to download and install latest validated XRT rpms for centos distributions"
-    err_msg "curl -s https://s3.amazonaws.com/aws-fpga-developer-ami/1.5.0/Patches/xrt_201802.2.1.0_7.5.1804-xrt.rpm -o xrt_201802.2.1.0_7.5.1804-xrt.rpm"
-    err_msg "curl -s https://s3.amazonaws.com/aws-fpga-developer-ami/1.5.0/Patches/xrt_201802.2.1.0_7.5.1804-aws.rpm -o xrt_201802.2.1.0_7.5.1804-aws.rpm"
+    err_msg "curl -s https://s3.amazonaws.com/aws-fpga-developer-ami/1.5.0/Patches/XRT_2018_2_XDF_RC5/xrt_201802.2.1.0_7.5.1804-xrt.rpm -o xrt_201802.2.1.0_7.5.1804-xrt.rpm"
+    err_msg "curl -s https://s3.amazonaws.com/aws-fpga-developer-ami/1.5.0/Patches/XRT_2018_2_XDF_RC5/xrt_201802.2.1.0_7.5.1804-aws.rpm -o xrt_201802.2.1.0_7.5.1804-aws.rpm"
     err_msg "sudo yum reinstall -y xrt_*-xrt.rpm"
     err_msg "sudo yum reinstall -y xrt_*-aws.rpm"
 }
diff --git a/shared/tests/bin/setup_test_xrtpatch.sh b/shared/tests/bin/setup_test_xrtpatch.sh
@@ -29,11 +29,12 @@ script_dir=$(dirname $full_script)
 
 s3_ami_bucket=aws-fpga-developer-ami
 s3_ami_version=1.5.0
+xrt_release_version=XRT_2018_2_XDF_RC5
 xrt_rpm_name=xrt_201802.2.1.0_7.5.1804-xrt.rpm
 aws_xrt_rpm_name=xrt_201802.2.1.0_7.5.1804-aws.rpm
 
-xrt_rpm_path=$s3_ami_bucket/$s3_ami_version/Patches/$xrt_rpm_name
-aws_xrt_rpm_path=$s3_ami_bucket/$s3_ami_version/Patches/$aws_xrt_rpm_name
+xrt_rpm_path=$s3_ami_bucket/$s3_ami_version/Patches/$xrt_release_version/$xrt_rpm_name
+aws_xrt_rpm_path=$s3_ami_bucket/$s3_ami_version/Patches/$xrt_release_version/$aws_xrt_rpm_name
 
 VIVADO_TOOL_VERSION=`vivado -version | grep Vivado | head -1 | sed 's:Vivado *::' | sed 's: .*$::' | sed 's:v::'`
 export VIVADO_TOOL_VERSION=${VIVADO_TOOL_VERSION:0:6}

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`3.10.0-862.11.6.el7.x86_64`
`2`	`2`	`3.10.0-693.21.1.el7.x86_64`
	`3`	`+3.10.0-957.1.3.el7.x86_64`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`343186f76f59edd01bc48d84cf67fe22a0a3f338`
	`2`	`+65ffad62f427c0bd1bc65b6ea555a810295468b7`