[PATCH 0/4] improvements for mx8

[PATCH 0/4] improvements for mx8

[Max Krummenacher]

I tried to build fsl-image-multimedia for imx8qmmek and imx8qxpmek.

The first three patches were needed to get to the do_rootfs stage in my setup,
the last one IMHO makes live easier for people adding their mx8 based
machines to meta-freescale-3rdparty.

With these four patches I was able to get to the do_rootfs task, then it fails
for the missing integration of a wks file. imx-boot currently is not built when
building an image, however when building it explicitely it does error out. So
one first would have to get imx-boot up and running before tackling the wic
integration.

Best regards
Max

Max Krummenacher (4):
  imx8: machines: silence kernel warning
  mx8: prefer u-boot-imx, linux-imx
  linux-imx_4.9.123: fix kernel module deploymenmt for ipk
  mx8: move non soc specific fw out of imx-base

 conf/machine/imx8mmevk.conf                       |  3 +++
 conf/machine/imx8mqevk.conf                       |  3 +++
 conf/machine/imx8qmmek.conf                       |  5 ++++-
 conf/machine/imx8qxpmek.conf                      |  5 ++++-
 conf/machine/include/imx-base.inc                 | 10 ++++++----
 recipes-kernel/linux/linux-imx-headers_4.9.123.bb |  2 +-
 recipes-kernel/linux/linux-imx_4.9.123.bb         |  2 +-
 7 files changed, 22 insertions(+), 8 deletions(-)

-- 
2.13.6

[PATCH 1/4] imx8: machines: silence kernel warning

[Max Krummenacher]

The kernel class now sets RDEPENDS_${KERNEL_PACKAGE_NAME}-base so this include
needs to do the same, otherwise bitbake emits a warning and the kernel isn't
removed.

| WARNING: .../linux-yocto_4.19.bb: Variable key RDEPENDS_${KERNEL_PACKAGE_NAME}-base (${KERNEL_PACKAGE_NAME}-image) replaces original key RDEPENDS_kernel-base ().

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
 conf/machine/imx8qmmek.conf  | 2 +-
 conf/machine/imx8qxpmek.conf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/machine/imx8qmmek.conf b/conf/machine/imx8qmmek.conf
index 61c9f364..b71dfcad 100644
--- a/conf/machine/imx8qmmek.conf
+++ b/conf/machine/imx8qmmek.conf
@@ -11,7 +11,7 @@ require conf/machine/include/arm/arch-arm64.inc
 MACHINE_FEATURES_append = " qca6174"
 
 # Don't include kernels in standard images
-RDEPENDS_kernel-base = ""
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
 
 LOADADDR = ""
 
diff --git a/conf/machine/imx8qxpmek.conf b/conf/machine/imx8qxpmek.conf
index 9b332d30..61cb51fd 100644
--- a/conf/machine/imx8qxpmek.conf
+++ b/conf/machine/imx8qxpmek.conf
@@ -10,7 +10,7 @@ require conf/machine/include/arm/arch-arm64.inc
 MACHINE_FEATURES_append = " qca6174"
 
 # Don't include kernels in standard images
-RDEPENDS_kernel-base = ""
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
 
 LOADADDR = ""
 
-- 
2.13.6

[PATCH 2/4] mx8: prefer u-boot-imx, linux-imx

[Max Krummenacher]

Fixes:
| ERROR: Nothing PROVIDES 'virtual/kernel'
| linux-fslc-imx PROVIDES virtual/kernel but was skipped: incompatible with machine imx8qmmek (not in COMPATIBLE_MACHINE)

| ERROR: Nothing PROVIDES 'virtual/bootloader'
| u-boot-fslc PROVIDES virtual/bootloader but was skipped: incompatible with machine imx8qmmek (not in COMPATIBLE_MACHINE)

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
 conf/machine/include/imx-base.inc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 71f7a300..a0f13a76 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -6,8 +6,11 @@ include conf/machine/include/fsl-default-versions.inc
 require conf/machine/include/utilities.inc
 
 # Set specific make target and binary suffix
