summaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2016-09-19 09:12:24 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2016-09-23 15:30:46 -0300
commite5c9d69686f92a7b3f024a77da2dc3921ff93aad (patch)
tree144ab3065f174d9c4570a41fb3023e0be78f6bad /classes
parent1126f6dd429d65824e4348a8dc840e2e489acb11 (diff)
downloadmeta-freescale-e5c9d69686f92a7b3f024a77da2dc3921ff93aad.tar.gz
fsl-dynamic-packagearch.bbclass: Stop using ARM-specific architectures
The code to dynamically assign the architecture does take into account the default tune so we don't need to include the other architectures with the SoC suffix into the possible package architecture list. This allow for the class to be used across different architectures (such as PowerPC) thus fixing issues while integrating it for QorIQ usage. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'classes')
-rw-r--r--classes/fsl-dynamic-packagearch.bbclass17
1 files changed, 5 insertions, 12 deletions
diff --git a/classes/fsl-dynamic-packagearch.bbclass b/classes/fsl-dynamic-packagearch.bbclass
index fa542fce..95ea7757 100644
--- a/classes/fsl-dynamic-packagearch.bbclass
+++ b/classes/fsl-dynamic-packagearch.bbclass
@@ -23,7 +23,7 @@
23# MACHINE_ARCH_FILTER = "virtual/kernel" 23# MACHINE_ARCH_FILTER = "virtual/kernel"
24# MACHINE_SOCARCH_FILTER_soc = "virtual/libgles1 ... virtual/libgl" 24# MACHINE_SOCARCH_FILTER_soc = "virtual/libgles1 ... virtual/libgl"
25# 25#
26# Copyright 2013-2015 (C) O.S. Systems Software LTDA. 26# Copyright 2013-2016 (C) O.S. Systems Software LTDA.
27 27
28python __anonymous () { 28python __anonymous () {
29 machine_arch_filter = set((d.getVar("MACHINE_ARCH_FILTER", True) or "").split()) 29 machine_arch_filter = set((d.getVar("MACHINE_ARCH_FILTER", True) or "").split())
@@ -50,16 +50,9 @@ python __anonymous () {
50 d.setVar("PACKAGE_ARCH", package_arch) 50 d.setVar("PACKAGE_ARCH", package_arch)
51 51
52 cur_package_archs = (d.getVar("PACKAGE_ARCHS", True) or "").split() 52 cur_package_archs = (d.getVar("PACKAGE_ARCHS", True) or "").split()
53 arch_extra_socarch = (d.getVar("ARM_EXTRA_SOCARCH", True) or "") 53 machine_socarch = (d.getVar("MACHINE_SOCARCH", True) or "")
54 thumb_extra_socarch = (d.getVar("THUMB_EXTRA_SOCARCH", True) or "") 54 if not machine_socarch in cur_package_archs:
55 if not arch_extra_socarch in cur_package_archs: 55 d.appendVar("PACKAGE_EXTRA_ARCHS", " %s" % machine_socarch)
56 d.appendVar("PACKAGE_EXTRA_ARCHS", " %s" % arch_extra_socarch)
57
58 if not thumb_extra_socarch in cur_package_archs:
59 d.appendVar("PACKAGE_EXTRA_ARCHS", " %s" % thumb_extra_socarch)
60} 56}
61 57
62ARM_EXTRA_SOCARCH = "${ARMPKGARCH}${ARMPKGSFX_DSP}${ARMPKGSFX_EABI}${ARMPKGSFX_ENDIAN}${ARMPKGSFX_FPU}${MACHINE_SOCARCH_SUFFIX}" 58MACHINE_SOCARCH = "${TUNE_PKGARCH}${MACHINE_SOCARCH_SUFFIX}"
63THUMB_EXTRA_SOCARCH = "${ARMPKGARCH}${ARM_THUMB_SUFFIX}${ARMPKGSFX_DSP}${ARMPKGSFX_EABI}${ARMPKGSFX_ENDIAN}${ARMPKGSFX_FPU}${MACHINE_SOCARCH_SUFFIX}"
64
65MACHINE_SOCARCH = "${@bb.utils.contains('ARM_INSTRUCTION_SET', 'thumb', '${THUMB_EXTRA_SOCARCH}', '${ARM_EXTRA_SOCARCH}', d)}"