[Feature][T8TSK-155]add version and commit id in LK
Change-Id: I22bd516c3719aef1f44f704dc7997f9bef0fa7d1
diff --git a/meta-sdk/meta/meta-lynqSDK-T800/conf/machine/auto2735evb-ivt-base.conf b/meta-sdk/meta/meta-lynqSDK-T800/conf/machine/auto2735evb-ivt-base.conf
index 31bd486..61aa6d6 100755
--- a/meta-sdk/meta/meta-lynqSDK-T800/conf/machine/auto2735evb-ivt-base.conf
+++ b/meta-sdk/meta/meta-lynqSDK-T800/conf/machine/auto2735evb-ivt-base.conf
@@ -230,3 +230,8 @@
#TCXO support
#TCXO_SUPPORT = "no"
#Typethree@2023.2.03 modify for TCXO hw version end
+
+#xf.li@20230207 modiry for version number start
+LYNQ_CONFIG_VERSION = "T800_UNSET_v02.MP1_MR3.02b06.00.01"
+LYNQ_CONFIG_SW_VERSION = "T800_UNSET_v02.MP1_MR1.01b06.00"
+#xf.li@20230207 modiry for version number end
diff --git a/meta-sdk/meta/poky/meta/classes/kernel.bbclass b/meta-sdk/meta/poky/meta/classes/kernel.bbclass
index d7cfeb6..e9fd5cd 100644
--- a/meta-sdk/meta/poky/meta/classes/kernel.bbclass
+++ b/meta-sdk/meta/poky/meta/classes/kernel.bbclass
@@ -160,7 +160,8 @@
#LXF 2022.10.12 modify for T8TSK-91 in sdk start
#export KBUILD_BUILD_USER ?= "oe-user"
#export KBUILD_BUILD_HOST ?= "oe-host"
-##LXF 2022.10.12 modify for T8TSK-91 in sdk end
+export LYNQ_VERSION ?= "${LYNQ_CONFIG_VERSION}"
+#LXF 2022.10.12 modify for T8TSK-91 in sdk end
KERNEL_RELEASE ?= "${KERNEL_VERSION}"
# The directory where built kernel lies in the kernel tree
diff --git a/meta/meta-mediatek-mt2735/conf/machine/auto2735evb-ivt-base.conf b/meta/meta-mediatek-mt2735/conf/machine/auto2735evb-ivt-base.conf
index c65006d..61a0700 100755
--- a/meta/meta-mediatek-mt2735/conf/machine/auto2735evb-ivt-base.conf
+++ b/meta/meta-mediatek-mt2735/conf/machine/auto2735evb-ivt-base.conf
@@ -206,3 +206,8 @@
#TCXO_SUPPORT = "no"
#Typethree@2023.2.01 modify for TCXO hw version end
MTK_LED_SUPPORT = "yes"
+
+#xf.li@20230207 modiry for version number start
+LYNQ_CONFIG_VERSION = "T800_UNSET_v02.MP1_MR3.02b06.00.01"
+LYNQ_CONFIG_SW_VERSION = "T800_UNSET_v02.MP1_MR1.01b06.00"
+#xf.li@20230207 modiry for version number end
diff --git a/meta/meta-mediatek-mt2735/recipes-bsp/lk/lk_2.0.0.bbappend b/meta/meta-mediatek-mt2735/recipes-bsp/lk/lk_2.0.0.bbappend
index c9c32a6..dca4fe3 100644
--- a/meta/meta-mediatek-mt2735/recipes-bsp/lk/lk_2.0.0.bbappend
+++ b/meta/meta-mediatek-mt2735/recipes-bsp/lk/lk_2.0.0.bbappend
@@ -5,6 +5,8 @@
DEPENDS += "packer-native"
+EXTRA_OEMAKE += "'LYNQ_CONFIG_VERSION = ${LYNQ_CONFIG_VERSION}'"
+
do_compile () {
if [ "${MT2735_LITE_CONFIG}" = "yes" ]; then
# Set CCB buffer size to 0 on lite project
diff --git a/meta/meta-mediatek-mt2735/recipes-lynq/lynq-default/lynq-default.bb b/meta/meta-mediatek-mt2735/recipes-lynq/lynq-default/lynq-default.bb
index f0d0a80..0c0cd79 100644
--- a/meta/meta-mediatek-mt2735/recipes-lynq/lynq-default/lynq-default.bb
+++ b/meta/meta-mediatek-mt2735/recipes-lynq/lynq-default/lynq-default.bb
@@ -14,6 +14,9 @@
'MTK_MULTI_SIM_SUPPORT = ${MTK_MULTI_SIM_SUPPORT}'\
'TARGET_PLATFORM = ${TARGET_PLATFORM}'"
+EXTRA_OEMAKE += "'LYNQ_CONFIG_VERSION = ${LYNQ_CONFIG_VERSION}' \
+ 'LYNQ_CONFIG_SW_VERSION = ${LYNQ_CONFIG_SW_VERSION}'"
+
#INHIBIT_PACKAGE_STRIP = "1"
do_compile () {
if [ "${PACKAGE_ARCH}" = "cortexa7hf-vfp-vfpv4-neon" ]; then
diff --git a/meta/meta-mediatek/recipes-bsp/bl33/bl33_1.0.bb b/meta/meta-mediatek/recipes-bsp/bl33/bl33_1.0.bb
index 0d2a833..dd0dc14 100644
--- a/meta/meta-mediatek/recipes-bsp/bl33/bl33_1.0.bb
+++ b/meta/meta-mediatek/recipes-bsp/bl33/bl33_1.0.bb
@@ -8,6 +8,8 @@
#S = "${WORKDIR}"
DEPENDS += "u-boot-mkimage-native bc-native dtc-native"
+EXTRA_OEMAKE += "'LYNQ_CONFIG_VERSION = ${LYNQ_CONFIG_VERSION}'"
+
TOOLCHAIN_PREFIX = "${TARGET_PREFIX}"
EXTERNALSRC = "${MTK_SRC}"
EXTERNALSRC_BUILD = "${MTK_SRC}"
diff --git a/meta/poky/meta/classes/kernel.bbclass b/meta/poky/meta/classes/kernel.bbclass
index afc2532..f85849f 100644
--- a/meta/poky/meta/classes/kernel.bbclass
+++ b/meta/poky/meta/classes/kernel.bbclass
@@ -160,6 +160,7 @@
#LXF 2022.10.10 modify for T8TSK-91 start
#export KBUILD_BUILD_USER ?= "oe-user"
#export KBUILD_BUILD_HOST ?= "oe-host"
+export LYNQ_VERSION ?= "${LYNQ_CONFIG_VERSION}"
#LXF 2022.10.10 modify for T8TSK-91 end
KERNEL_RELEASE ?= "${KERNEL_VERSION}"
diff --git a/src/bsp/lk/engine.mk b/src/bsp/lk/engine.mk
index 29332e9..6f58dba 100644
--- a/src/bsp/lk/engine.mk
+++ b/src/bsp/lk/engine.mk
@@ -56,6 +56,12 @@
GLOBAL_CFLAGS := --std=gnu99 -Werror-implicit-function-declaration -Wstrict-prototypes -Wwrite-strings
#GLOBAL_CFLAGS += -Werror
GLOBAL_CPPFLAGS := -fno-exceptions -fno-rtti -fno-threadsafe-statics
+#xf.li@20230207 modify for T8TSK-155
+LYNQ_CONFIG_COMMITID := $(shell git rev-parse HEAD)
+
+GLOBAL_COMPILEFLAGS += -DLYNQ_VERSION=\"$(LYNQ_CONFIG_VERSION)\"
+GLOBAL_COMPILEFLAGS += -DLYNQ_COMMITID=\"$(LYNQ_CONFIG_COMMITID)\"
+#xf.li@20230207 modify for T8TSK-155
#GLOBAL_CPPFLAGS += -Weffc++
GLOBAL_ASMFLAGS := -DASSEMBLY
GLOBAL_LDFLAGS :=
diff --git a/src/bsp/lk/top/main.c b/src/bsp/lk/top/main.c
index 36b5a31..95fee17 100644
--- a/src/bsp/lk/top/main.c
+++ b/src/bsp/lk/top/main.c
@@ -87,7 +87,9 @@
// do any super early target initialization
lk_primary_cpu_init_level(LK_INIT_LEVEL_PLATFORM_EARLY, LK_INIT_LEVEL_TARGET_EARLY - 1);
target_early_init();
-
+#ifdef LYNQ_VERSION
+ dprintf(CRITICAL, "LYNQ_VERSION:"LYNQ_VERSION" LYNQ_COMMITID: "LYNQ_COMMITID"\n");
+#endif
#if WITH_SMP
dprintf(INFO, "\nwelcome to lk/MP\n\n");
#else
diff --git a/src/kernel/linux/v4.19/scripts/mkcompile_h b/src/kernel/linux/v4.19/scripts/mkcompile_h
index 5d178a9..4aaaa32 100755
--- a/src/kernel/linux/v4.19/scripts/mkcompile_h
+++ b/src/kernel/linux/v4.19/scripts/mkcompile_h
@@ -52,7 +52,7 @@
fi
#LXF 2022.10.10 modify for T8TSK-91 start
COMMITID=$(git rev-parse --short HEAD)
-LYNQ_VERSION="T800_UNSET_v02.MP1_MR3.02b06.00.01"
+#LYNQ_VERSION="T800_UNSET_v02.MP1_MR3.02b06.00.01"
UTS_VERSION="#$VERSION"
CONFIG_FLAGS=""
diff --git a/src/lynq/packages/apps/lynq-default/lynq_default.c b/src/lynq/packages/apps/lynq-default/lynq_default.c
index d32a4b2..ba3a4b4 100755
--- a/src/lynq/packages/apps/lynq-default/lynq_default.c
+++ b/src/lynq/packages/apps/lynq-default/lynq_default.c
@@ -9,8 +9,8 @@
//#define USER_LOG_TAG "lynq_default"
-#define LYNQ_SW_VERSION "T800v02.MP1_MR1.01b04.01"//needs to be modified if upgrade version
-#define LYNQ_SW_INSIDE_VERSION "T800v02.MP1_MR1.01b04.04"//only for insde check
+//#define LYNQ_SW_VERSION "T800v02.MP1_MR1.01b04.01"//needs to be modified if upgrade version
+//#define LYNQ_SW_INSIDE_VERSION "T800v02.MP1_MR1.01b04.04"//only for insde check
//#define GET_DATA_LEN 64
#define BUF_LEN 258
diff --git a/src/lynq/packages/apps/lynq-default/makefile b/src/lynq/packages/apps/lynq-default/makefile
index fbb54dd..e5e41eb 100644
--- a/src/lynq/packages/apps/lynq-default/makefile
+++ b/src/lynq/packages/apps/lynq-default/makefile
@@ -9,6 +9,8 @@
+LOCAL_CFLAGS += -DLYNQ_SW_INSIDE_VERSION=\"$(LYNQ_CONFIG_VERSION)\"
+LOCAL_CFLAGS += -DLYNQ_SW_VERSION=\"$(LYNQ_CONFIG_SW_VERSION)\"
LOCAL_PATH = .
diff --git a/update_version.sh b/update_version.sh
index 3b320bc..8790303 100644
--- a/update_version.sh
+++ b/update_version.sh
@@ -1,10 +1,10 @@
#!/bin/bash
-LYNQ_VERSION="LYNQ_VERSION=\"T800_UNSET_v02.MP1_MR3.02b06.00.01\""
-LYNQ_SW_INSIDE_VERSION="#define LYNQ_SW_INSIDE_VERSION \"T800_UNSET_v02.MP1_MR3.02b06.00.01\""
-LYNQ_SW_VERSION="#define LYNQ_SW_VERSION \"T800_UNSET_v02.MP1_MR1.01b06.00\""
+LYNQ_SW_INSIDE_VERSION="LYNQ_CONFIG_VERSION = \"T800_UNSET_v02.MP1_MR3.02b06.00.01\""
+LYNQ_SW_VERSION="LYNQ_CONFIG_SW_VERSION = \"T800_UNSET_v02.MP1_MR1.01b06.00\""
-eval sed -i 's/^.*LYNQ_VERSION=.*$/${LYNQ_VERSION}/' $(pwd)/src/kernel/linux/v4.19/scripts/mkcompile_h
-eval sed -i 's/^.*define[[:space:]][[:space:]]LYNQ_SW_INSIDE_VERSION.*$/"${LYNQ_SW_INSIDE_VERSION}"/' $(pwd)/src/lynq/packages/apps/lynq-default/lynq_default.c
-eval sed -i 's/^.*define[[:space:]][[:space:]]LYNQ_SW_VERSION.*$/"${LYNQ_SW_VERSION}"/' $(pwd)/src/lynq/packages/apps/lynq-default/lynq_default.c
+eval sed -i 's/^.*LYNQ_CONFIG_VERSION.*$/"${LYNQ_SW_INSIDE_VERSION}"/' $(pwd)/meta/meta-mediatek-mt2735/conf/machine/auto2735evb-ivt-base.conf
+eval sed -i 's/^.*LYNQ_CONFIG_SW_VERSION.*$/"${LYNQ_SW_VERSION}"/' $(pwd)/meta/meta-mediatek-mt2735/conf/machine/auto2735evb-ivt-base.conf
+eval sed -i 's/^.*LYNQ_CONFIG_VERSION.*$/"${LYNQ_SW_INSIDE_VERSION}"/' $(pwd)/meta-sdk/meta/meta-lynqSDK-T800/conf/machine/auto2735evb-ivt-base.conf
+eval sed -i 's/^.*LYNQ_CONFIG_SW_VERSION.*$/"${LYNQ_SW_VERSION}"/' $(pwd)/meta-sdk/meta/meta-lynqSDK-T800/conf/machine/auto2735evb-ivt-base.conf