diff options
author | Ryan Eatmon <reatmon@ti.com> | 2025-07-09 11:07:53 -0500 |
---|---|---|
committer | Ryan Eatmon <reatmon@ti.com> | 2025-07-10 15:36:25 -0500 |
commit | 479d3c0dd1ff44c8a9d76024d69a2571d755d54d (patch) | |
tree | 4bf5e2425d15ec9bfd274c1ca3bf4f56a389659d | |
parent | f0787243b84c7131ebd8c40a8a945583c894aae1 (diff) | |
download | meta-ti-479d3c0dd1ff44c8a9d76024d69a2571d755d54d.tar.gz |
u-boot-ti: Move UBOOT_VERSION into dynamic layer
The gitpkgv class we are using to set UBOOT_VERSION is located in
meta-openembedded. We do not want to depend on meta-openembedded to
keep meta-ti-bsp as light as possible, and the naming of UBOOT_VERSION
is not a requirement, just a nice to have. Dynamic layers allow us to
use the class if it is available in the build, but not require it.
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
-rw-r--r-- | meta-ti-bsp/conf/layer.conf | 8 | ||||
-rw-r--r-- | meta-ti-bsp/dynamic-layers/openembedded-layer/recipes-bsp/u-boot/u-boot-ti-%.bbappend | 5 | ||||
-rw-r--r-- | meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 4 |
3 files changed, 13 insertions, 4 deletions
diff --git a/meta-ti-bsp/conf/layer.conf b/meta-ti-bsp/conf/layer.conf index 481daf2c..cbf7f509 100644 --- a/meta-ti-bsp/conf/layer.conf +++ b/meta-ti-bsp/conf/layer.conf | |||
@@ -18,6 +18,14 @@ LAYERDEPENDS_meta-ti-bsp = " \ | |||
18 | meta-arm \ | 18 | meta-arm \ |
19 | " | 19 | " |
20 | 20 | ||
21 | LAYERRECOMMENDS_meta-ti-bsp = " \ | ||
22 | openembedded-layer \ | ||
23 | " | ||
24 | |||
25 | BBFILES_DYNAMIC += " \ | ||
26 | openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/recipes*/*/*.bbappend \ | ||
27 | " | ||
28 | |||
21 | SIGGEN_EXCLUDERECIPES_ABISAFE += " \ | 29 | SIGGEN_EXCLUDERECIPES_ABISAFE += " \ |
22 | mesa-pvr \ | 30 | mesa-pvr \ |
23 | " | 31 | " |
diff --git a/meta-ti-bsp/dynamic-layers/openembedded-layer/recipes-bsp/u-boot/u-boot-ti-%.bbappend b/meta-ti-bsp/dynamic-layers/openembedded-layer/recipes-bsp/u-boot/u-boot-ti-%.bbappend new file mode 100644 index 00000000..0f91e37e --- /dev/null +++ b/meta-ti-bsp/dynamic-layers/openembedded-layer/recipes-bsp/u-boot/u-boot-ti-%.bbappend | |||
@@ -0,0 +1,5 @@ | |||
1 | |||
2 | inherit gitpkgv | ||
3 | PKGV = "${PV}${GITPKGV}" | ||
4 | UBOOT_VERSION = "${PKGV}-${PKGR}" | ||
5 | |||
diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc index 660ac557..b2f26a5c 100644 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | |||
@@ -5,10 +5,6 @@ do_compile:prepend () { | |||
5 | echo ${scm_version} > ${S}/.scmversion | 5 | echo ${scm_version} > ${S}/.scmversion |
6 | } | 6 | } |
7 | 7 | ||
8 | inherit gitpkgv | ||
9 | PKGV = "${PV}${GITPKGV}" | ||
10 | UBOOT_VERSION = "${PKGV}-${PKGR}" | ||
11 | |||
12 | UBOOT_SUFFIX ?= "img" | 8 | UBOOT_SUFFIX ?= "img" |
13 | SPL_BINARY ?= "MLO" | 9 | SPL_BINARY ?= "MLO" |
14 | 10 | ||