diff options
author | Denys Dmytriyenko <denys@konsulko.com> | 2022-11-18 21:07:49 +0000 |
---|---|---|
committer | Ryan Eatmon <reatmon@ti.com> | 2022-12-01 15:03:47 -0600 |
commit | 8e43835c4d254bbf81489895acbed28e20989ad6 (patch) | |
tree | 5adf5d6a6eed0e273ceb9814388af9fb669adbb4 /meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | |
parent | d083ee992fe3c3762907c9f52d300dea85bd62ae (diff) | |
download | meta-ti-8e43835c4d254bbf81489895acbed28e20989ad6.tar.gz |
ti-sci-fw: make dependency on meta-ti-extras soft
Replace "require" with "include" to load ti-paths.inc and not break
parsing when meta-ti-extras is not in the BBLAYERS list.
As ti-paths.inc is only needed to define TI_K3_SECDEV_INSTALL_DIR
for ti-k3-secdev when TI_SECURE_DEV_PKG_K3 is not set and building
for K3 HS platforms. Since ti-k3-secdev resides in meta-ti-extras,
the soft dependency will still work fine and give a build error
"Nothing PROVIDES 'ti-k3-secdev-native'" when it is needed.
Also, since TI_K3_SECDEV_INSTALL_DIR can now be undefined, use
d.getVar() to access it ensuring it doesn't break the condition.
Reported-by: Daniel Díaz <mrchapp@gmail.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Diffstat (limited to 'meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb')
-rw-r--r-- | meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb index e89a6855..c99cd660 100644 --- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | |||
@@ -1,5 +1,5 @@ | |||
1 | require recipes-bsp/ti-linux-fw/ti-linux-fw.inc | 1 | require recipes-bsp/ti-linux-fw/ti-linux-fw.inc |
2 | require recipes-ti/includes/ti-paths.inc | 2 | include recipes-ti/includes/ti-paths.inc |
3 | 3 | ||
4 | DEPENDS = "openssl-native u-boot-mkimage-native dtc-native virtual/bootloader" | 4 | DEPENDS = "openssl-native u-boot-mkimage-native dtc-native virtual/bootloader" |
5 | DEPENDS:remove:am65xx-evm-k3r5 = "virtual/bootloader" | 5 | DEPENDS:remove:am65xx-evm-k3r5 = "virtual/bootloader" |
@@ -20,7 +20,7 @@ COMPATIBLE_MACHINE:aarch64 = "null" | |||
20 | 20 | ||
21 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 21 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
22 | 22 | ||
23 | TI_SECURE_DEV_PKG = "${@ d.getVar('TI_SECURE_DEV_PKG_K3') or '${TI_K3_SECDEV_INSTALL_DIR}' }" | 23 | TI_SECURE_DEV_PKG = "${@ d.getVar('TI_SECURE_DEV_PKG_K3') or d.getVar('TI_K3_SECDEV_INSTALL_DIR') }" |
24 | export TI_SECURE_DEV_PKG | 24 | export TI_SECURE_DEV_PKG |
25 | 25 | ||
26 | SYSFW_SOC ?= "unknown" | 26 | SYSFW_SOC ?= "unknown" |