Compare View

switch
from
...
to
 
Commits (2)

Changes

Showing 5 changed files Side-by-side Diff

... ... @@ -30,88 +30,6 @@ HOSTTOOLS_NONFATAL_append = " bc rsync xxd"
30 30 # DEPRECATED: The ability to remove optee from the build is deprecated and
31 31 # will be removed in some future release.
32 32  
33   -DISTRO_FEATURES_FILTER_NATIVESDK += "wayland"
34   -
35   -MACHINE_USES_VIVANTE_KERNEL_DRIVER_MODULE ?= "0"
36   -
37   -# Overrides for imx-base.inc
38   -IMAGE_CLASSES += "image_types_create_sdcard_symlink"
39   -
40   -MACHINE_SOCARCH_FILTER_append_imxgpu = " opencv"
41   -
42   -MACHINE_SOCARCH_FILTER_remove = " imx-parser"
43   -
44   -MACHINE_FIRMWARE_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4339', 'linux-firmware-bcm4339', '', d)}"
45   -MACHINE_FIRMWARE_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm43430', 'linux-firmware-bcm43430', '', d)}"
46   -MACHINE_FIRMWARE_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm43455', 'linux-firmware-bcm43455', '', d)}"
47   -MACHINE_FIRMWARE_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4356', 'linux-firmware-bcm4356-pcie', '', d)}"
48   -MACHINE_FIRMWARE_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4359', 'linux-firmware-bcm4359-pcie', '', d)}"
49   -MACHINE_FIRMWARE_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8987', 'linux-firmware-nxp8987', '', d)}"
50   -
51   -# Extra Marvell Wi-Fi & BTE driver and firmware
52   -MACHINE_EXTRA_RRECOMMENDS_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'mrvl8997', 'packagegroup-imx-mrvl8997', '', d)}"
53   -
54   -# Extra NXP Wlan SDK
55   -MACHINE_EXTRA_RRECOMMENDS_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8987', 'nxp-wlan-sdk', '', d)}"
56   -
57   -MACHINE_GSTREAMER_1_0_PLUGIN_mx8 ?= "imx-gst1.0-plugin"
58   -
59   -PREFERRED_VERSION_weston_mx8 ?= "8.0.0.imx"
60   -
61   -PREFERRED_VERSION_wayland-protocols_mx8 = "1.18.imx"
62   -
63   -PREFERRED_VERSION_libdrm_mx8 ?= "2.4.99.imx"
64   -
65   -PREFERRED_VERSION_isp-imx ?= "4.0.8.2"
66   -PREFERRED_VERSION_basler-camera ?= "1.0.2"
67   -
68   -PREFERRED_VERSION_optee-client_mx8 = "3.7.0.imx"
69   -PREFERRED_VERSION_optee-os_mx8 = "3.7.0.imx"
70   -PREFERRED_VERSION_optee-test_mx8 = "3.7.0.imx"
71   -
72   -# Use the stable version 3.2.0. Version 3.7.0 is still
73   -# in an experimental state
74   -PREFERRED_VERSION_optee-os ?= "3.2.0.imx"
75   -PREFERRED_VERSION_optee-client ?= "3.2.0.imx"
76   -PREFERRED_VERSION_optee-test ?= "3.2.0.imx"
77   -# Temporary workaround to override specific prefered version
78   -# in meta-freescale layer for i.MX8.
79   -PREFERRED_VERSION_optee-os_mx8 ?= "3.7.0.imx"
80   -PREFERRED_VERSION_optee-client_mx8 ?= "3.7.0.imx"
81   -PREFERRED_VERSION_optee-test_mx8 ?= "3.7.0.imx"
82   -
83   -IMX_DEFAULT_KERNEL_mx6ulz = "linux-imx"
84   -
85   -SOC_DEFAULT_IMAGE_FSTYPES_remove = "wic.gz"
86   -SOC_DEFAULT_IMAGE_FSTYPES_append = " wic.bz2 tar.bz2"
87   -
88   -# Remove from upstream
89   -SDCARD_ROOTFS = "NO_LONGER_USED"
90   -
91   -OPTEE_BOOT_IMAGE_mx8 ?= "tee.bin"
92   -
93   -IMAGE_BOOT_FILES_append = " \
94   - ${@bb.utils.contains('COMBINED_FEATURES', 'xen', 'xen', '', d)} \
95   -"
96   -
97   -IMAGE_INSTALL_append = " \
98   - ${@bb.utils.contains('COMBINED_FEATURES', 'jailhouse', 'jailhouse', '', d)} \
99   - ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'packagegroup-fsl-optee-imx', '', d)} \
100   - ${@bb.utils.contains('COMBINED_FEATURES', 'xen', 'imx-xen-base imx-xen-hypervisor', '', d)} \
101   -"
102   -
103   -MACHINE_FEATURES_append_imx = " nxp8987"
104   -
105   -# Overrides for all MACHINE.conf with optee support
106   -UBOOT_CONFIG_OPTEE_CONFIG = "mx${OPTEE_BIN_EXT}_optee_config"
107   -UBOOT_CONFIG[sd-optee] = "${UBOOT_CONFIG_OPTEE_CONFIG},sdcard"
108   -
109   -
110   -MACHINE_FEATURES_remove_smarcimx8mq2g = "qca6174"
111   -MACHINE_FEATURES_append_smarcimx8mq2g = " bcm43455 bcm4356 bcm4359 mrvl8997 jailhouse"
112   -MACHINE_FEATURES_remove_smarcimx8mq4g = "qca6174"
113   -MACHINE_FEATURES_append_smarcimx8mq4g = " bcm43455 bcm4356 bcm4359 mrvl8997 jailhouse"
114   -
115 33 EMB_UBOOT_MIRROR ?= "git://git@git.embedian.com/developer/smarc-t335x-uboot.git"
116 34 EMB_KERNEL_MIRROR ?= "git://git@git.embedian.com/developer/smarc-fsl-linux-kernel.git"
117 35  
conf/machine/include/smarc-common.inc
... ... @@ -0,0 +1,75 @@
  1 +MACHINE_USES_VIVANTE_KERNEL_DRIVER_MODULE ?= "0"
  2 +
  3 +PACKAGE_CLASSES = "package_ipk"
  4 +
  5 +MACHINE_SOCARCH_FILTER_append_imxgpu = " opencv"
  6 +
  7 +MACHINE_SOCARCH_FILTER_remove = " imx-parser"
  8 +
  9 +MACHINE_SOCARCH_FILTER_append_imxgpu = " opencv"
  10 +
  11 +MACHINE_SOCARCH_FILTER_remove = " imx-parser"
  12 +
  13 +# Extra Marvell Wi-Fi & BTE driver and firmware
  14 +MACHINE_EXTRA_RRECOMMENDS_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'mrvl8997', 'packagegroup-imx-mrvl8997', '', d)}"
  15 +
  16 +# Extra NXP Wlan SDK
  17 +MACHINE_EXTRA_RRECOMMENDS_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8987', 'nxp-wlan-sdk', '', d)}"
  18 +
  19 +MACHINE_GSTREAMER_1_0_PLUGIN_mx8 ?= "imx-gst1.0-plugin"
  20 +
  21 +PREFERRED_VERSION_weston_mx8 ?= "8.0.0.imx"
  22 +
  23 +PREFERRED_VERSION_wayland-protocols_mx8 = "1.18.imx"
  24 +
  25 +PREFERRED_VERSION_libdrm_mx8 ?= "2.4.99.imx"
  26 +
  27 +PREFERRED_VERSION_isp-imx ?= "4.0.8.2"
  28 +PREFERRED_VERSION_basler-camera ?= "1.0.2"
  29 +
  30 +PREFERRED_VERSION_optee-client_mx8 = "3.7.0.imx"
  31 +PREFERRED_VERSION_optee-os_mx8 = "3.7.0.imx"
  32 +PREFERRED_VERSION_optee-test_mx8 = "3.7.0.imx"
  33 +
  34 +# Use the stable version 3.2.0. Version 3.7.0 is still
  35 +# in an experimental state
  36 +PREFERRED_VERSION_optee-os ?= "3.2.0.imx"
  37 +PREFERRED_VERSION_optee-client ?= "3.2.0.imx"
  38 +PREFERRED_VERSION_optee-test ?= "3.2.0.imx"
  39 +# Temporary workaround to override specific prefered version
  40 +# in meta-freescale layer for i.MX8.
  41 +PREFERRED_VERSION_optee-os_mx8 ?= "3.7.0.imx"
  42 +PREFERRED_VERSION_optee-client_mx8 ?= "3.7.0.imx"
  43 +PREFERRED_VERSION_optee-test_mx8 ?= "3.7.0.imx"
  44 +
  45 +IMX_DEFAULT_KERNEL_mx6ulz = "linux-imx"
  46 +
  47 +SOC_DEFAULT_IMAGE_FSTYPES_remove = "wic.gz"
  48 +SOC_DEFAULT_IMAGE_FSTYPES_append = " wic.bz2 tar.bz2"
  49 +
  50 +# Remove from upstream
  51 +SDCARD_ROOTFS = "NO_LONGER_USED"
  52 +
  53 +OPTEE_BOOT_IMAGE_mx8 ?= "tee.bin"
  54 +
  55 +IMAGE_BOOT_FILES_append = " \
  56 + ${@bb.utils.contains('COMBINED_FEATURES', 'xen', 'xen', '', d)} \
  57 +"
  58 +
  59 +IMAGE_INSTALL_append = " \
  60 + ${@bb.utils.contains('COMBINED_FEATURES', 'jailhouse', 'jailhouse', '', d)} \
  61 + ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'packagegroup-fsl-optee-imx', '', d)} \
  62 + ${@bb.utils.contains('COMBINED_FEATURES', 'xen', 'imx-xen-base imx-xen-hypervisor', '', d)} \
  63 +"
  64 +
  65 +MACHINE_FEATURES_append_imx = " nxp8987"
  66 +
  67 +# Overrides for all MACHINE.conf with optee support
  68 +UBOOT_CONFIG_OPTEE_CONFIG = "mx${OPTEE_BIN_EXT}_optee_config"
  69 +UBOOT_CONFIG[sd-optee] = "${UBOOT_CONFIG_OPTEE_CONFIG},sdcard"
  70 +
  71 +
  72 +MACHINE_FEATURES_remove_smarcimx8mq2g = "qca6174"
  73 +MACHINE_FEATURES_append_smarcimx8mq2g = " mrvl8997 jailhouse"
  74 +MACHINE_FEATURES_remove_smarcimx8mq4g = "qca6174"
  75 +MACHINE_FEATURES_append_smarcimx8mq4g = " mrvl8997 jailhouse"
