From d2688a89ecb1f5911e6c2700a997cd208a2234ce Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Fri, 31 May 2019 17:01:36 +0200 Subject: [PATCH] linux: use proper version numbers for platforms still using v4.9 Even though our ccimx6 and ccimx6qp images were using Linux v4.9 sources correctly, they were using the same recipe as our images with Linux v4.14. Technically, both recipes are identical (save for the branch name), but each Linux version should have its own recipe. Also, make sure that ccimx6/ccimx6qp images are built with our version of the linux-imx-headers recipe instead of the one in meta-freescale. Signed-off-by: Gabriel Valcazar --- meta-digi-arm/conf/machine/include/ccimx6.inc | 3 +++ meta-digi-arm/recipes-kernel/linux/linux-dey_4.14.bb | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_4.9.bb | 5 +++++ .../{linux-imx-headers_4.14.98.bb => linux-imx-headers.inc} | 0 meta-digi-arm/recipes-kernel/linux/linux-imx-headers_4.14.bb | 5 +++++ meta-digi-arm/recipes-kernel/linux/linux-imx-headers_4.9.bb | 5 +++++ 6 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 meta-digi-arm/recipes-kernel/linux/linux-dey_4.9.bb rename meta-digi-arm/recipes-kernel/linux/{linux-imx-headers_4.14.98.bb => linux-imx-headers.inc} (100%) create mode 100644 meta-digi-arm/recipes-kernel/linux/linux-imx-headers_4.14.bb create mode 100644 meta-digi-arm/recipes-kernel/linux/linux-imx-headers_4.9.bb diff --git a/meta-digi-arm/conf/machine/include/ccimx6.inc b/meta-digi-arm/conf/machine/include/ccimx6.inc index 7290c136a..c54fb6d35 100644 --- a/meta-digi-arm/conf/machine/include/ccimx6.inc +++ b/meta-digi-arm/conf/machine/include/ccimx6.inc @@ -18,6 +18,9 @@ KERNEL_DEFCONFIG ?= "arch/arm/configs/ccimx6sbc_defconfig" # Wireless external module WIRELESS_MODULE ?= "" +# Use our recipe of linux-imx-headers instead of the meta-freescale one +PREFERRED_VERSION_linux-imx-headers ?= "4.9" + # Firmware MACHINE_FIRMWARE ?= "firmware-imx-sdma" MACHINE_FIRMWARE_append_mx6q = " firmware-imx-vpu-imx6q" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.14.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.14.bb index 9abff427e..bfa3cd0de 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.14.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.14.bb @@ -2,4 +2,4 @@ require recipes-kernel/linux/linux-dey.inc -COMPATIBLE_MACHINE = "(ccimx6|ccimx6ul|ccimx8x)" +COMPATIBLE_MACHINE = "(ccimx6ul|ccimx8x)" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.9.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.9.bb new file mode 100644 index 000000000..3669cb577 --- /dev/null +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.9.bb @@ -0,0 +1,5 @@ +# Copyright (C) 2019 Digi International + +require recipes-kernel/linux/linux-dey.inc + +COMPATIBLE_MACHINE = "(ccimx6)" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-imx-headers_4.14.98.bb b/meta-digi-arm/recipes-kernel/linux/linux-imx-headers.inc similarity index 100% rename from meta-digi-arm/recipes-kernel/linux/linux-imx-headers_4.14.98.bb rename to meta-digi-arm/recipes-kernel/linux/linux-imx-headers.inc diff --git a/meta-digi-arm/recipes-kernel/linux/linux-imx-headers_4.14.bb b/meta-digi-arm/recipes-kernel/linux/linux-imx-headers_4.14.bb new file mode 100644 index 000000000..5e834e8f6 --- /dev/null +++ b/meta-digi-arm/recipes-kernel/linux/linux-imx-headers_4.14.bb @@ -0,0 +1,5 @@ +# Copyright (C) 2019 Digi International + +require recipes-kernel/linux/linux-imx-headers.inc + +COMPATIBLE_MACHINE = "(ccimx6ul|ccimx8x)" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-imx-headers_4.9.bb b/meta-digi-arm/recipes-kernel/linux/linux-imx-headers_4.9.bb new file mode 100644 index 000000000..b2479c47f --- /dev/null +++ b/meta-digi-arm/recipes-kernel/linux/linux-imx-headers_4.9.bb @@ -0,0 +1,5 @@ +# Copyright (C) 2019 Digi International + +require recipes-kernel/linux/linux-imx-headers.inc + +COMPATIBLE_MACHINE = "(ccimx6)"