summaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
Diffstat (limited to 'classes')
-rw-r--r--classes/fsl-eula-unpack.bbclass4
-rw-r--r--classes/fsl-u-boot-localversion.bbclass2
-rw-r--r--classes/fsl-vivante-kernel-driver-handler.bbclass8
-rw-r--r--classes/image_types_fsl.bbclass12
-rw-r--r--classes/imx-boot-container.bbclass4
-rw-r--r--classes/kernel-imximage.bbclass4
-rw-r--r--classes/kernel-itbimage.bbclass2
-rw-r--r--classes/mfgtool-initramfs-image.bbclass2
-rw-r--r--classes/qoriq_build_64bit_kernel.bbclass6
-rw-r--r--classes/use-imx-headers.bbclass6
-rw-r--r--classes/use-imx-security-controller-firmware.bbclass6
11 files changed, 28 insertions, 28 deletions
diff --git a/classes/fsl-eula-unpack.bbclass b/classes/fsl-eula-unpack.bbclass
index 498d7826..5690898c 100644
--- a/classes/fsl-eula-unpack.bbclass
+++ b/classes/fsl-eula-unpack.bbclass
@@ -79,11 +79,11 @@ FSL_EULA_FILE_MD5SUM ?= \
79 79
80LIC_FILES_CHKSUM_LAYER ?= "file://${FSL_EULA_FILE};md5=${FSL_EULA_FILE_MD5SUM}" 80LIC_FILES_CHKSUM_LAYER ?= "file://${FSL_EULA_FILE};md5=${FSL_EULA_FILE_MD5SUM}"
81LIC_FILES_CHKSUM_LAYER[vardepsexclude] += "FSL_EULA_FILE" 81LIC_FILES_CHKSUM_LAYER[vardepsexclude] += "FSL_EULA_FILE"
82LIC_FILES_CHKSUM_append = " ${LIC_FILES_CHKSUM_LAYER}" 82LIC_FILES_CHKSUM:append = " ${LIC_FILES_CHKSUM_LAYER}"
83 83
84LIC_FILES_CHKSUM[vardepsexclude] += "FSL_EULA_FILE" 84LIC_FILES_CHKSUM[vardepsexclude] += "FSL_EULA_FILE"
85 85
86do_fetch_prepend() { 86do_fetch:prepend() {
87 if "Proprietary" not in d.getVar("LICENSE"): 87 if "Proprietary" not in d.getVar("LICENSE"):
88 bb.fatal("The recipe LICENSE should include Proprietary but is " + d.getVar("LICENSE") + ".") 88 bb.fatal("The recipe LICENSE should include Proprietary but is " + d.getVar("LICENSE") + ".")
89} 89}
diff --git a/classes/fsl-u-boot-localversion.bbclass b/classes/fsl-u-boot-localversion.bbclass
index 617aae1d..ebde8ea7 100644
--- a/classes/fsl-u-boot-localversion.bbclass
+++ b/classes/fsl-u-boot-localversion.bbclass
@@ -14,7 +14,7 @@ LOCALVERSION ??= "+fslc"
14 14
15UBOOT_LOCALVERSION = "${LOCALVERSION}" 15UBOOT_LOCALVERSION = "${LOCALVERSION}"
16 16
17do_compile_prepend() { 17do_compile:prepend() {
18 if [ "${SCMVERSION}" = "y" ]; then 18 if [ "${SCMVERSION}" = "y" ]; then
19 # Add GIT revision to the local version 19 # Add GIT revision to the local version
20 head=`cd ${S} ; git rev-parse --verify --short HEAD 2> /dev/null` 20 head=`cd ${S} ; git rev-parse --verify --short HEAD 2> /dev/null`
diff --git a/classes/fsl-vivante-kernel-driver-handler.bbclass b/classes/fsl-vivante-kernel-driver-handler.bbclass
index 8ac8a334..54954aab 100644
--- a/classes/fsl-vivante-kernel-driver-handler.bbclass
+++ b/classes/fsl-vivante-kernel-driver-handler.bbclass
@@ -41,15 +41,15 @@ python fsl_vivante_kernel_driver_handler () {
41 return 41 return
42 42
43 if use_vivante_kernel_driver_module != "1": 43 if use_vivante_kernel_driver_module != "1":
44 e.data.appendVar('RPROVIDES_${KERNEL_PACKAGE_NAME}-base', ' kernel-module-imx-gpu-viv') 44 e.data.appendVar('RPROVIDES:${KERNEL_PACKAGE_NAME}-base', ' kernel-module-imx-gpu-viv')
45 e.data.appendVar('RREPLACES_${KERNEL_PACKAGE_NAME}-base', ' kernel-module-imx-gpu-viv') 45 e.data.appendVar('RREPLACES:${KERNEL_PACKAGE_NAME}-base', ' kernel-module-imx-gpu-viv')
46 e.data.appendVar('RCONFLICTS_${KERNEL_PACKAGE_NAME}-base', ' kernel-module-imx-gpu-viv') 46 e.data.appendVar('RCONFLICTS:${KERNEL_PACKAGE_NAME}-base', ' kernel-module-imx-gpu-viv')
47} 47}
48 48
49addhandler fsl_vivante_kernel_driver_handler 49addhandler fsl_vivante_kernel_driver_handler
50fsl_vivante_kernel_driver_handler[eventmask] = "bb.event.RecipePreFinalise" 50fsl_vivante_kernel_driver_handler[eventmask] = "bb.event.RecipePreFinalise"
51 51
52do_configure_append () { 52do_configure:append () {
53 if [ "${MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT}" = "1" ]; then 53 if [ "${MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT}" = "1" ]; then
54 config="${B}/.config" 54 config="${B}/.config"
55 55
diff --git a/classes/image_types_fsl.bbclass b/classes/image_types_fsl.bbclass
index c49c51b7..9f76273f 100644
--- a/classes/image_types_fsl.bbclass
+++ b/classes/image_types_fsl.bbclass
@@ -9,9 +9,9 @@ UBOOT_SUFFIX ?= "bin"
9MXSBOOT_NAND_ARGS ?= "" 9MXSBOOT_NAND_ARGS ?= ""
10 10
11# U-Boot mxsboot generation for uSD 11# U-Boot mxsboot generation for uSD
12do_image_uboot_mxsboot_sdcard[depends] += "u-boot-mxsboot-native:do_populate_sysroot \ 12do_image_uboot:mxsboot_sdcard[depends] += "u-boot-mxsboot-native:do_populate_sysroot \
13 u-boot:do_deploy" 13 u-boot:do_deploy"
14IMAGE_CMD_uboot-mxsboot-sdcard() { 14IMAGE_CMD:uboot-mxsboot-sdcard() {
15 mxsboot sd ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX} \ 15 mxsboot sd ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX} \
16 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.uboot-mxsboot-sdcard 16 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.uboot-mxsboot-sdcard
17 ln -sf ${IMAGE_NAME}.rootfs.uboot-mxsboot-sdcard \ 17 ln -sf ${IMAGE_NAME}.rootfs.uboot-mxsboot-sdcard \
@@ -19,9 +19,9 @@ IMAGE_CMD_uboot-mxsboot-sdcard() {
19} 19}
20 20
21# U-Boot mxsboot generation for NAND 21# U-Boot mxsboot generation for NAND
22do_image_uboot_mxsboot_nand[depends] += "u-boot-mxsboot-native:do_populate_sysroot \ 22do_image_uboot:mxsboot_nand[depends] += "u-boot-mxsboot-native:do_populate_sysroot \
23 u-boot:do_deploy" 23 u-boot:do_deploy"
24IMAGE_CMD_uboot-mxsboot-nand() { 24IMAGE_CMD:uboot-mxsboot-nand() {
25 mxsboot ${MXSBOOT_NAND_ARGS} nand \ 25 mxsboot ${MXSBOOT_NAND_ARGS} nand \
26 ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX} \ 26 ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX} \
27 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.uboot-mxsboot-nand 27 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.uboot-mxsboot-nand
@@ -33,11 +33,11 @@ IMAGE_CMD_uboot-mxsboot-nand() {
33# image stream built before the wic generation 33# image stream built before the wic generation
34do_image_wic[depends] += " \ 34do_image_wic[depends] += " \
35 ${@bb.utils.contains('IMAGE_FSTYPES', 'uboot-mxsboot-sdcard', \ 35 ${@bb.utils.contains('IMAGE_FSTYPES', 'uboot-mxsboot-sdcard', \
36 '${IMAGE_BASENAME}:do_image_uboot_mxsboot_sdcard', '', d)} \ 36 '${IMAGE_BASENAME}:do_image_uboot:mxsboot_sdcard', '', d)} \
37" 37"
38 38
39# We need to apply a fixup inside of the partition table 39# We need to apply a fixup inside of the partition table
40IMAGE_CMD_wic_append_mxs() { 40IMAGE_CMD:wic:append:mxs() {
41 # Change partition type for mxs processor family 41 # Change partition type for mxs processor family
42 bbnote "Setting partition type to 0x53 as required for mxs' SoC family." 42 bbnote "Setting partition type to 0x53 as required for mxs' SoC family."
43 echo -n S | dd of=$out${IMAGE_NAME_SUFFIX}.wic bs=1 count=1 seek=450 conv=notrunc 43 echo -n S | dd of=$out${IMAGE_NAME_SUFFIX}.wic bs=1 count=1 seek=450 conv=notrunc
diff --git a/classes/imx-boot-container.bbclass b/classes/imx-boot-container.bbclass
index 41fe9cca..33de45c5 100644
--- a/classes/imx-boot-container.bbclass
+++ b/classes/imx-boot-container.bbclass
@@ -23,7 +23,7 @@
23 23
24# Define ATF binary file to be deployed to the U-Boot build folder 24# Define ATF binary file to be deployed to the U-Boot build folder
25ATF_MACHINE_NAME = "bl31-${ATF_PLATFORM}.bin" 25ATF_MACHINE_NAME = "bl31-${ATF_PLATFORM}.bin"
26ATF_MACHINE_NAME_append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', '-optee', '', d)}" 26ATF_MACHINE_NAME:append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', '-optee', '', d)}"
27 27
28# This package aggregates output deployed by other packages, so set the 28# This package aggregates output deployed by other packages, so set the
29# appropriate dependencies for populate binaries task 29# appropriate dependencies for populate binaries task
@@ -76,7 +76,7 @@ addtask do_resolve_and_populate_binaries before do_compile after do_configure
76# This effectively would allow the usage of the same WKS file for those 76# This effectively would allow the usage of the same WKS file for those
77# derivatives that are using the boot container from U-Boot and those 77# derivatives that are using the boot container from U-Boot and those
78# that are not yet have support for it enabled. 78# that are not yet have support for it enabled.
79do_deploy_append() { 79do_deploy:append() {
80 # Deploy the resulted flash.bin for WIC to pick it up 80 # Deploy the resulted flash.bin for WIC to pick it up
81 if [ -n "${UBOOT_CONFIG}" ]; then 81 if [ -n "${UBOOT_CONFIG}" ]; then
82 for config in ${UBOOT_MACHINE}; do 82 for config in ${UBOOT_MACHINE}; do
diff --git a/classes/kernel-imximage.bbclass b/classes/kernel-imximage.bbclass
index 234cc00d..ccf7ec53 100644
--- a/classes/kernel-imximage.bbclass
+++ b/classes/kernel-imximage.bbclass
@@ -17,7 +17,7 @@
17# 17#
18# Copyright 2017 (C) O.S. Systems Software LTDA. 18# Copyright 2017 (C) O.S. Systems Software LTDA.
19 19
20DEPENDS_append = ' u-boot-mkimage-native' 20DEPENDS:append = ' u-boot-mkimage-native'
21 21
22IMXIMAGE_ENTRYPOINT ?= "${UBOOT_ENTRYPOINT}" 22IMXIMAGE_ENTRYPOINT ?= "${UBOOT_ENTRYPOINT}"
23 23
@@ -55,6 +55,6 @@ gen_imximage() {
55 done 55 done
56} 56}
57 57
58do_deploy_append() { 58do_deploy:append() {
59 gen_imximage 59 gen_imximage
60} 60}
diff --git a/classes/kernel-itbimage.bbclass b/classes/kernel-itbimage.bbclass
index 84262879..51a87319 100644
--- a/classes/kernel-itbimage.bbclass
+++ b/classes/kernel-itbimage.bbclass
@@ -459,7 +459,7 @@ addtask assemble_fitimage_initramfs before do_deploy after do_install
459 459
460 460
461kernel_do_deploy[vardepsexclude] = "DATETIME" 461kernel_do_deploy[vardepsexclude] = "DATETIME"
462kernel_do_deploy_append() { 462kernel_do_deploy:append() {
463 # Update deploy directory 463 # Update deploy directory
464 if echo ${KERNEL_IMAGETYPES} | grep -wq "itbImage"; then 464 if echo ${KERNEL_IMAGETYPES} | grep -wq "itbImage"; then
465 cd ${B} 465 cd ${B}
diff --git a/classes/mfgtool-initramfs-image.bbclass b/classes/mfgtool-initramfs-image.bbclass
index 65028b8f..1d4c5513 100644
--- a/classes/mfgtool-initramfs-image.bbclass
+++ b/classes/mfgtool-initramfs-image.bbclass
@@ -13,7 +13,7 @@ FEATURE_PACKAGES_extfs = "packagegroup-fsl-mfgtool-extfs"
13FEATURE_PACKAGES_f2fs = "packagegroup-fsl-mfgtool-f2fs" 13FEATURE_PACKAGES_f2fs = "packagegroup-fsl-mfgtool-f2fs"
14 14
15IMAGE_FSTYPES = "cpio.gz.u-boot" 15IMAGE_FSTYPES = "cpio.gz.u-boot"
16IMAGE_FSTYPES_mxs = "cpio.gz.u-boot" 16IMAGE_FSTYPES:mxs = "cpio.gz.u-boot"
17IMAGE_ROOTFS_SIZE ?= "8192" 17IMAGE_ROOTFS_SIZE ?= "8192"
18 18
19# Filesystems enabled by default 19# Filesystems enabled by default
diff --git a/classes/qoriq_build_64bit_kernel.bbclass b/classes/qoriq_build_64bit_kernel.bbclass
index 93b4d412..5186c2a4 100644
--- a/classes/qoriq_build_64bit_kernel.bbclass
+++ b/classes/qoriq_build_64bit_kernel.bbclass
@@ -1,13 +1,13 @@
1inherit features_check 1inherit features_check
2REQUIRED_DISTRO_FEATURES_e6500 += "multiarch" 2REQUIRED_DISTRO_FEATURES:e6500 += "multiarch"
3 3
4python () { 4python () {
5 promote_kernel = d.getVar('BUILD_64BIT_KERNEL', False) 5 promote_kernel = d.getVar('BUILD_64BIT_KERNEL', False)
6 if promote_kernel == "1": 6 if promote_kernel == "1":
7 sys_multilib = 'powerpc64' + d.getVar('TARGET_VENDOR', False) + 'mllib64-' + d.getVar('HOST_OS', False) 7 sys_multilib = 'powerpc64' + d.getVar('TARGET_VENDOR', False) + 'mllib64-' + d.getVar('HOST_OS', False)
8 tc_options = d.getVar('TOOLCHAIN_OPTIONS', False) + '/../lib64-' + d.getVar("MACHINE", False) 8 tc_options = d.getVar('TOOLCHAIN_OPTIONS', False) + '/../lib64-' + d.getVar("MACHINE", False)
9 d.setVar('DEPENDS_append', ' lib64-gcc-cross-powerpc64 lib64-libgcc') 9 d.setVar('DEPENDS:append', ' lib64-gcc-cross-powerpc64 lib64-libgcc')
10 d.setVar('PATH_append', ':' + d.getVar('STAGING_BINDIR_NATIVE', False) + '/' + sys_multilib) 10 d.setVar('PATH:append', ':' + d.getVar('STAGING_BINDIR_NATIVE', False) + '/' + sys_multilib)
11 d.setVar('KERNEL_CC', d.getVar('CCACHE', False) + sys_multilib + '-' + 'gcc' + d.getVar('HOST_CC_KERNEL_ARCH', False) + tc_options) 11 d.setVar('KERNEL_CC', d.getVar('CCACHE', False) + sys_multilib + '-' + 'gcc' + d.getVar('HOST_CC_KERNEL_ARCH', False) + tc_options)
12 d.setVar('KERNEL_LD', d.getVar('CCACHE', False) + sys_multilib + '-' + 'ld.bfd' + d.getVar('HOST_LD_KERNEL_ARCH', False) + tc_options) 12 d.setVar('KERNEL_LD', d.getVar('CCACHE', False) + sys_multilib + '-' + 'ld.bfd' + d.getVar('HOST_LD_KERNEL_ARCH', False) + tc_options)
13 d.setVar('KERNEL_AR', d.getVar('CCACHE', False) + sys_multilib + '-' + 'ar' + d.getVar('HOST_AR_KERNEL_ARCH', False)) 13 d.setVar('KERNEL_AR', d.getVar('CCACHE', False) + sys_multilib + '-' + 'ar' + d.getVar('HOST_AR_KERNEL_ARCH', False))
diff --git a/classes/use-imx-headers.bbclass b/classes/use-imx-headers.bbclass
index fcec68c8..ea70e6a5 100644
--- a/classes/use-imx-headers.bbclass
+++ b/classes/use-imx-headers.bbclass
@@ -13,12 +13,12 @@
13# 13#
14# Copyright 2018 (C) O.S. Systems Software LTDA. 14# Copyright 2018 (C) O.S. Systems Software LTDA.
15 15
16DEPENDS_append_imx = " linux-imx-headers" 16DEPENDS:append_imx = " linux-imx-headers"
17 17
18# Set runtime dependency of -dev for package inheriting this class to 18# Set runtime dependency of -dev for package inheriting this class to
19# linux-imx-headers-dev package. This is required in order to propagate 19# linux-imx-headers-dev package. This is required in order to propagate
20# headers into the SDK 20# headers into the SDK
21RDEPENDS_${PN}-dev += "linux-imx-headers-dev" 21RDEPENDS:${PN}-dev += "linux-imx-headers-dev"
22 22
23PACKAGE_ARCH_imx ?= "${MACHINE_SOCARCH}" 23PACKAGE_ARCH_imx ?= "${MACHINE_SOCARCH}"
24 24
@@ -34,4 +34,4 @@ STAGING_INCDIR_IMX = "${STAGING_INCDIR}/imx"
34# Typical example here would be imx-vpu-hantro recipe, which requires NXP 34# Typical example here would be imx-vpu-hantro recipe, which requires NXP
35# BSP and is not compatible with mainline. 35# BSP and is not compatible with mainline.
36COMPATIBLE_HOST = '(null)' 36COMPATIBLE_HOST = '(null)'
37COMPATIBLE_HOST_use-nxp-bsp = '.*' 37COMPATIBLE_HOST:use-nxp-bsp = '.*'
diff --git a/classes/use-imx-security-controller-firmware.bbclass b/classes/use-imx-security-controller-firmware.bbclass
index 7c79fc62..9650059b 100644
--- a/classes/use-imx-security-controller-firmware.bbclass
+++ b/classes/use-imx-security-controller-firmware.bbclass
@@ -18,11 +18,11 @@
18 18
19SECO_FIRMWARE_NAME ?= "" 19SECO_FIRMWARE_NAME ?= ""
20 20
21SECO_FIRMWARE_NAME_mx8qm = "mx8qmb0-ahab-container.img" 21SECO_FIRMWARE_NAME:mx8qm = "mx8qmb0-ahab-container.img"
22SECO_FIRMWARE_NAME_mx8qxp = \ 22SECO_FIRMWARE_NAME:mx8qxp = \
23 "${@bb.utils.contains('MACHINE_FEATURES', 'soc-revb0', 'mx8qxb0-ahab-container.img', \ 23 "${@bb.utils.contains('MACHINE_FEATURES', 'soc-revb0', 'mx8qxb0-ahab-container.img', \
24 'mx8qxc0-ahab-container.img', d)}" 24 'mx8qxc0-ahab-container.img', d)}"
25SECO_FIRMWARE_NAME_mx8dxl = "mx8dxla1-ahab-container.img" 25SECO_FIRMWARE_NAME:mx8dxl = "mx8dxla1-ahab-container.img"
26 26
27python () { 27python () {
28 if "mx8m" in d.getVar('MACHINEOVERRIDES').split(":"): 28 if "mx8m" in d.getVar('MACHINEOVERRIDES').split(":"):