diff options
author | Mark Hatle <mark.hatle@amd.com> | 2023-03-15 18:48:11 -0500 |
---|---|---|
committer | Mark Hatle <mark.hatle@amd.com> | 2023-03-15 18:48:11 -0500 |
commit | 1eabc463e02673e702379a4520ed5137d3144baa (patch) | |
tree | 18e57aad1ebfc5fed0f77b94649ffd714e0c2e61 /meta-xilinx-standalone | |
parent | 57d6ff39e32c46f81cccad97fd8634f3aad88e16 (diff) | |
parent | 641e380442ad62c46c832a6c618de1f61df263f2 (diff) | |
download | meta-xilinx-1eabc463e02673e702379a4520ed5137d3144baa.tar.gz |
Merge remote-tracking branch 'xilinx/2023.1' into 2023
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
Diffstat (limited to 'meta-xilinx-standalone')
-rw-r--r-- | meta-xilinx-standalone/README.md | 39 | ||||
-rw-r--r-- | meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 |
2 files changed, 26 insertions, 15 deletions
diff --git a/meta-xilinx-standalone/README.md b/meta-xilinx-standalone/README.md index 8834a87b..aa672b1d 100644 --- a/meta-xilinx-standalone/README.md +++ b/meta-xilinx-standalone/README.md | |||
@@ -13,11 +13,11 @@ The software in this layer may be used in either a standard single | |||
13 | configuration build, or a multiconfig build. A multiconfig build, along | 13 | configuration build, or a multiconfig build. A multiconfig build, along |
14 | with the MACHINES defined in meta-xilinx-bsps will automate the generation | 14 | with the MACHINES defined in meta-xilinx-bsps will automate the generation |
15 | of certain firmwares. | 15 | of certain firmwares. |
16 | 16 | --- | |
17 | ## Standalone Firmware | 17 | ## Standalone Firmware |
18 | 18 | ||
19 | The standalone firmware is a genericly configured firmware, it can be | 19 | The standalone firmware is a generically configured firmware, it can be |
20 | build either in a single standalong configuration, or via an automated | 20 | build either in a single standalone configuration, or via an automated |
21 | multiconfig approach only when needed. | 21 | multiconfig approach only when needed. |
22 | 22 | ||
23 | * multiconfig setup | 23 | * multiconfig setup |
@@ -29,32 +29,43 @@ standalone firmware on demand. | |||
29 | 29 | ||
30 | Edit the conf/local.conf file, add: | 30 | Edit the conf/local.conf file, add: |
31 | 31 | ||
32 | ``` | ||
32 | # For zynqmp-generic | 33 | # For zynqmp-generic |
33 | BBMULTICONFIG += "fsbl-fw zynqmp-pmufw" | 34 | BBMULTICONFIG += "fsbl-fw zynqmp-pmufw" |
35 | ``` | ||
34 | 36 | ||
37 | ``` | ||
35 | # For versal-generic | 38 | # For versal-generic |
36 | BBMULTICONFIG += "versal-fw" | 39 | BBMULTICONFIG += "versal-fw" |
40 | ``` | ||
37 | 41 | ||
38 | To build: | 42 | **To build:** |
39 | 43 | ||
44 | ``` | ||
40 | # For zynqmp, select a zynqmp machine or the generic one | 45 | # For zynqmp, select a zynqmp machine or the generic one |
41 | MACHINE=zynqmp-generic bitbake fsbl pmufw | 46 | $ MACHINE=zynqmp-generic bitbake fsbl pmufw |
47 | ``` | ||
42 | 48 | ||
49 | ``` | ||
43 | # For versal, select a versal machine or the generic one | 50 | # For versal, select a versal machine or the generic one |
44 | MACHINE=versal-generic bitbake plmfw psmfw | 51 | $ MACHINE=versal-generic bitbake plmfw psmfw |
45 | 52 | ``` | |
53 | --- | ||
46 | 54 | ||
47 | ## Dependencies | 55 | ## Dependencies |
48 | 56 | ||
49 | This layer depends on: | 57 | This layer depends on: |
50 | 58 | ||
51 | URI: git://git.openembedded.org/bitbake | 59 | URI: https://git.yoctoproject.org/poky |
60 | layers: meta, meta-poky | ||
61 | branch: langdale | ||
52 | 62 | ||
53 | URI: git://git.openembedded.org/openembedded-core | 63 | URI: https://git.openembedded.org/meta-openembedded |
54 | layers: meta | 64 | layers: meta-oe |
55 | branch: master or xilinx current release version (e.g. hosister) | 65 | branch: langdale |
56 | 66 | ||
57 | URI: git://git.yoctoproject.org/meta-xilinx.git | 67 | URI: |
68 | https://git.yoctoproject.org/meta-xilinx (official version) | ||
69 | https://github.com/Xilinx/meta-xilinx (development and amd xilinx release) | ||
58 | layers: meta-xilinx-microblaze, meta-xilinx-core, meta-xilinx-bsp | 70 | layers: meta-xilinx-microblaze, meta-xilinx-core, meta-xilinx-bsp |
59 | branch: master or xilinx current release version (e.g. hosister) | 71 | branch: langdale or amd xilinx release version (e.g. rel-v2023.1) |
60 | |||
diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 18f25b86..9aad7385 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | |||
@@ -7,7 +7,7 @@ ESW_BRANCH[2023.1] = "xlnx_rel_v2023.1-next" | |||
7 | ESW_BRANCH[2023.2] = "master-next" | 7 | ESW_BRANCH[2023.2] = "master-next" |
8 | BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" | 8 | BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" |
9 | 9 | ||
10 | ESW_REV[2023.1] = "14809f266c6ec79b517d976f882ba496be3e1998" | 10 | ESW_REV[2023.1] = "f81f2fb1bf0aa0fc0e893fe9e10cdb49c63af064" |
11 | ESW_REV[2023.2] = "675797f7a0a048cab241bf1f8004ab16d7ca9213" | 11 | ESW_REV[2023.2] = "675797f7a0a048cab241bf1f8004ab16d7ca9213" |
12 | SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" | 12 | SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" |
13 | 13 | ||