diff --git a/conf/machine/mcm-imx8m-mini.conf b/conf/machine/mcm-imx8m-mini.conf index 9378f0f..a1006b0 100644 --- a/conf/machine/mcm-imx8m-mini.conf +++ b/conf/machine/mcm-imx8m-mini.conf @@ -22,4 +22,4 @@ UBOOT_DTB_NAME = "mcm-imx8m-mini.dtb" MACHINE_FIRMWARE:append = " linux-firmware-nxp89xx " MACHINE_EXTRA_RRECOMMENDS:append = " nxp-wlan-sdk " -CL_RELEASE = '3.2.2' +CL_RELEASE = '2.0' diff --git a/recipes-bsp/u-boot/compulab/imx8mm.inc b/recipes-bsp/u-boot/compulab/imx8mm.inc index 7dc398c..de4b704 100644 --- a/recipes-bsp/u-boot/compulab/imx8mm.inc +++ b/recipes-bsp/u-boot/compulab/imx8mm.inc @@ -133,8 +133,9 @@ SRC_URI:append = " \ file://0133-ucm-mcm-dts-enable-mmc2-SD-card.patch \ file://0134-ucm-mcm-dts-enable-pca9555-i2c-gpio.patch \ file://0135-ucm-mcm-dts-enable-ili9881c-display.patch \ - file://cl_setenv \ file://0136-ucm-imx8m-mini-mcm-imx8m-mini-dtb-Enable-USB-OTG.patch \ + file://0137-mcm-localversion-2.0.patch \ + file://cl_setenv \ " # For U-Boot build outside of Yocto diff --git a/recipes-bsp/u-boot/compulab/imx8mm/0137-mcm-localversion-2.0.patch b/recipes-bsp/u-boot/compulab/imx8mm/0137-mcm-localversion-2.0.patch new file mode 100644 index 0000000..8c73459 --- /dev/null +++ b/recipes-bsp/u-boot/compulab/imx8mm/0137-mcm-localversion-2.0.patch @@ -0,0 +1,23 @@ +From dc5d797399c1e9639fd3beb2ab4ea55c5c513245 Mon Sep 17 00:00:00 2001 +From: Kirill Kapranov +Date: Wed, 4 Oct 2023 12:52:21 +0000 +Subject: [PATCH 137/137] mcm:localversion 2.0 + +Signed-off-by: Kirill Kapranov +--- + configs/mcm-imx8m-mini.config | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configs/mcm-imx8m-mini.config b/configs/mcm-imx8m-mini.config +index bf8ebeee96..5650a0120c 100644 +--- a/configs/mcm-imx8m-mini.config ++++ b/configs/mcm-imx8m-mini.config +@@ -1,4 +1,4 @@ +-CONFIG_LOCALVERSION="-mcm-imx8m-mini-2.2" ++CONFIG_LOCALVERSION="-mcm-imx8m-mini-2.0" + CONFIG_TARGET_MCM_IMX8M_MINI=y + CONFIG_DEFAULT_DTB="mcm-imx8m-mini.dtb" + CONFIG_DEFAULT_FDT_FILE="mcm-imx8m-mini.dtb" +-- +2.34.1 + diff --git a/recipes-kernel/linux/compulab/imx8mm.inc b/recipes-kernel/linux/compulab/imx8mm.inc index 128a637..e810ad5 100644 --- a/recipes-kernel/linux/compulab/imx8mm.inc +++ b/recipes-kernel/linux/compulab/imx8mm.inc @@ -113,5 +113,6 @@ SRC_URI:append = " \ file://0112-mcm-imx8m-mini-defconfig-Enable-can-mcp2518.patch \ file://0113-Add-kernel-module-nxp89xx.patch \ file://0114-mcm-defconfig-Enable-module-mlan.patch \ + file://0115-mcm-localversion-2.0.patch \ file://defconfig \ " diff --git a/recipes-kernel/linux/compulab/imx8mm/0115-mcm-localversion-2.0.patch b/recipes-kernel/linux/compulab/imx8mm/0115-mcm-localversion-2.0.patch new file mode 100644 index 0000000..6a4d4b8 --- /dev/null +++ b/recipes-kernel/linux/compulab/imx8mm/0115-mcm-localversion-2.0.patch @@ -0,0 +1,23 @@ +From 081a05a5195ba408d58c400d320903806f3f3027 Mon Sep 17 00:00:00 2001 +From: Kirill Kapranov +Date: Wed, 4 Oct 2023 12:45:28 +0000 +Subject: [PATCH 115/115] mcm:localversion 2.0 + +Signed-off-by: Kirill Kapranov +--- + arch/arm64/configs/mcm-imx8m-mini.config | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm64/configs/mcm-imx8m-mini.config b/arch/arm64/configs/mcm-imx8m-mini.config +index f69c0df098d1..75d00b653484 100644 +--- a/arch/arm64/configs/mcm-imx8m-mini.config ++++ b/arch/arm64/configs/mcm-imx8m-mini.config +@@ -1,4 +1,4 @@ +-CONFIG_LOCALVERSION="-mcm-imx8m-mini-3.2.2" ++CONFIG_LOCALVERSION="-mcm-imx8m-mini-2.0" + CONFIG_BACKLIGHT_CLASS_DEVICE=y + CONFIG_DRM_PANEL_STARTEK_ILI9881C=y + CONFIG_BACKLIGHT_GENERIC=m +-- +2.34.1 +