From 772e22bca4c561ca5e89cfdeb9d5b8616adef070 Mon Sep 17 00:00:00 2001
From: Romuald JEANNE <romuald.jeanne@st.com>
Date: Wed, 28 Sep 2022 13:51:13 +0200
Subject: [PATCH] GCNANO-DRIVER-STM32MP: add 6.4.9 release support

Change-Id: I717570ab9f900409d8d815cc2c2f1e024a936bc0
---
 recipes-bsp/drivers/gcnano-driver-stm32mp.inc               | 3 ++-
 recipes-bsp/drivers/gcnano-driver-stm32mp/README.HOW_TO.txt | 4 ++--
 ...iver-stm32mp_6.4.7.bb => gcnano-driver-stm32mp_6.4.9.bb} | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)
 rename recipes-bsp/drivers/{gcnano-driver-stm32mp_6.4.7.bb => gcnano-driver-stm32mp_6.4.9.bb} (92%)

diff --git a/recipes-bsp/drivers/gcnano-driver-stm32mp.inc b/recipes-bsp/drivers/gcnano-driver-stm32mp.inc
index a4fb071..28a5d94 100644
--- a/recipes-bsp/drivers/gcnano-driver-stm32mp.inc
+++ b/recipes-bsp/drivers/gcnano-driver-stm32mp.inc
@@ -4,8 +4,9 @@ inherit module
 
 # todo manage android build (sync)
 EXTRA_OEMAKE  = "KERNEL_DIR=${STAGING_KERNEL_BUILDDIR}"
-EXTRA_OEMAKE += "SOC_PLATFORM=st-st"
 # Use DEBUG=1 for more traces and easier debug
 EXTRA_OEMAKE += "DEBUG=0"
 EXTRA_OEMAKE += "-C ${STAGING_KERNEL_BUILDDIR} M=${S}"
 EXTRA_OEMAKE += "AQROOT=${S}"
+
+EXTRA_OEMAKE:append:stm32mp1common = " SOC_PLATFORM=st-mp1 "
diff --git a/recipes-bsp/drivers/gcnano-driver-stm32mp/README.HOW_TO.txt b/recipes-bsp/drivers/gcnano-driver-stm32mp/README.HOW_TO.txt
index bcb4793..47bc7cc 100644
--- a/recipes-bsp/drivers/gcnano-driver-stm32mp/README.HOW_TO.txt
+++ b/recipes-bsp/drivers/gcnano-driver-stm32mp/README.HOW_TO.txt
@@ -18,9 +18,9 @@ OpenSTLinux SDK must be installed.
 * Compile and install the gcnano kernel module
     $> tar xf ##BP##-##PR##.tar.xz
     $> cd ##GCNANO_TARNAME##
-    $> KERNEL_BUILDDIR="../../kernel/kernel-sources"
+    $> KERNEL_BUILDDIR="../../linux-stm32mp-<KERNELVERSION>-stm32mp-<RELEASE>/build"
     * Build kernel module
-    $> make ARCH=arm SOC_PLATFORM=st-st DEBUG=0 O="${KERNEL_BUILDDIR}" M="${PWD}" AQROOT="${PWD}" -C ${KERNEL_BUILDDIR}
+    $> make ARCH=arm SOC_PLATFORM=st-mp1 DEBUG=0 O="${KERNEL_BUILDDIR}" M="${PWD}" AQROOT="${PWD}" -C ${KERNEL_BUILDDIR}
 
 ---------------------------
 3. Update software on board
diff --git a/recipes-bsp/drivers/gcnano-driver-stm32mp_6.4.7.bb b/recipes-bsp/drivers/gcnano-driver-stm32mp_6.4.9.bb
similarity index 92%
rename from recipes-bsp/drivers/gcnano-driver-stm32mp_6.4.7.bb
rename to recipes-bsp/drivers/gcnano-driver-stm32mp_6.4.9.bb
index a52dd9c..6705bb2 100644
--- a/recipes-bsp/drivers/gcnano-driver-stm32mp_6.4.7.bb
+++ b/recipes-bsp/drivers/gcnano-driver-stm32mp_6.4.9.bb
@@ -4,13 +4,13 @@ LICENSE = "GPL-1.0-only & MIT"
 LIC_FILES_CHKSUM = "file://Makefile;endline=53;md5=ec60a845a9f75c1c29ffe3007e9d2cb5"
 
 SRC_URI = "git://github.com/STMicroelectronics/gcnano-binaries;protocol=https;branch=gcnano-${GCNANO_VERSION}-binaries"
-SRCREV = "a20611434ef048d3d0c04f55b6cd7d75a2156d43"
+SRCREV = "787d3311e1bae40805fe2091be653eaadf059611"
 
 GCNANO_TARNAME = "gcnano-driver-${GCNANO_VERSION}"
 
-GCNANO_VERSION = "6.4.7"
+GCNANO_VERSION = "6.4.9"
 GCNANO_SUBVERSION = "stm32mp"
-GCNANO_RELEASE = "r1"
+GCNANO_RELEASE = "r2"
 
 PV = "${GCNANO_VERSION}-${GCNANO_SUBVERSION}-${GCNANO_RELEASE}"