diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2023-08-03 13:07:21 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2023-08-03 13:07:21 +0200 |
| commit | d735014a62f17028b40240c35a30ed46b752eb23 (patch) | |
| tree | 0ad305eb01923187df0d161cf37612726b44c5b3 | |
| parent | c585d422791789276ec4c88e2364d54ab45d2082 (diff) | |
Revert "verdin-imx8mm: mainline: don't load etnaviv and hantro modules"
This reverts commit da2e5ab836c8b81497ec7e97727b33dea3a7b719.
Now with display output available in master/upstream both etnaviv and
hantro_vpu do serve real purpose so let us enable them again.
| -rw-r--r-- | conf/machine/verdin-imx8mm.conf | 1 | ||||
| -rw-r--r-- | recipes-kernel/linux/modprobe-conf.bb | 16 |
2 files changed, 0 insertions, 17 deletions
diff --git a/conf/machine/verdin-imx8mm.conf b/conf/machine/verdin-imx8mm.conf index 39faa98..b2a48dd 100644 --- a/conf/machine/verdin-imx8mm.conf +++ b/conf/machine/verdin-imx8mm.conf @@ -78,7 +78,6 @@ PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex" PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-mainline" PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-mainline-rt" PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline" -MACHINE_EXTRA_RRECOMMENDS:append:use-mainline-bsp = " modprobe-conf" IMX_DEFAULT_BOOTLOADER = "u-boot-toradex" # Currently we use the nxp 2022.04 downstream for mx8 diff --git a/recipes-kernel/linux/modprobe-conf.bb b/recipes-kernel/linux/modprobe-conf.bb deleted file mode 100644 index adad17d..0000000 --- a/recipes-kernel/linux/modprobe-conf.bb +++ /dev/null @@ -1,16 +0,0 @@ -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -# The verdin-imx8mm does hang during resume if etnaviv and/or hantro_vpu -# are loaded. As graphics currently anyway doesn't work anyway do not -# load these modules -do_install:append:verdin-imx8mm () { - install -d ${D}${sysconfdir}/modprobe.d - echo "blacklist etnaviv" > ${D}${sysconfdir}/modprobe.d/imx8mm-blacklist.conf - echo "blacklist hantro_vpu" >> ${D}${sysconfdir}/modprobe.d/imx8mm-blacklist.conf -} - -ALLOW_EMPTY:${PN} = "1" -FILES:${PN} = " ${sysconfdir}/modprobe.d" |