conf/machine/smarcimx8mq2g.conf
... ... @@ -10,11 +10,10 @@ MACHINEOVERRIDES =. "mx8:mx8m:mx8mq:"
10 10  
11 11 require conf/machine/include/imx-base.inc
12 12 require conf/machine/include/tune-cortexa53.inc
  13 +require conf/machine/include/smarc-common.inc
13 14  
14 15 MACHINE_FEATURES += " usbgadget vfat ext2 alsa serial pci wifi bluetooth"
15 16  
16   -PACKAGE_CLASSES = "package_rpm"
17   -
18 17 # Embedian BSP default providers
19 18 PREFERRED_PROVIDER_virtual/kernel_smarcimx8mq2g ?= "linux-smarcimx8mq"
20 19 PREFERRED_VERSION_linux-smarcimx8mq4g_smarcimx8mq2g = "5.4"
... ... @@ -83,9 +82,13 @@ MACHINE_EXTRA_RDEPENDS += " \
83 82 # this when you build image without QT 5.
84 83 IMAGE_INSTALL_append = " \
85 84 packagegroup-imx-ml \
  85 + firmware-imx-sdma \
  86 + firmware-imx-regulatory \
86 87 fsl-rc-local \
87 88 "
88 89 #IMAGE_INSTALL_append = " \
  90 +# firmware-imx-sdma \
  91 +# firmware-imx-regulatory \
