diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2023-01-13 13:10:09 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2023-03-03 11:13:24 +0100 |
| commit | 4615a14d41f9f9c1069e313b4c91234505edee16 (patch) | |
| tree | 1f474cd2ec8dd691862dfdcf5986631bfae25859 | |
| parent | 40d0e1c80b7ce34bd88af0eec08c7c398d8229fc (diff) | |
buildconf: prepare for verdin am62 addition
bblayers.conf: Split the NXP specific layers into a variable and
add the layers used to build for TI SoCs into its own variable.
Note the the layers required to build for TI SoCs are not yet
added to the list of active layers.
local.conf: Rework the setting of DISTRO, so that the downstream
distro is only applied for NXP i.MX8 based SoC.
Related-to: ELB-4978
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
(cherry picked from commit b72f11c9adf0b35e4016e7b9e58fc8c86d37f0e8)
| -rw-r--r-- | buildconf/bblayers.conf | 14 | ||||
| -rw-r--r-- | buildconf/local.conf | 5 |
2 files changed, 16 insertions, 3 deletions
diff --git a/buildconf/bblayers.conf b/buildconf/bblayers.conf index f04f5ff..f64cbcc 100644 --- a/buildconf/bblayers.conf +++ b/buildconf/bblayers.conf @@ -5,10 +5,22 @@ LCONF_VERSION = "7" BBPATH = "${TOPDIR}" BBFILES ?= "" -BBLAYERS ?= " \ +BBLAYERS_NXP ?= " \ ${TOPDIR}/../layers/meta-toradex-nxp \ ${TOPDIR}/../layers/meta-freescale \ ${TOPDIR}/../layers/meta-freescale-3rdparty \ +" + +BBLAYERS_TI ?= " \ + ${TOPDIR}/../layers/meta-toradex-ti \ + ${TOPDIR}/../layers/meta-arm/meta-arm-toolchain \ + ${TOPDIR}/../layers/meta-arm/meta-arm \ + ${TOPDIR}/../layers/meta-ti/meta-ti-bsp \ + ${TOPDIR}/../layers/meta-ti/meta-ti-extras \ +" + +BBLAYERS ?= " \ + ${BBLAYERS_NXP} \ \ ${TOPDIR}/../layers/meta-toradex-bsp-common \ \ diff --git a/buildconf/local.conf b/buildconf/local.conf index 17cc8ca..d4ea5b3 100644 --- a/buildconf/local.conf +++ b/buildconf/local.conf @@ -295,8 +295,9 @@ INHERIT += "toradex-mirrors toradex-sanity" # Use the upstream distro for modules based on i.MX 6/6ULL/7, downstream is no longer supported. # For i.MX 8/8X/8MM/8MP the downstream distro is used. -MACHINES_UPSTREAM_DISTRO_DEFAULT = "apalis-imx6 colibri-imx6 colibri-imx6ull colibri-imx6ull-emmc colibri-imx7 colibri-imx7-emmc" -DISTRO ?= "${@bb.utils.contains("MACHINES_UPSTREAM_DISTRO_DEFAULT", d.getVar('MACHINE') or '', "tdx-xwayland-upstream", "tdx-xwayland", d)}" +# For TI based modules use the upstream distro +MACHINES_DOWNSTREAM_DISTRO_DEFAULT = "apalis-imx8 colibri-imx8x verdin-imx8mm verdin-imx8mp" +DISTRO ?= "${@bb.utils.contains("MACHINES_DOWNSTREAM_DISTRO_DEFAULT", d.getVar('MACHINE') or '', "tdx-xwayland", "tdx-xwayland-upstream", d)}" # Don't generate the mirror tarball for SCM repos, the snapshot is enough # BB_GENERATE_MIRROR_TARBALLS = "0" |