-PREFERRED_PROVIDER_u-boot ??= "u-boot-fslc"
-PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-fslc"
+IMX_DEFAULT_BOOTLOADER = "u-boot-fslc"
+IMX_DEFAULT_BOOTLOADER_mx8 = "u-boot-imx"
+
+PREFERRED_PROVIDER_u-boot ??= "${IMX_DEFAULT_BOOTLOADER}"
+PREFERRED_PROVIDER_virtual/bootloader ??= "${IMX_DEFAULT_BOOTLOADER}"
 
 PREFERRED_PROVIDER_u-boot-mxsboot-native ??= "u-boot-fslc-mxsboot-native"
 
@@ -268,7 +271,7 @@ IMX_DEFAULT_KERNEL_mxs = "linux-fslc"
 IMX_DEFAULT_KERNEL_mx5 = "linux-fslc"
 IMX_DEFAULT_KERNEL_mx6 = "linux-fslc-imx"
 IMX_DEFAULT_KERNEL_mx7 = "linux-fslc-imx"
-IMX_DEFAULT_KERNEL_mx8 = "linux-fslc-imx"
+IMX_DEFAULT_KERNEL_mx8 = "linux-imx"
 IMX_DEFAULT_KERNEL_mx7ulp = "linux-imx"
 IMX_DEFAULT_KERNEL_mx6sll = "linux-imx"
 IMX_DEFAULT_KERNEL_mx6ul = "linux-fslc-imx"
-- 
2.13.6

[PATCH 3/4] linux-imx_4.9.123: fix kernel module deploymenmt for ipk

[Max Krummenacher]

Change the LOCALVERSION to '-imx'. While only linux-imx_4.9.123.bb fails,
change the the same pattern in linux-imx-headers_4.9.123.bb for consistency.

At least the ipk packager doesn't like the '_' characters and errors out
with the following for each kernel module:

| ERROR: Fatal errors occurred in subprocesses:
| Command 'PATH="..." opkg-build -Z xz kernel-module-snd-usbmidi-lib-4.9.123-imx_4.9.123_imx8mm_ga+g6a71cbc08975 \
|     .../deploy-ipks/imx8qmmek' returned non-zero exit status 1.: Traceback (most recent call last):
|  File "/build/krm/oe-core_master/build/../layers/openembedded-core/meta/lib/oe/utils.py", line 272, in run
|    ret = self._target(*self._args, **self._kwargs)
|  File "/build/krm/oe-core_master/build/../layers/openembedded-core/meta/classes/package_ipk.bbclass", line 230, \
|    in ipk_write_pkg
|    shell=True)
|  File "/usr/lib64/python3.6/subprocess.py", line 336, in check_output
|    **kwargs).stdout
|  File "/usr/lib64/python3.6/subprocess.py", line 418, in run
|    output=stdout, stderr=stderr)
| subprocess.CalledProcessError: Command '...' returned non-zero exit status 1.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
 recipes-kernel/linux/linux-imx-headers_4.9.123.bb | 2 +-
 recipes-kernel/linux/linux-imx_4.9.123.bb         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-kernel/linux/linux-imx-headers_4.9.123.bb b/recipes-kernel/linux/linux-imx-headers_4.9.123.bb
index 77b05cff..44bce42a 100644
--- a/recipes-kernel/linux/linux-imx-headers_4.9.123.bb
+++ b/recipes-kernel/linux/linux-imx-headers_4.9.123.bb
@@ -8,7 +8,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
 SRCBRANCH = "imx_4.9.123_imx8mm_ga"
-LOCALVERSION = "-${SRCBRANCH}"
+LOCALVERSION = "-imx"
 SRC_URI = "git://source.codeaurora.org/external/imx/linux-imx.git;protocol=https;branch=${SRCBRANCH} \
     file://0001-uapi-Install-custom-headers.patch"
 SRCREV = "6a71cbc089755afd6a86c005c22a1af6eab24a70"
diff --git a/recipes-kernel/linux/linux-imx_4.9.123.bb b/recipes-kernel/linux/linux-imx_4.9.123.bb
index c709249d..bc47f2db 100644
--- a/recipes-kernel/linux/linux-imx_4.9.123.bb
+++ b/recipes-kernel/linux/linux-imx_4.9.123.bb
@@ -12,7 +12,7 @@ require recipes-kernel/linux/linux-imx.inc
 DEPENDS += "lzop-native bc-native"
 
 SRCBRANCH = "imx_4.9.123_imx8mm_ga"