89 92 # fsl-rc-local \
90 93 # "
91 94  
... ... @@ -94,4 +97,4 @@ IMAGE_FSTYPES = "tar.bz2"
94 97 # Ship all kernel modules by default
95 98 MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
96 99  
97   -MACHINE_FIRMWARE_append_mx8 = " linux-firmware-ath10k firmware-imx-sdma firmware-imx-regulatory"
  100 +MACHINE_FIRMWARE_append_mx8 = " linux-firmware-ath10k"
conf/machine/smarcimx8mq4g.conf
... ... @@ -10,11 +10,10 @@ MACHINEOVERRIDES =. "mx8:mx8m:mx8mq:"
10 10  
11 11 require conf/machine/include/imx-base.inc
12 12 require conf/machine/include/tune-cortexa53.inc
  13 +require conf/machine/include/smarc-common.inc
13 14  
14 15 MACHINE_FEATURES += " usbgadget vfat ext2 alsa serial pci wifi bluetooth"
15 16  
16   -PACKAGE_CLASSES = "package_rpm"
17   -
18 17 # Embedian BSP default providers
19 18 PREFERRED_PROVIDER_virtual/kernel_smarcimx8mq4g ?= "linux-smarcimx8mq"
20 19 PREFERRED_VERSION_linux-smarcimx8mq4g_smarcimx8mq4g = "5.4"
... ... @@ -83,9 +82,13 @@ MACHINE_EXTRA_RDEPENDS += " \
83 82 # this when you build image without QT 5.
84 83 IMAGE_INSTALL_append = " \
85 84 packagegroup-imx-ml \
  85 + firmware-imx-sdma \
  86 + firmware-imx-regulatory \
86 87 fsl-rc-local \
87 88 "
88 89 #IMAGE_INSTALL_append = " \
  90 +# firmware-imx-sdma \
  91 +# firmware-imx-regulatory \
89 92 # fsl-rc-local \
90 93 # "
91 94  
... ... @@ -94,4 +97,4 @@ IMAGE_FSTYPES = "tar.bz2"
94 97 # Ship all kernel modules by default
95 98 MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
96 99  
97   -MACHINE_FIRMWARE_append_mx8 = " linux-firmware-ath10k firmware-imx-sdma firmware-imx-regulatory"
  100 +MACHINE_FIRMWARE_append_mx8 = " linux-firmware-ath10k"
recipes-kernel/linux/linux-smarcimx8mq_5.4.bb
... ... @@ -14,8 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
14 14 DEPENDS += "lzop-native bc-native"
15 15  
16 16 SRCBRANCH = "smarc_8mq_imx_5.4.24_2.1.0"
17   -#KERNEL_BRANCH ?= "smarc_8mq_imx_5.4.24_2.1.0"
18   -LOCALVERSION = "-${SRCBRANCH}"
  17 +LOCALVERSION = "-2.1.0"
19 18 KERNEL_DEFCONFIG = "${S}/arch/arm64/configs/smarcimx8mq_defconfig"
20 19  
21 20 KERNEL_SRC ?= "git@git.embedian.com:developer/smarc-fsl-linux-kernel.git;protocol=git"