From 1970799e2100653fa493e363fe7adcc49c4fdec2 Mon Sep 17 00:00:00 2001
From: Jun Zhu <junzhu@nxp.com>
Date: Sat, 10 Oct 2020 13:32:56 +0800
Subject: [PATCH] Update Linux Kernel version to 5.4.70 [YOCIMX-4980]

Also update the LOCALVERSION to 2.3.0.
---
 README                                                        | 4 ++--
 meta-bsp/recipes-bsp/u-boot/u-boot-imx_2020.04.bb             | 2 +-
 .../kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p0.2.bb    | 2 +-
 meta-bsp/recipes-kernel/linux/linux-imx-headers_5.4.bb        | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README b/README
index a94c6f6090..dabcc90307 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-i.MX Linux Yocto Project BSP 5.4.47_2.2.0 Release
+i.MX Linux Yocto Project BSP 5.4.70_2.3.0 Release
 =====================================================
 
 Note this is release is not a production release.
@@ -35,7 +35,7 @@ Quick Start Guide
 See the i.MX Yocto Project User's Guide for instructions on installing repo.
 
 First install the i.MX Linux BSP repo
-$: repo init -u git://source.codeaurora.org/external/imx/imx-manifest.git -b imx-linux-zeus -m imx-5.4.47-2.2.0.xml
+$: repo init -u git://source.codeaurora.org/external/imx/imx-manifest.git -b imx-linux-zeus -m imx-5.4.70-2.3.0.xml
 
 Download the Yocto Project Layers:
 $: repo sync
diff --git a/meta-bsp/recipes-bsp/u-boot/u-boot-imx_2020.04.bb b/meta-bsp/recipes-bsp/u-boot/u-boot-imx_2020.04.bb
index 488a04cd13..a87be4d192 100644
--- a/meta-bsp/recipes-bsp/u-boot/u-boot-imx_2020.04.bb
+++ b/meta-bsp/recipes-bsp/u-boot/u-boot-imx_2020.04.bb
@@ -24,7 +24,7 @@ S = "${WORKDIR}/git"
 
 inherit fsl-u-boot-localversion
 
-LOCALVERSION ?= "-5.4.24-2.1.0"
+LOCALVERSION ?= "-5.4.70-2.3.0"
 
 BOOT_TOOLS = "imx-boot-tools"
 
diff --git a/meta-bsp/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p0.2.bb b/meta-bsp/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p0.2.bb
index 689b02f7e7..9a2e4c4056 100644
--- a/meta-bsp/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p0.2.bb
+++ b/meta-bsp/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p0.2.bb
@@ -3,7 +3,7 @@ require recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.0.p2.4.bb
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
 SRCBRANCH = "imx_5.4.y"
-LOCALVERSION = "-2.1.0"
+LOCALVERSION = "-2.3.0"
 KERNEL_SRC ?= "git://source.codeaurora.org/external/imx/linux-imx.git;protocol=https"
 
 SRCREV = "3ebe2d7acba40d5e1fda902fb2debe55e02fd6dd"
diff --git a/meta-bsp/recipes-kernel/linux/linux-imx-headers_5.4.bb b/meta-bsp/recipes-kernel/linux/linux-imx-headers_5.4.bb
index 5673336a54..bc400f1d50 100644
--- a/meta-bsp/recipes-kernel/linux/linux-imx-headers_5.4.bb
+++ b/meta-bsp/recipes-kernel/linux/linux-imx-headers_5.4.bb
@@ -8,7 +8,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 
 SRCBRANCH = "imx_5.4.y"
-LOCALVERSION = "-2.2.0"
+LOCALVERSION = "-2.3.0"
 KERNEL_SRC ?= "git://source.codeaurora.org/external/imx/linux-imx.git;protocol=https"
 SRC_URI = "${KERNEL_SRC};branch=${SRCBRANCH}"