From 1f350271b4401d69d1595e85ef7ed21cdf7f5062 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Fri, 20 Sep 2024 10:52:25 -0600 Subject: [PATCH] various: meta-xilinx-standalone-experimental renamed to meta-xilinx-standalone-sdt Signed-off-by: Mark Hatle --- README.md | 2 +- docs/README.dfx.user.dts.md | 4 ++-- docs/README.fw.package.md | 6 +++--- meta-xilinx-core/README.md | 4 ++-- .../recipes-openamp/libmetal/libmetal-xlnx_%.bbappend | 2 +- .../recipes-openamp/open-amp/open-amp-xlnx_%.bbappend | 2 +- meta-xilinx-virtualization/README.md | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 428b8cad1..5dea20de0 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ components, kernel etc. * **meta-xilinx-standalone**: layer containing the AMD Xilinx Baremetal or Standalone Toolchains metadata to build baremetal firmware and applications. -* **meta-xilinx-standalone-experimental**: layer containing metadata to build +* **meta-xilinx-standalone-sdt**: layer containing metadata to build all the boot images using lopper and system device tree without using the meta-xilinx-tools layer. diff --git a/docs/README.dfx.user.dts.md b/docs/README.dfx.user.dts.md index 9caf866ee..09e68be52 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 a7e544025..3280dbcd0 100644 --- a/docs/README.fw.package.md +++ b/docs/README.fw.package.md @@ -14,7 +14,7 @@ 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 Building Instructions](../meta-xilinx-standalone-sdt/README.md ) upto step 4. 2. Create recipes-firmware directory in distribution meta layer. ``` @@ -34,7 +34,7 @@ $ recipetool create -o /recipes-firmware//fir > 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 ) +> generated at [SDT Building Instructions](../meta-xilinx-standalone-sdt/README.md ) > step 4. ``` @@ -57,5 +57,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.md ) and continue from step 5. diff --git a/meta-xilinx-core/README.md b/meta-xilinx-core/README.md index ec5b663ba..66dc46dee 100644 --- a/meta-xilinx-core/README.md +++ b/meta-xilinx-core/README.md @@ -36,13 +36,13 @@ Zynqmp-generic requires pmu-firmware. The firmware can be passed directly as a path to a binary: PMU_FILE, you may use the generic built version by including meta-xilinx-standalone, the XSCT version by adding meta-xilinx-tools or the DTB workflow version using -meta-xilinx-standalone-experimental. +meta-xilinx-standalone-sdt. Versal-generic requires both PLM and PSM firmware to be specified. They can be specified as a path to a binary using PLM_FILE and PSM_FILE. Or they can be generated by including meta-xilinx-standalone, the XSCT version by adding meta-xilinx-tools or the DTB workflow version using -meta-xilinx-standalone-experimental. Additionally some configurations may +meta-xilinx-standalone-sdt. Additionally some configurations may require you to specify the path to a PDI file using PDI_PATH. The XSCT version will extract the PDI automatically. --- diff --git a/meta-xilinx-standalone-sdt/recipes-openamp/libmetal/libmetal-xlnx_%.bbappend b/meta-xilinx-standalone-sdt/recipes-openamp/libmetal/libmetal-xlnx_%.bbappend index 5434c9a5b..7147c71eb 100644 --- a/meta-xilinx-standalone-sdt/recipes-openamp/libmetal/libmetal-xlnx_%.bbappend +++ b/meta-xilinx-standalone-sdt/recipes-openamp/libmetal/libmetal-xlnx_%.bbappend @@ -1 +1 @@ -require ${LAYER_PATH_openamp-layer}/vendor/xilinx/meta-xilinx-standalone-experimental/recipes-openamp/libmetal/libmetal-xlnx.inc +require ${LAYER_PATH_openamp-layer}/vendor/xilinx/meta-xilinx-standalone-sdt/recipes-openamp/libmetal/libmetal-xlnx.inc diff --git a/meta-xilinx-standalone-sdt/recipes-openamp/open-amp/open-amp-xlnx_%.bbappend b/meta-xilinx-standalone-sdt/recipes-openamp/open-amp/open-amp-xlnx_%.bbappend index ca167bd1f..ee0aa58b3 100644 --- a/meta-xilinx-standalone-sdt/recipes-openamp/open-amp/open-amp-xlnx_%.bbappend +++ b/meta-xilinx-standalone-sdt/recipes-openamp/open-amp/open-amp-xlnx_%.bbappend @@ -1 +1 @@ -require ${@'${LAYER_PATH_openamp-layer}/vendor/xilinx/meta-xilinx-standalone-experimental/recipes-openamp/open-amp/open-amp-xlnx.inc' if d.getVar('XILINX_WITH_ESW') == 'sdt' else ''} +require ${@'${LAYER_PATH_openamp-layer}/vendor/xilinx/meta-xilinx-standalone-sdt/recipes-openamp/open-amp/open-amp-xlnx.inc' if d.getVar('XILINX_WITH_ESW') == 'sdt' else ''} diff --git a/meta-xilinx-virtualization/README.md b/meta-xilinx-virtualization/README.md index 5b66ea387..d211c65c4 100644 --- a/meta-xilinx-virtualization/README.md +++ b/meta-xilinx-virtualization/README.md @@ -19,7 +19,7 @@ $ git clone -b https://git.yoctoproject.org/meta-security 3. Continue [Building Instructions](../README.building.md) from step 4. > **Note:** -> * For System Device Tree(SDT) workflow see [SDT Building Instructions](../meta-xilinx-standalone-experimental/README.md) +> * For System Device Tree(SDT) workflow see [SDT Building Instructions](../meta-xilinx-standalone-sdt/README.md) 4. Add meta-xilinx-virtualization layer to bblayers.conf as shown below.