diff --git a/conf/layer.conf b/conf/layer.conf index ca40b9f..6bb2a94 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -30,88 +30,6 @@ HOSTTOOLS_NONFATAL_append = " bc rsync xxd" # DEPRECATED: The ability to remove optee from the build is deprecated and # will be removed in some future release. -DISTRO_FEATURES_FILTER_NATIVESDK += "wayland" - -MACHINE_USES_VIVANTE_KERNEL_DRIVER_MODULE ?= "0" - -# Overrides for imx-base.inc -IMAGE_CLASSES += "image_types_create_sdcard_symlink" - -MACHINE_SOCARCH_FILTER_append_imxgpu = " opencv" - -MACHINE_SOCARCH_FILTER_remove = " imx-parser" - -MACHINE_FIRMWARE_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4339', 'linux-firmware-bcm4339', '', d)}" -MACHINE_FIRMWARE_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm43430', 'linux-firmware-bcm43430', '', d)}" -MACHINE_FIRMWARE_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm43455', 'linux-firmware-bcm43455', '', d)}" -MACHINE_FIRMWARE_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4356', 'linux-firmware-bcm4356-pcie', '', d)}" -MACHINE_FIRMWARE_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4359', 'linux-firmware-bcm4359-pcie', '', d)}" -MACHINE_FIRMWARE_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8987', 'linux-firmware-nxp8987', '', d)}" - -# Extra Marvell Wi-Fi & BTE driver and firmware -MACHINE_EXTRA_RRECOMMENDS_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'mrvl8997', 'packagegroup-imx-mrvl8997', '', d)}" - -# Extra NXP Wlan SDK -MACHINE_EXTRA_RRECOMMENDS_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8987', 'nxp-wlan-sdk', '', d)}" - -MACHINE_GSTREAMER_1_0_PLUGIN_mx8 ?= "imx-gst1.0-plugin" - -PREFERRED_VERSION_weston_mx8 ?= "8.0.0.imx" - -PREFERRED_VERSION_wayland-protocols_mx8 = "1.18.imx" - -PREFERRED_VERSION_libdrm_mx8 ?= "2.4.99.imx" - -PREFERRED_VERSION_isp-imx ?= "4.0.8.2" -PREFERRED_VERSION_basler-camera ?= "1.0.2" - -PREFERRED_VERSION_optee-client_mx8 = "3.7.0.imx" -PREFERRED_VERSION_optee-os_mx8 = "3.7.0.imx" -PREFERRED_VERSION_optee-test_mx8 = "3.7.0.imx" - -# Use the stable version 3.2.0. Version 3.7.0 is still -# in an experimental state -PREFERRED_VERSION_optee-os ?= "3.2.0.imx" -PREFERRED_VERSION_optee-client ?= "3.2.0.imx" -PREFERRED_VERSION_optee-test ?= "3.2.0.imx" -# Temporary workaround to override specific prefered version -# in meta-freescale layer for i.MX8. -PREFERRED_VERSION_optee-os_mx8 ?= "3.7.0.imx" -PREFERRED_VERSION_optee-client_mx8 ?= "3.7.0.imx" -PREFERRED_VERSION_optee-test_mx8 ?= "3.7.0.imx" - -IMX_DEFAULT_KERNEL_mx6ulz = "linux-imx" - -SOC_DEFAULT_IMAGE_FSTYPES_remove = "wic.gz" -SOC_DEFAULT_IMAGE_FSTYPES_append = " wic.bz2 tar.bz2" - -# Remove from upstream -SDCARD_ROOTFS = "NO_LONGER_USED" - -OPTEE_BOOT_IMAGE_mx8 ?= "tee.bin" - -IMAGE_BOOT_FILES_append = " \ - ${@bb.utils.contains('COMBINED_FEATURES', 'xen', 'xen', '', d)} \ -" - -IMAGE_INSTALL_append = " \ - ${@bb.utils.contains('COMBINED_FEATURES', 'jailhouse', 'jailhouse', '', d)} \ - ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'packagegroup-fsl-optee-imx', '', d)} \ - ${@bb.utils.contains('COMBINED_FEATURES', 'xen', 'imx-xen-base imx-xen-hypervisor', '', d)} \ -" - -MACHINE_FEATURES_append_imx = " nxp8987" - -# Overrides for all MACHINE.conf with optee support -UBOOT_CONFIG_OPTEE_CONFIG = "mx${OPTEE_BIN_EXT}_optee_config" -UBOOT_CONFIG[sd-optee] = "${UBOOT_CONFIG_OPTEE_CONFIG},sdcard" - - -MACHINE_FEATURES_remove_smarcimx8mq2g = "qca6174" -MACHINE_FEATURES_append_smarcimx8mq2g = " bcm43455 bcm4356 bcm4359 mrvl8997 jailhouse" -MACHINE_FEATURES_remove_smarcimx8mq4g = "qca6174" -MACHINE_FEATURES_append_smarcimx8mq4g = " bcm43455 bcm4356 bcm4359 mrvl8997 jailhouse" - EMB_UBOOT_MIRROR ?= "git://git@git.embedian.com/developer/smarc-t335x-uboot.git" EMB_KERNEL_MIRROR ?= "git://git@git.embedian.com/developer/smarc-fsl-linux-kernel.git" diff --git a/conf/machine/include/smarc-common.inc b/conf/machine/include/smarc-common.inc new file mode 100644 index 0000000..b5c7db6 --- /dev/null +++ b/conf/machine/include/smarc-common.inc @@ -0,0 +1,75 @@ +MACHINE_USES_VIVANTE_KERNEL_DRIVER_MODULE ?= "0" + +PACKAGE_CLASSES = "package_ipk" + +MACHINE_SOCARCH_FILTER_append_imxgpu = " opencv" + +MACHINE_SOCARCH_FILTER_remove = " imx-parser" + +MACHINE_SOCARCH_FILTER_append_imxgpu = " opencv" + +MACHINE_SOCARCH_FILTER_remove = " imx-parser" + +# Extra Marvell Wi-Fi & BTE driver and firmware +MACHINE_EXTRA_RRECOMMENDS_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'mrvl8997', 'packagegroup-imx-mrvl8997', '', d)}" + +# Extra NXP Wlan SDK +MACHINE_EXTRA_RRECOMMENDS_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8987', 'nxp-wlan-sdk', '', d)}" + +MACHINE_GSTREAMER_1_0_PLUGIN_mx8 ?= "imx-gst1.0-plugin" + +PREFERRED_VERSION_weston_mx8 ?= "8.0.0.imx" + +PREFERRED_VERSION_wayland-protocols_mx8 = "1.18.imx" + +PREFERRED_VERSION_libdrm_mx8 ?= "2.4.99.imx" + +PREFERRED_VERSION_isp-imx ?= "4.0.8.2" +PREFERRED_VERSION_basler-camera ?= "1.0.2" + +PREFERRED_VERSION_optee-client_mx8 = "3.7.0.imx" +PREFERRED_VERSION_optee-os_mx8 = "3.7.0.imx" +PREFERRED_VERSION_optee-test_mx8 = "3.7.0.imx" + +# Use the stable version 3.2.0. Version 3.7.0 is still +# in an experimental state +PREFERRED_VERSION_optee-os ?= "3.2.0.imx" +PREFERRED_VERSION_optee-client ?= "3.2.0.imx" +PREFERRED_VERSION_optee-test ?= "3.2.0.imx" +# Temporary workaround to override specific prefered version +# in meta-freescale layer for i.MX8. +PREFERRED_VERSION_optee-os_mx8 ?= "3.7.0.imx" +PREFERRED_VERSION_optee-client_mx8 ?= "3.7.0.imx" +PREFERRED_VERSION_optee-test_mx8 ?= "3.7.0.imx" + +IMX_DEFAULT_KERNEL_mx6ulz = "linux-imx" + +SOC_DEFAULT_IMAGE_FSTYPES_remove = "wic.gz" +SOC_DEFAULT_IMAGE_FSTYPES_append = " wic.bz2 tar.bz2" + +# Remove from upstream +SDCARD_ROOTFS = "NO_LONGER_USED" + +OPTEE_BOOT_IMAGE_mx8 ?= "tee.bin" + +IMAGE_BOOT_FILES_append = " \ + ${@bb.utils.contains('COMBINED_FEATURES', 'xen', 'xen', '', d)} \ +" + +IMAGE_INSTALL_append = " \ + ${@bb.utils.contains('COMBINED_FEATURES', 'jailhouse', 'jailhouse', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'packagegroup-fsl-optee-imx', '', d)} \ + ${@bb.utils.contains('COMBINED_FEATURES', 'xen', 'imx-xen-base imx-xen-hypervisor', '', d)} \ +" + +MACHINE_FEATURES_append_imx = " nxp8987" + +# Overrides for all MACHINE.conf with optee support +UBOOT_CONFIG_OPTEE_CONFIG = "mx${OPTEE_BIN_EXT}_optee_config" +UBOOT_CONFIG[sd-optee] = "${UBOOT_CONFIG_OPTEE_CONFIG},sdcard" + + +MACHINE_FEATURES_remove_smarcimx8mq2g = "qca6174" +MACHINE_FEATURES_append_smarcimx8mq2g = " mrvl8997 jailhouse" +MACHINE_FEATURES_remove_smarcimx8mq4g = "qca6174" +MACHINE_FEATURES_append_smarcimx8mq4g = " mrvl8997 jailhouse" diff --git a/conf/machine/smarcimx8mq2g.conf b/conf/machine/smarcimx8mq2g.conf index d3e63cc..1cd6d1f 100644 --- a/conf/machine/smarcimx8mq2g.conf +++ b/conf/machine/smarcimx8mq2g.conf @@ -10,11 +10,10 @@ MACHINEOVERRIDES =. "mx8:mx8m:mx8mq:" require conf/machine/include/imx-base.inc require conf/machine/include/tune-cortexa53.inc +require conf/machine/include/smarc-common.inc MACHINE_FEATURES += " usbgadget vfat ext2 alsa serial pci wifi bluetooth" -PACKAGE_CLASSES = "package_rpm" - # Embedian BSP default providers PREFERRED_PROVIDER_virtual/kernel_smarcimx8mq2g ?= "linux-smarcimx8mq" PREFERRED_VERSION_linux-smarcimx8mq4g_smarcimx8mq2g = "5.4" diff --git a/conf/machine/smarcimx8mq4g.conf b/conf/machine/smarcimx8mq4g.conf index 3ae9e63..1785afc 100644 --- a/conf/machine/smarcimx8mq4g.conf +++ b/conf/machine/smarcimx8mq4g.conf @@ -10,11 +10,10 @@ MACHINEOVERRIDES =. "mx8:mx8m:mx8mq:" require conf/machine/include/imx-base.inc require conf/machine/include/tune-cortexa53.inc +require conf/machine/include/smarc-common.inc MACHINE_FEATURES += " usbgadget vfat ext2 alsa serial pci wifi bluetooth" -PACKAGE_CLASSES = "package_rpm" - # Embedian BSP default providers PREFERRED_PROVIDER_virtual/kernel_smarcimx8mq4g ?= "linux-smarcimx8mq" PREFERRED_VERSION_linux-smarcimx8mq4g_smarcimx8mq4g = "5.4" diff --git a/recipes-kernel/linux/linux-smarcimx8mq_5.4.bb b/recipes-kernel/linux/linux-smarcimx8mq_5.4.bb index a7b5422..ad8d947 100644 --- a/recipes-kernel/linux/linux-smarcimx8mq_5.4.bb +++ b/recipes-kernel/linux/linux-smarcimx8mq_5.4.bb @@ -14,8 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "lzop-native bc-native" SRCBRANCH = "smarc_8mq_imx_5.4.24_2.1.0" -#KERNEL_BRANCH ?= "smarc_8mq_imx_5.4.24_2.1.0" -LOCALVERSION = "-${SRCBRANCH}" +LOCALVERSION = "-2.1.0" KERNEL_DEFCONFIG = "${S}/arch/arm64/configs/smarcimx8mq_defconfig" KERNEL_SRC ?= "git@git.embedian.com:developer/smarc-fsl-linux-kernel.git;protocol=git"