-LOCALVERSION = "-${SRCBRANCH}"
+LOCALVERSION = "-imx"
 SRCREV = "6a71cbc089755afd6a86c005c22a1af6eab24a70"
 
 DEFAULT_PREFERENCE = "1"
-- 
2.13.6

[PATCH 4/4] mx8: move non soc specific fw out of imx-base

[Max Krummenacher]

It is unlikely that all future mx8 machines will require ath10k fw. So add
it in the specific board configuration and not in imx-base.inc.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
 conf/machine/imx8mmevk.conf       | 3 +++
 conf/machine/imx8mqevk.conf       | 3 +++
 conf/machine/imx8qmmek.conf       | 3 +++
 conf/machine/imx8qxpmek.conf      | 3 +++
 conf/machine/include/imx-base.inc | 1 -
 5 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/conf/machine/imx8mmevk.conf b/conf/machine/imx8mmevk.conf
index 1515d5d8..82001101 100644
--- a/conf/machine/imx8mmevk.conf
+++ b/conf/machine/imx8mmevk.conf
@@ -54,3 +54,6 @@ UBOOT_MAKE_TARGET = ""
 IMX_BOOT_SEEK = "33"
 
 OPTEE_BIN_EXT = "8mm"
+
+# Add additional firmware
+MACHINE_FIRMWARE_append = " linux-firmware-ath10k"
diff --git a/conf/machine/imx8mqevk.conf b/conf/machine/imx8mqevk.conf
index 1fe0c769..f3280b9c 100644
--- a/conf/machine/imx8mqevk.conf
+++ b/conf/machine/imx8mqevk.conf
@@ -51,3 +51,6 @@ UBOOT_MAKE_TARGET = ""
 IMX_BOOT_SEEK = "33"
 
 OPTEE_BIN_EXT = "8mq"
+
+# Add additional firmware
+MACHINE_FIRMWARE_append = " linux-firmware-ath10k"
diff --git a/conf/machine/imx8qmmek.conf b/conf/machine/imx8qmmek.conf
index b71dfcad..e1f26b44 100644
--- a/conf/machine/imx8qmmek.conf
+++ b/conf/machine/imx8qmmek.conf
@@ -47,3 +47,6 @@ IMAGE_BOOTFILES_DEPENDS += "firmware-imx:do_deploy"
 IMAGE_BOOTFILES += "hdmitxfw.bin hdmirxfw.bin dpfw.bin"
 
 BOARD_TYPE = "mek"
+
+# Add additional firmware
+MACHINE_FIRMWARE_append = " linux-firmware-ath10k"
diff --git a/conf/machine/imx8qxpmek.conf b/conf/machine/imx8qxpmek.conf
index 61cb51fd..2ffbcacc 100644
--- a/conf/machine/imx8qxpmek.conf
+++ b/conf/machine/imx8qxpmek.conf
@@ -38,3 +38,6 @@ IMAGE_BOOTLOADER = "imx-boot"
 IMX_BOOT_SEEK = "32"
 
 BOARD_TYPE = "mek"
+
+# Add additional firmware
+MACHINE_FIRMWARE_append = " linux-firmware-ath10k"
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index a0f13a76..572e8e5e 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -197,7 +197,6 @@ MACHINE_FIRMWARE_append_mx6sll = " firmware-imx-epdc"
 MACHINE_FIRMWARE_append_mx6ull = " firmware-imx-epdc"
 MACHINE_FIRMWARE_append_mx53 = " firmware-imx-vpu-imx53 firmware-imx-sdma-imx53"
 MACHINE_FIRMWARE_append_mx51 = " firmware-imx-vpu-imx51 firmware-imx-sdma-imx51"
-MACHINE_FIRMWARE_append_mx8 = " linux-firmware-ath10k"
 MACHINE_FIRMWARE_append_mx8qxp = " firmware-imx-vpu-imx8qxp"
 MACHINE_FIRMWARE_append_use-mainline-bsp = " linux-firmware-imx-sdma-imx6q linux-firmware-imx-sdma-imx7d firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
 
-- 
2.13.6