Merge remote-tracking branch 'origin/scarthgap' into yocto-master

This moves the system to scarthgap.  It is known to NOT work with Styhead and master,

Signed-off-by: Mark Hatle <mark.hatle@amd.com>

4 files changed, 88 insertions, 35 deletions

diff --git a/docs/README.booting.microblaze.md b/docs/README.booting.microblaze.md
index 91c0eda9..21bd1dad 100644
--- a/docs/README.booting.microblaze.md
+++ b/docs/README.booting.microblaze.md
@@ -2,18 +2,20 @@
 
 Booting OS images on MicroBlaze target boards can be done using JTAG and QSPI boot modes.
 
-* [Setting Up the Target](#setting-up-the-target)
-* [Booting from JTAG](#booting-from-jtag)
-  * [Sourcing the XSDB tools](#sourcing-the-xsdb-tools)
-  * [Deploying the images to target](#deploying-the-images-to-target)
-    * [Using devtool boot-jtag script](#using-devtool-boot-jtag-script)
-    * [Manually executing xsdb commands](#manually-executing-xsdb-commands)
-      * [Loading Bitstream using XSDB](#loading-bitstream-using-xsdb)
-      * [Loading U-boot using XSDB](#loading-u-boot-using-xsdb)
-      * [Loading Kernel, Device tree, Root Filesystem and U-boot boot script](#loading-kernel-device-tree-root-filesystem-and-u-boot-boot-script)
-        * [Using XSDB](#using-xsdb)
-        * [Using TFTP](#using-tftp)
-      * [Booting Linux](#booting-linux)
+- [Booting OS Images on MicroBlaze target boards](#booting-os-images-on-microblaze-target-boards)
+  - [Setting Up the Target](#setting-up-the-target)
+  - [Booting from JTAG](#booting-from-jtag)
+    - [Sourcing the XSDB tools](#sourcing-the-xsdb-tools)
+    - [Deploying the images to target](#deploying-the-images-to-target)
+      - [Using devtool boot-jtag script](#using-devtool-boot-jtag-script)
+      - [Manually executing xsdb commands](#manually-executing-xsdb-commands)
+        - [Loading Bitstream using XSDB](#loading-bitstream-using-xsdb)
+        - [Loading U-boot using XSDB](#loading-u-boot-using-xsdb)
+        - [Loading Kernel, Device tree, Root Filesystem and U-boot boot script](#loading-kernel-device-tree-root-filesystem-and-u-boot-boot-script)
+          - [Using XSDB](#using-xsdb)
+          - [Using TFTP](#using-tftp)
+        - [Booting Linux](#booting-linux)
+  - [Limitation](#limitation)
 
 ## Setting Up the Target
 
@@ -195,3 +197,27 @@ xsdb% exit
 ```
 U-Boot> boot
 ```
+
+## Limitation
+
+1. Booting core-image-minimal or other image target excluding
+   petalinux-image-minimal you can observe below error message.
+
+```
+Error: argument "/en*" is wrong: "dev" not a valid ifname
+Starting syslogd/klogd: done
+
+Poky (Yocto Project Reference Distro) 5.0.2 kcu105-microblazeel ttyUL0
+
+INIT: Id "1" respawning too fast: disabled for 5 minutes
+
+kcu105-microblazeel login:
+```
+
+This is due to pni-names distro feature is not enabled by default and eudev uses
+classic network interface naming scheme. To resolve this issue add pni-names
+distro feature from <distro>.conf or local.file.
+
+```
+DISTRO_FEATURES:append:microblaze = " pni-names"
+```
\ No newline at end of file
diff --git a/docs/README.booting.zynq.md b/docs/README.booting.zynq.md
index 28aad78f..660cc64f 100644
--- a/docs/README.booting.zynq.md
+++ b/docs/README.booting.zynq.md
@@ -3,19 +3,21 @@
 Booting OS images on Zynq boards can be done using JTAG, SD, eMMC, QSPI and NAND
 boot modes.
 
-* [Setting Up the Target](#setting-up-the-target)
-* [Booting from JTAG](#booting-from-jtag)
-  * [Sourcing the XSDB tools](#sourcing-the-xsdb-tools)
-  * [Deploying the images to target](#deploying-the-images-to-target)
-    * [Using devtool boot-jtag script](#using-devtool-boot-jtag-script)
-    * [Manually executing xsdb commands](#manually-executing-xsdb-commands)
-      * [Loading boot components using XSDB](#loading-boot-components-using-xsdb)
-      * [Loading Kernel, Root Filesystem and U-boot boot script](#loading-kernel-root-filesystem-and-u-boot-boot-script)
-        * [Using XSDB](#using-xsdb)
-        * [Using TFTP](#using-tftp)
-      * [Booting Linux](#booting-linux)
-* [Booting from SD](#booting-from-sd)
-* [Booting from QSPI](#booting-from-qspi)
+- [Booting OS Images on Zynq target boards](#booting-os-images-on-zynq-target-boards)
+  - [Setting Up the Target](#setting-up-the-target)
+  - [Booting from JTAG](#booting-from-jtag)
+    - [Sourcing the XSDB tools](#sourcing-the-xsdb-tools)
+    - [Deploying the images to target](#deploying-the-images-to-target)
+      - [Using devtool boot-jtag script](#using-devtool-boot-jtag-script)
+      - [Manually executing xsdb commands](#manually-executing-xsdb-commands)
+        - [Loading boot components using XSDB](#loading-boot-components-using-xsdb)
+        - [Loading Kernel, Root Filesystem and U-boot boot script](#loading-kernel-root-filesystem-and-u-boot-boot-script)
+          - [Using XSDB](#using-xsdb)
+          - [Using TFTP](#using-tftp)
+        - [Booting Linux](#booting-linux)
+  - [Booting from SD](#booting-from-sd)
+  - [Booting from QSPI](#booting-from-qspi)
+  - [Limitation](#limitation)
 
 ## Setting Up the Target
 1. Connect a USB cable between the CP210x USB-to-UART bridge USB Mini-B on
@@ -214,7 +216,7 @@ U-Boot> boot
 ---
 ## Booting from QSPI
 
-1. To boot ZC702 board in QSPI boot mode, Power on the ZCU102 board and boot 
+1. To boot ZC702 board in QSPI boot mode, Power on the ZC702 board and boot
    using JTAG or SD boot mode, to ensure that U-Boot is running and also have 
    boot.bin copied to DDR location using XSDB `dow` or `tftpboot` or `fatload`
    command.
@@ -222,3 +224,25 @@ U-Boot> boot
 3. After flashing the images, turn off the power switch on the board, and change
    the SW16 boot mode pin settings to QSPI boot mode (1-OFF, 2-ON, 3-OFF, 4-OFF, 5-OFF)
    by setting the SW16. Refer [Setting Up the Target](#setting-up-the-target).
+
+## Limitation
+
+1. Booting core-image-minimal or other image target excluding
+   petalinux-image-minimal you can observe below error message.
+
+```
+Error: argument "/en*" is wrong: "dev" not a valid ifname
+Starting syslogd/klogd: done
+
+Poky (Yocto Project Reference Distro) 5.0.2 zc702-zynq7 ttyPS0
+
+zc702-zynq7 login:
+```
+
+This is due to pni-names distro feature is not enabled by default and eudev uses
+classic network interface naming scheme. To resolve this issue add pni-names
+distro feature from <distro>.conf or local.file.
+
+```
+DISTRO_FEATURES:append:zynq = " pni-names"
+```
diff --git a/docs/README.dfx.user.dts.md b/docs/README.dfx.user.dts.md
index 9caf866e..09e68be5 100644
--- a/docs/README.dfx.user.dts.md
+++ b/docs/README.dfx.user.dts.md
@@ -283,7 +283,7 @@ SRC_URI = " \
 
 1. Follow SDT or XSCT Build instructions whichever build method is used but not
    both.
-    a. [SDT Building Instructions](../meta-xilinx-standalone-experimental/README.md) upto step 4.
+    a. [SDT Building Instructions](../meta-xilinx-standalone-sdt/README.md) upto step 4.
     b. [XSCT Building Instructions](../README.building.md)
        upto step 4.b (With SDT overlay).
 2. Create recipes-firmware directory in meta layer and copy the .bit/bin/pdi,
@@ -326,7 +326,7 @@ IMAGE_INSTALL:append = " \
 ```
 6. Follow SDT or XSCT Build instructions whichever build method is used but not
    both.
-    a. [SDT Building Instructions](../meta-xilinx-standalone-experimental/README.md ) and continue from step 5.
+    a. [SDT Building Instructions](../meta-xilinx-standalone-sdt/README.md ) and continue from step 5.
     b. [XSCT Building Instructions](../README.building.md)
        and continue from step 5.
 7. Once images are built firmware app files will be installed on target_rootfs.
diff --git a/docs/README.fw.package.md b/docs/README.fw.package.md
index a7e54402..696687d6 100644
--- a/docs/README.fw.package.md
+++ b/docs/README.fw.package.md
@@ -1,4 +1,4 @@
-# How to package and depoly firmware elf or bin to linux root filesystem
+# How to package and deploy firmware elf or bin to linux root filesystem
 
 * [Introduction](#introduction)
 * [How to create and install firmware package recipe](#how-to-create-and-install-firmware-package-recipe)
@@ -14,16 +14,19 @@ filesystem.
 
 ## How to create and install firmware package recipe
 
-1. Follow [SDT Building Instructions](../meta-xilinx-standalone-experimental/README.md ) upto step 4.
+1. Follow [SDT Mulitconfig Building Instructions](../meta-xilinx-standalone-sdt/README.sdt.mc.build.md)
+   upto step 3.
 
 2. Create recipes-firmware directory in distribution meta layer.
 ```
 $ mkdir -p <meta-layer>/recipes-firmware/<firmware-package-name>/
 ```
+
 3. Now create the recipes firmware package using recipetool.
 ```
 $ recipetool create -o <meta-layer>/recipes-firmware/<firmware-package-name>/firmware-package-name.bb 
 ```
+
 4. Modify the recipe and inherit fw-package bbclass as shown below.
 
 > **Note:** 
@@ -33,9 +36,9 @@ $ recipetool create -o <meta-layer>/recipes-firmware/<firmware-package-name>/fir
 > * **FW_NAME:** Variable to define firmware baremetal or freertos application
 >                recipe name.
 > * **TARGET_MC:** Variable to define one of the multiconfig target name
->                  (ex: cortexr5-0-zynqmp-baremetal) from the BBMULTICONFIG list
->                  generated at [SDT Building Instructions](../meta-xilinx-standalone-experimental/README.md )
->                  step 4.
+>                  (ex: <soc-family>-<board-name>-sdt-<design-name>-cortexr5-0-baremetal)
+>                  from the BBMULTICONFIG list generated at [SDT Mulitconfig Building Instructions](../meta-xilinx-standalone-sdt/README.sdt.mc.build.md)
+>                  step 2.
 
 ```
 SUMMARY = "Recipe to package and deploy baremetal or freertos elf or bin to linux rootfs"
@@ -45,7 +48,7 @@ inherit fw-package
 
 FW_NAME = "hello-world"
 
-TARGET_MC = "cortexr5-0-zynqmp-baremetal"
+TARGET_MC = "<soc-family>-<board-name>-sdt-<design-name>-cortexr5-0-baremetal"
 
 FW_MCDEPENDS := "mc::${TARGET_MC}:${FW_NAME}:do_deploy"
 FW_DEPLOY_DIR := "${TOPDIR}/tmp-${TARGET_MC}/deploy/images/${MACHINE}"
@@ -57,5 +60,5 @@ IMAGE_INSTALL:append = " \
     firmware-package-name \
     "
 ```
-6. Follow [SDT Building Instructions](../meta-xilinx-standalone-experimental/README.md ) and continue from
+6. Follow [SDT Building Instructions](../meta-xilinx-standalone-sdt/README.sdt.bsp.md) and continue from
    step 5.