Merge remote-tracking branch 'origin/rel-v2024.1' into langdale

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

1 files changed, 49 insertions, 37 deletions

diff --git a/README.building.md b/README.building.md
index 7ffc1ab3..456aa634 100644
--- a/README.building.md
+++ b/README.building.md
@@ -17,13 +17,22 @@ $ cd sources
 > **Note:**
 > * *release_branch:* refers to upstream stable release branch.
 > * *rel-version:* refers to amd xilinx release version.
+
 ```
 $ mkdir sources
 $ git clone -b <release-branch> https://git.yoctoproject.org/poky.git
 $ git clone -b <release-branch> https://git.openembedded.org/meta-openembedded.git
-$ git clone -b <rel-version> https://github.com/Xilinx/meta-xilinx.git
+$ git clone -b <release-branch> https://git.yoctoproject.org/git/meta-virtualization
+$ git clone -b <rel-version> https://github.com/Xilinx/meta-xilinx.git --recurse-submodules
 $ git clone -b <rel-version> https://github.com/Xilinx/meta-xilinx-tools.git
 ```
+> **Note:**
+> * When meta-xilinx layer is cloned using git tool by default it will clone
+> [gen-machine-conf](https://github.com/Xilinx/gen-machine-conf.git) repo as
+> submodules, If you don't need to clone gen-machine-conf repo then remove
+> `--recurse-submodules` option.
+> * Skip this step if you are using yocto-manifests https://github.com/Xilinx/yocto-manifests
+
 3. Initialize a build environment using the `oe-init-build-env` script. 
 ```
 $ source poky/oe-init-build-env
@@ -39,7 +48,8 @@ $ bitbake-layers add-layer ./<path-to-layer>/meta-openembedded/meta-oe
 $ bitbake-layers add-layer ./<path-to-layer>/meta-openembedded/meta-python
 $ bitbake-layers add-layer ./<path-to-layer>/meta-openembedded/meta-filesystems
 $ bitbake-layers add-layer ./<path-to-layer>/meta-openembedded/meta-networking
-$ bitbake-layers add-layer ./<path-to-layer>/meta-xilinx/meta-microbalze
+$ bitbake-layers add-layer ./<path-to-layer>/meta-virtualization
+$ bitbake-layers add-layer ./<path-to-layer>/meta-xilinx/meta-microblaze
 $ bitbake-layers add-layer ./<path-to-layer>/meta-xilinx/meta-xilinx-core
 $ bitbake-layers add-layer ./<path-to-layer>/meta-xilinx/meta-xilinx-standalone
 $ bitbake-layers add-layer ./<path-to-layer>/meta-xilinx/meta-xilinx-bsp
@@ -55,45 +65,47 @@ $ bitbake-layers add-layer ./<path-to-layer>/meta-xilinx-tools
 ```
 MACHINE = "<target_machine_name>"
 ```
-Available target machines are:
-
-| Device     | target machines     |
-|------------|---------------------|
-| MicroBlaze | microblaze-generic  |
-|            | ac701-microblazeel  |
-|            | kc705-microblazeel  |
-|            | kcu105-microblazeel |
-|            | vcu118-microblazeel |
-| Zynq-7000  | zynq-generic        |
-|            | zc702-zynq7         |
-|            | zc706-zynq7         |
-| ZynqMP     | zynqmp-generic      |
-|            | zcu102-zynqmp       |
-|            | zcu104-zynqmp       |
-|            | zcu106-zynqmp       |
-|            | zcu111-zynqmp       |
-|            | zcu208-zynqmp       |
-|            | zcu216-zynqmp       |
-|            | zcu670-zynqmp       |
-|            | zcu1275-zynqmp      |
-|            | zcu1285-zynqmp      |
-|            | ultra96-zynqmp      |
-| Versal     | versal-generic      |
-|            | versal-net-generic  |
-|            | vck190-versal       |
-|            | vmk180-versal       |
-|            | vek280-versal       |
-|            | vpk120-versal       |
-|            | vpk180-versal       |
-|            | vhk158-versal       |
-
-6. Build an OS image for the target using `bitbake` command.
+* For list of available target machines see meta layer README files.
+
+ * [meta-xilinx-bsp README](https://github.com/Xilinx/meta-xilinx/tree/master/meta-xilinx-bsp#amd-xilinx-evaluation-boards-bsp-machines-files)
+ * [meta-kria README](https://github.com/Xilinx/meta-xilinx/tree/master/meta-xilinx-bsp#amd-xilinx-evaluation-boards-bsp-machines-files)
+
+6. For NFS build host system modify the build/conf/local.conf and add TMPDIR
+   path as shown below. On local storage $TMPDIR will be set to build/tmp
+```
+TMPDIR = "/tmp/$USER/yocto/release_version/build"
+```
+
+7. Modify the build/conf/local.conf file to add wic image to default target
+   image as shown below.
+```
+IMAGE_FSTYPES += "wic"
+WKS_FILES = "xilinx-default-sd.wks"
+```
+
+8. Build the qemu-helper-native package to setup QEMU network tap devices.
+```
+$ bitbake qemu-helper-native
+```
+
+9. Manually configure a tap interface for your build system. As root run
+   <path-to>/sources/poky/scripts/runqemu-gen-tapdevs, which should generate a
+   list of tap devices. Once tap interfaces are successfully create you should
+   be able to see all the interfaces by running ifconfig command.
+
+```
+$ sudo ./<path-to-layer>/poky/scripts/runqemu-gen-tapdevs $(id -u $USER) $(id -g $USER) 4 tmp/sysroots-components/x86_64/qemu-helper-native/usr/bin
+```
+
+10. Build an OS image for the target using `bitbake` command.
 > **Note:** Refer ./<path-to-distro-layer>/conf/templates/default/conf-notes.txt
-> for available target image-name. e.g. core-image-minimal
+> for available target image-name. e.g. core-image-minimal or petalinux-image-minimal
 
 ```
-$ bitbake <image-name>
+$ bitbake <target-image>
 ```
 
 7. Once complete the images for the target machine will be available in the output
    directory `${TMPDIR}/deploy/images/${MACHINE}/`.
+
+8. Follow [Booting Instructions](https://github.com/Xilinx/meta-xilinx/blob/master/README.booting.md)