diff options
Diffstat (limited to 'bsp/meta-freescale/classes')
8 files changed, 143 insertions, 55 deletions
diff --git a/bsp/meta-freescale/classes/dtc-145.bbclass b/bsp/meta-freescale/classes/dtc-145.bbclass deleted file mode 100644 index d4a30711..00000000 --- a/bsp/meta-freescale/classes/dtc-145.bbclass +++ /dev/null @@ -1,7 +0,0 @@ -# Use this class for U-Boot 2017.03 or older. - -DEPENDS_append = " dtc-145-native" - -do_configure_prepend () { - sed -i -e 's/^DTC[[:space:]]*=[[:space:]]*dtc[[:space:]]*$/DTC = dtc-145/' ${S}/Makefile -} diff --git a/bsp/meta-freescale/classes/fsl-dynamic-packagearch.bbclass b/bsp/meta-freescale/classes/fsl-dynamic-packagearch.bbclass index a7cc53fc..9fcf37be 100644 --- a/bsp/meta-freescale/classes/fsl-dynamic-packagearch.bbclass +++ b/bsp/meta-freescale/classes/fsl-dynamic-packagearch.bbclass @@ -26,22 +26,22 @@ # Copyright 2013-2016 (C) O.S. Systems Software LTDA. python __anonymous () { - machine_arch_filter = set((d.getVar("MACHINE_ARCH_FILTER", True) or "").split()) - machine_socarch_filter = set((d.getVar("MACHINE_SOCARCH_FILTER", True) or "").split()) + machine_arch_filter = set((d.getVar("MACHINE_ARCH_FILTER") or "").split()) + machine_socarch_filter = set((d.getVar("MACHINE_SOCARCH_FILTER") or "").split()) if machine_socarch_filter or machine_arch_filter: - provides = set((d.getVar("PROVIDES", True) or "").split()) - depends = set((d.getVar("DEPENDS", True) or "").split()) - PN = d.getVar("PN", True) + provides = set((d.getVar("PROVIDES") or "").split()) + depends = set((d.getVar("DEPENDS") or "").split()) + PN = d.getVar("PN") package_arch = None if list(machine_arch_filter & (provides | depends)): - package_arch = d.getVar("MACHINE_ARCH", True) + package_arch = d.getVar("MACHINE_ARCH") elif list(machine_socarch_filter & (provides | depends)): - package_arch = d.getVar("MACHINE_SOCARCH", True) + package_arch = d.getVar("MACHINE_SOCARCH") if not package_arch: raise bb.parse.SkipPackage("You must set MACHINE_SOCARCH as MACHINE_SOCARCH_FILTER is set for this SoC.") - machine_socarch_suffix = d.getVar("MACHINE_SOCARCH_SUFFIX", True) + machine_socarch_suffix = d.getVar("MACHINE_SOCARCH_SUFFIX") if not machine_socarch_suffix: raise bb.parse.SkipPackage("You must set MACHINE_SOCARCH_SUFFIX as MACHINE_SOCARCH_FILTER is set for this SoC.") @@ -49,18 +49,18 @@ python __anonymous () { bb.debug(1, "Use '%s' as package architecture for '%s'" % (package_arch, PN)) d.setVar("PACKAGE_ARCH", package_arch) - cur_package_archs = (d.getVar("PACKAGE_ARCHS", True) or "").split() - machine_socarch = (d.getVar("MACHINE_SOCARCH", True) or "") + cur_package_archs = (d.getVar("PACKAGE_ARCHS") or "").split() + machine_socarch = (d.getVar("MACHINE_SOCARCH") or "") if not machine_socarch in cur_package_archs: d.appendVar("PACKAGE_EXTRA_ARCHS", " %s" % machine_socarch) - if d.getVar("TUNE_ARCH", True) == "arm": + if d.getVar("TUNE_ARCH") == "arm": # For ARM we have two possible machine_socarch values, one for the arm and one for the thumb instruction set # add the other value to extra archs also, so that a image recipe searches both for packages. - if d.getVar("ARM_INSTRUCTION_SET", True) == "thumb": - d.appendVar("PACKAGE_EXTRA_ARCHS", " %s" % d.getVar("ARM_EXTRA_SOCARCH", True)) + if d.getVar("ARM_INSTRUCTION_SET") == "thumb": + d.appendVar("PACKAGE_EXTRA_ARCHS", " %s" % d.getVar("ARM_EXTRA_SOCARCH")) else: - d.appendVar("PACKAGE_EXTRA_ARCHS", " %s" % d.getVar("THUMB_EXTRA_SOCARCH", True)) + d.appendVar("PACKAGE_EXTRA_ARCHS", " %s" % d.getVar("THUMB_EXTRA_SOCARCH")) } MACHINE_SOCARCH = "${TUNE_PKGARCH}${MACHINE_SOCARCH_SUFFIX}" diff --git a/bsp/meta-freescale/classes/fsl-eula-unpack.bbclass b/bsp/meta-freescale/classes/fsl-eula-unpack.bbclass index 198a1944..0671da91 100644 --- a/bsp/meta-freescale/classes/fsl-eula-unpack.bbclass +++ b/bsp/meta-freescale/classes/fsl-eula-unpack.bbclass @@ -6,12 +6,67 @@ # # SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV};fsl-eula=true" -LIC_FILES_CHKSUM_append = " file://${FSL_EULA_FILE};md5=ab61cab9599935bfe9f700405ef00f28" +FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V8 = "01ba08a2b77c3a0a9d0ab5d4d83fed64" +FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V10 = "3880bb9c943b135a30fad5e8aabd3ee9" +FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V11 = "a31dce3023402a821cfcdc1bb8dbdbc0" +FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V12 = "8cf95184c220e247b9917e7244124c5a" +FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V13 = "102094e9e695888c6a9f9fda9004165d" +FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V14 = "d4f548f93b5fe0ee2bc86758c344412d" +FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V16 = "be67a88e9e6c841043b005ad7bcf8309" +FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V17 = "88595f92466edd79be7f4f9547ffa0ef" +FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V18 = "6b552f505eedab4a11ab538cf3db743a" +FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V20 = "08fd295cce89b0a9c74b9b83ed74f671" +FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V21 = "6bd2df2910a2234bf6f419b7d2f531a3" +FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V22 = "75abe2fa1d16ca79f87cde926f05f72d" +FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V24 = "ab61cab9599935bfe9f700405ef00f28" +FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V26 = "5ab1a30d0cd181e3408077727ea5a2db" +FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V3 = "6dfb32a488e5fd6bae52fbf6c7ebb086" +FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V5 = "80c0478f4339af024519b3723023fe28" +FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V7 = "fb0303e4ee8b0e71c094171e2272bd44" +FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V8 = "72c0f70181bb6e83eee6aab8de12a9f3" +FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V9 = "6c12031a11b81db21cdfe0be88cac4b3" +FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V10 = "fd4b227530cd88a82af6a5982cfb724d" +FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V11 = "228c72f2a91452b8a03c4cab30f30ef9" +FSL_EULA_FILE_MD5SUMS = " \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V8} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V10} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V11} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V12} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V13} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V14} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V16} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V17} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V18} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V20} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V21} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V22} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V24} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V26} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V3} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V5} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V7} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V8} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V9} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V10} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V11} \ +" + +# The checksum for the EULA in the layer +FSL_EULA_FILE_MD5SUM ?= \ + "${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V10}" + +LIC_FILES_CHKSUM_LAYER ?= "file://${FSL_EULA_FILE};md5=${FSL_EULA_FILE_MD5SUM}" +LIC_FILES_CHKSUM_append = " ${LIC_FILES_CHKSUM_LAYER}" LIC_FILES_CHKSUM[vardepsexclude] += "FSL_EULA_FILE" +do_fetch_prepend() { + if "Proprietary" not in d.getVar("LICENSE"): + bb.fatal("The recipe LICENSE should include Proprietary but is " + d.getVar("LICENSE") + ".") +} + python fsl_bin_do_unpack() { - src_uri = (d.getVar('SRC_URI', True) or "").split() + src_uri = (d.getVar('SRC_URI') or "").split() if len(src_uri) == 0: return @@ -21,32 +76,54 @@ python fsl_bin_do_unpack() { rootdir = localdata.getVar('WORKDIR', True) fetcher = bb.fetch2.Fetch(src_uri, localdata) + found = 0 for url in fetcher.ud.values(): - save_cwd = os.getcwd() - # Check for supported fetchers - if url.type in ['http', 'https', 'ftp', 'file']: - if url.parm.get('fsl-eula', False): - # If download has failed, do nothing - if not os.path.exists(url.localpath): - bb.debug(1, "Exiting as '%s' cannot be found" % url.basename) - return - - # Change to the working directory - bb.note("Handling file '%s' as a Freescale's EULA binary." % url.basename) - save_cwd = os.getcwd() - os.chdir(rootdir) - - cmd = "sh %s --auto-accept --force" % (url.localpath) - bb.fetch2.runfetchcmd(cmd, d, quiet=True) + # Skip this fetcher if it's not under EULA or if the fetcher type is not supported + if not url.parm.get('fsl-eula', False) or url.type not in ['http', 'https', 'ftp', 'file']: + continue + # If download has failed, do nothing + if not os.path.exists(url.localpath): + bb.debug(1, "Exiting as '%s' cannot be found" % url.basename) + return + found += 1 + bb.note("Handling file '%s' as a Freescale EULA-licensed archive." % url.basename) + cmd = "sh %s --auto-accept --force" % (url.localpath) + bb.fetch2.runfetchcmd(cmd, d, quiet=True, workdir=rootdir) - # Return to the previous directory - os.chdir(save_cwd) + # Check for two EULAs, one from the layer and one from the package + bb.note("Checking LIC_FILES_CHKSUM for Freescale EULA consistency...") + if found > 1: + bb.warn("The package contains multiple Freescale EULA-licensed archives. The consistency logic may not be able to detect a EULA problem.") + layer_license = d.getVar('LIC_FILES_CHKSUM_LAYER') + licenses = d.getVar('LIC_FILES_CHKSUM') or "" + md5sums = d.getVar('FSL_EULA_FILE_MD5SUMS') or "" + found_layer_license = False + found_package_license = False + for license in licenses.split(): + try: + (method, host, path, user, pswd, parm) = bb.fetch.decodeurl(license) + if method != "file" or not path: + raise bb.fetch.MalformedUrl() + except bb.fetch.MalformedUrl: + bb.fatal("%s: LIC_FILES_CHKSUM contains an invalid URL: %s" % (d.getVar('PF'), license)) + if license == layer_license: + bb.note("Found Freescale EULA for the layer %s." % license) + found_layer_license = True + elif parm.get('md5') in md5sums: + bb.note("Found Freescale EULA for the package %s." % license) + found_package_license = True + if not found_layer_license: + bb.fatal("The Freescale layer EULA '%s' is not listed in LIC_FILES_CHKSUM '%s'." + % (layer_license, licenses)) + if not found_package_license: + bb.fatal("A valid package EULA with md5sum in %s was not found in LIC_FILES_CHKSUM '%s'." + % (md5sums.split(), licenses)) } python do_unpack() { - eula = d.getVar('ACCEPT_FSL_EULA', True) - eula_file = d.getVar('FSL_EULA_FILE', True) - pkg = d.getVar('PN', True) + eula = d.getVar('ACCEPT_FSL_EULA') + eula_file = d.getVar('FSL_EULA_FILE') + pkg = d.getVar('PN') if eula == None: bb.fatal("To use '%s' you need to accept the Freescale EULA at '%s'. " "Please read it and in case you accept it, write: " diff --git a/bsp/meta-freescale/classes/fsl-vivante-kernel-driver-handler.bbclass b/bsp/meta-freescale/classes/fsl-vivante-kernel-driver-handler.bbclass index e0578f4e..8ac8a334 100644 --- a/bsp/meta-freescale/classes/fsl-vivante-kernel-driver-handler.bbclass +++ b/bsp/meta-freescale/classes/fsl-vivante-kernel-driver-handler.bbclass @@ -41,9 +41,9 @@ python fsl_vivante_kernel_driver_handler () { return if use_vivante_kernel_driver_module != "1": - e.data.appendVar('RPROVIDES_kernel-base', ' kernel-module-imx-gpu-viv') - e.data.appendVar('RREPLACES_kernel-base', ' kernel-module-imx-gpu-viv') - e.data.appendVar('RCONFLICTS_kernel-base', ' kernel-module-imx-gpu-viv') + e.data.appendVar('RPROVIDES_${KERNEL_PACKAGE_NAME}-base', ' kernel-module-imx-gpu-viv') + e.data.appendVar('RREPLACES_${KERNEL_PACKAGE_NAME}-base', ' kernel-module-imx-gpu-viv') + e.data.appendVar('RCONFLICTS_${KERNEL_PACKAGE_NAME}-base', ' kernel-module-imx-gpu-viv') } addhandler fsl_vivante_kernel_driver_handler diff --git a/bsp/meta-freescale/classes/kernel-itbimage.bbclass b/bsp/meta-freescale/classes/kernel-itbimage.bbclass index 703fa616..84262879 100644 --- a/bsp/meta-freescale/classes/kernel-itbimage.bbclass +++ b/bsp/meta-freescale/classes/kernel-itbimage.bbclass @@ -12,9 +12,9 @@ python __anonymous () { else: replacementtype = "vmlinux" - # Override KERNEL_IMAGETYPE_FOR_MAKE variable, which is internal - # to kernel.bbclass . We have to override it, since we pack zImage - # (at least for now) into the fitImage . + # Override KERNEL_IMAGETYPE_FOR_MAKE variable, which is internal + # to kernel.bbclass . We have to override it, since we pack zImage + # (at least for now) into the fitImage . typeformake = d.getVar("KERNEL_IMAGETYPE_FOR_MAKE") or "" if 'itbImage' in typeformake.split(): d.setVar('KERNEL_IMAGETYPE_FOR_MAKE', typeformake.replace('itbImage', replacementtype)) diff --git a/bsp/meta-freescale/classes/machine-overrides-extender.bbclass b/bsp/meta-freescale/classes/machine-overrides-extender.bbclass index 959fdc16..4b7d66d5 100644 --- a/bsp/meta-freescale/classes/machine-overrides-extender.bbclass +++ b/bsp/meta-freescale/classes/machine-overrides-extender.bbclass @@ -15,18 +15,18 @@ # Copyright 2016-2018 (C) O.S. Systems Software LTDA. def machine_overrides_extender(d): - machine_overrides = (d.getVar('PRISTINE_MACHINEOVERRIDES', True) or '').split(':') + machine_overrides = (d.getVar('PRISTINE_MACHINEOVERRIDES') or '').split(':') # Gather the list of overrides to filter out machine_overrides_filter_out = [] for override in machine_overrides: - machine_overrides_filter_out += (d.getVar('MACHINEOVERRIDES_EXTENDER_FILTER_OUT_%s' % override, True) or '').split() + machine_overrides_filter_out += (d.getVar('MACHINEOVERRIDES_EXTENDER_FILTER_OUT_%s' % override) or '').split() # Drop any overrides of filter_out prior extending machine_overrides = [o for o in machine_overrides if o not in machine_overrides_filter_out] for override in machine_overrides: - extender = d.getVar('MACHINEOVERRIDES_EXTENDER_%s' % override, True) + extender = d.getVar('MACHINEOVERRIDES_EXTENDER_%s' % override) if extender: extender = extender.split(':') diff --git a/bsp/meta-freescale/classes/qoriq_build_64bit_kernel.bbclass b/bsp/meta-freescale/classes/qoriq_build_64bit_kernel.bbclass index 2209e339..93b4d412 100644 --- a/bsp/meta-freescale/classes/qoriq_build_64bit_kernel.bbclass +++ b/bsp/meta-freescale/classes/qoriq_build_64bit_kernel.bbclass @@ -1,4 +1,4 @@ -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES_e6500 += "multiarch" python () { @@ -12,7 +12,7 @@ python () { d.setVar('KERNEL_LD', d.getVar('CCACHE', False) + sys_multilib + '-' + 'ld.bfd' + d.getVar('HOST_LD_KERNEL_ARCH', False) + tc_options) d.setVar('KERNEL_AR', d.getVar('CCACHE', False) + sys_multilib + '-' + 'ar' + d.getVar('HOST_AR_KERNEL_ARCH', False)) - error_qa = d.getVar('ERROR_QA', True) + error_qa = d.getVar('ERROR_QA') if 'arch' in error_qa: d.setVar('ERROR_QA', error_qa.replace(' arch', '')) } diff --git a/bsp/meta-freescale/classes/use-imx-headers.bbclass b/bsp/meta-freescale/classes/use-imx-headers.bbclass index 9dcd864d..fcec68c8 100644 --- a/bsp/meta-freescale/classes/use-imx-headers.bbclass +++ b/bsp/meta-freescale/classes/use-imx-headers.bbclass @@ -14,6 +14,24 @@ # Copyright 2018 (C) O.S. Systems Software LTDA. DEPENDS_append_imx = " linux-imx-headers" + +# Set runtime dependency of -dev for package inheriting this class to +# linux-imx-headers-dev package. This is required in order to propagate +# headers into the SDK +RDEPENDS_${PN}-dev += "linux-imx-headers-dev" + PACKAGE_ARCH_imx ?= "${MACHINE_SOCARCH}" STAGING_INCDIR_IMX = "${STAGING_INCDIR}/imx" + +# Recipes that inherit this class are contracted to use NXP BSP only. +# This is done by overriding the COMPATIBLE_HOST, as this would effectively +# cause recipes to be skipped in case if 'use-nxp-bsp' override is not +# defined for them. This effectively marks recipes that should only be +# built using NXP BSP, and gives an indication to mainline BSP creators +# that recipe is not compatible with mainline. +# +# Typical example here would be imx-vpu-hantro recipe, which requires NXP +# BSP and is not compatible with mainline. +COMPATIBLE_HOST = '(null)' +COMPATIBLE_HOST_use-nxp-bsp = '.*' |