From e9bdad91a561bcdb33fce9fb76fed698c330cd6f Mon Sep 17 00:00:00 2001
From: andy <1414772332@qq.com>
Date: Thu, 8 May 2025 18:49:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=AF=91kl2=E6=97=B6=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0-j=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/build_app_brm.sh       |  4 ++--
 build/build_kl2_flash_cco.sh | 10 +++++-----
 build/build_kl2_flash_sta.sh | 20 ++++++++++----------
 mfgtool/oem_tool/Makefile    |  3 +++
 tools/gen_img/gen_img.sh     |  4 ++--
 5 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/build/build_app_brm.sh b/build/build_app_brm.sh
index 3cf7b6f..971c164 100755
--- a/build/build_app_brm.sh
+++ b/build/build_app_brm.sh
@@ -41,8 +41,8 @@ do
 
     export layout_index=4   #4m flash with psram
 
-    . env_tmp.sh && [ "$NOT_CLEAN" == "" ] && make APP=$APP_SEL -C .. clobber
-    make APP=$APP_SEL FLASH_SIZE=$FLASH -C ..
+    . env_tmp.sh && [ "$NOT_CLEAN" == "" ] && make -j APP=$APP_SEL -C .. clobber
+    make -j APP=$APP_SEL FLASH_SIZE=$FLASH -C ..
 
     rm env_tmp.sh
     cd ../tools/gen_img
diff --git a/build/build_kl2_flash_cco.sh b/build/build_kl2_flash_cco.sh
index adda788..c766d34 100755
--- a/build/build_kl2_flash_cco.sh
+++ b/build/build_kl2_flash_cco.sh
@@ -93,7 +93,7 @@ elif [ $BUILD_FLAGS == 1 ]; then
     ENV_STRING=${CHIP_ID_ENV}${CHIP}
     echo $ENV_STRING >> env_tmp.sh
     cat env_tmp.sh
-    . env_tmp.sh && make APP=$APP_SEL -C .. clobber && make APP=$APP_SEL FLASH_SIZE=4 -C ..
+    . env_tmp.sh && make -j APP=$APP_SEL -C .. clobber && make -j APP=$APP_SEL FLASH_SIZE=4 -C ..
     rm env_tmp.sh
     for STR in ${CUSTOM_STRING[@]}; do
         cd ../tools/gen_img
@@ -108,7 +108,7 @@ elif [ $BUILD_FLAGS == 2 ]; then
     ENV_STRING=${CHIP_ID_ENV}${CHIP}
     echo $ENV_STRING >> env_tmp.sh
     cat env_tmp.sh
-    . env_tmp.sh && make APP=$APP_SEL -C .. clobber && make APP=$APP_SEL FLASH_SIZE=4 -C ..
+    . env_tmp.sh && make -j APP=$APP_SEL -C .. clobber && make -j APP=$APP_SEL FLASH_SIZE=4 -C ..
     rm env_tmp.sh
     for STR in ${CUSTOM_STRING[@]}; do
         cd ../tools/gen_img
@@ -146,7 +146,7 @@ elif [ $BUILD_FLAGS == 3 ]; then
     ENV_STRING=${CHIP_ID_ENV}${CHIP}
     echo $ENV_STRING >> env_tmp.sh
     cat env_tmp.sh
-    . env_tmp.sh && make APP=$APP_SEL -C .. clobber && make APP=$APP_SEL FLASH_SIZE=4 -C ..
+    . env_tmp.sh && make -j APP=$APP_SEL -C .. clobber && make -j APP=$APP_SEL FLASH_SIZE=4 -C ..
     rm env_tmp.sh
     cd ../tools/gen_img
     ./gen_img.sh -d ${CHIP} -c ${STR} -i ${IMG_TYPE} -r flash -m lzma -s ${FLASH_SIZE} -b 2 -p ${PSRAM_SIZE}
@@ -158,7 +158,7 @@ elif [ $BUILD_FLAGS == 4 ]; then
     ENV_STRING=${CHIP_ID_ENV}${CHIP}
     echo $ENV_STRING >> env_tmp.sh
     cat env_tmp.sh
-    . env_tmp.sh && make APP=$APP_SEL -C .. clobber && make APP=$APP_SEL FLASH_SIZE=4 -C ..
+    . env_tmp.sh && make -j APP=$APP_SEL -C .. clobber && make -j APP=$APP_SEL FLASH_SIZE=4 -C ..
     rm env_tmp.sh
     cd ../tools/gen_img
     ./gen_img.sh -d ${CHIP} -c ${CUSTOM} -i ${IMG_TYPE} -r ${TYPE} -m lzma -s ${FLASH_SIZE} -b 2 -p ${PSRAM_SIZE}
@@ -168,7 +168,7 @@ elif [ $BUILD_FLAGS == 5 ]; then
     echo "BUILD FLAGS: "${BUILD_FLAGS}
     echo $FLASH_SIZE_ENV >> env_tmp.sh
     cat env_tmp.sh
-    . env_tmp.sh && make APP=$APP_SEL -C .. clobber && make APP=$APP_SEL FLASH_SIZE=4 -C ..
+    . env_tmp.sh && make -j APP=$APP_SEL -C .. clobber && make -j APP=$APP_SEL FLASH_SIZE=4 -C ..
     rm env_tmp.sh
 
     for STR in ${CUSTOM_STRING[@]}; do
diff --git a/build/build_kl2_flash_sta.sh b/build/build_kl2_flash_sta.sh
index 4b603a3..8c12365 100755
--- a/build/build_kl2_flash_sta.sh
+++ b/build/build_kl2_flash_sta.sh
@@ -91,8 +91,8 @@ elif [ $BUILD_FLAGS == 1 ]; then
     cp $SRC_ENV_FILE env_tmp.sh
     echo $ENV_STRING >> env_tmp.sh
     cat env_tmp.sh
-    . env_tmp.sh && [ "$NOT_CLEAN" == "" ] && make APP=$APP_SEL -C .. clobber
-    make PLATFORM=CHIP APP=$APP_SEL FLASH_SIZE=4 -C ..
+    . env_tmp.sh && [ "$NOT_CLEAN" == "" ] && make -j APP=$APP_SEL -C .. clobber
+    make -j PLATFORM=CHIP APP=$APP_SEL FLASH_SIZE=4 -C ..
     rm env_tmp.sh
     for STR in ${CUSTOM_STRING[@]}; do
         cd ../tools/gen_img
@@ -110,8 +110,8 @@ elif [ $BUILD_FLAGS == 2 ]; then
     cp $SRC_ENV_FILE env_tmp.sh
     echo $ENV_STRING >> env_tmp.sh
     cat env_tmp.sh
-    . env_tmp.sh && [ "$NOT_CLEAN" == "" ] && make APP=$APP_SEL -C .. clobber
-    make APP=$APP_SEL FLASH_SIZE=4 -C ..
+    . env_tmp.sh && [ "$NOT_CLEAN" == "" ] && make -j APP=$APP_SEL -C .. clobber
+    make -j APP=$APP_SEL FLASH_SIZE=4 -C ..
     rm env_tmp.sh
     for STR in ${CUSTOM_STRING[@]}; do
         cd ../tools/gen_img
@@ -155,8 +155,8 @@ elif [ $BUILD_FLAGS == 3 ]; then
     ENV_STRING=${CHIP_ID_ENV}${CHIP}
     echo $ENV_STRING >> env_tmp.sh
     cat env_tmp.sh
-    . env_tmp.sh && [ "$NOT_CLEAN" == "" ] && make APP=$APP_SEL -C .. clobber
-    make APP=$APP_SEL FLASH_SIZE=4 -C ..
+    . env_tmp.sh && [ "$NOT_CLEAN" == "" ] && make -j APP=$APP_SEL -C .. clobber
+    make -j APP=$APP_SEL FLASH_SIZE=4 -C ..
     rm env_tmp.sh
     cd ../tools/gen_img
     if [ "$STR" != "jsmt" ]; then
@@ -171,8 +171,8 @@ elif [ $BUILD_FLAGS == 4 ]; then
     cp $SRC_ENV_FILE env_tmp.sh
     echo $ENV_STRING >> env_tmp.sh
     cat env_tmp.sh
-    . env_tmp.sh && [ "$NOT_CLEAN" == "" ] && make APP=$APP_SEL -C .. clobber
-    make APP=$APP_SEL FLASH_SIZE=4 -C ..
+    . env_tmp.sh && [ "$NOT_CLEAN" == "" ] && make -j APP=$APP_SEL -C .. clobber
+    make -j APP=$APP_SEL FLASH_SIZE=4 -C ..
     rm env_tmp.sh
     cd ../tools/gen_img
     if [ "$STR" != "jsmt" ]; then
@@ -185,8 +185,8 @@ elif [ $BUILD_FLAGS == 5 ]; then
     cp $SRC_ENV_FILE env_tmp.sh
     echo $FLASH_SIZE_ENV >> env_tmp.sh
     cat env_tmp.sh
-    . env_tmp.sh && [ "$NOT_CLEAN" == "" ] && make APP=$APP_SEL -C .. clobber
-    make APP=$APP_SEL FLASH_SIZE=4 -C ..
+    . env_tmp.sh && [ "$NOT_CLEAN" == "" ] && make -j APP=$APP_SEL -C .. clobber
+    make -j APP=$APP_SEL FLASH_SIZE=4 -C ..
     rm env_tmp.sh
 
     for STR in ${CUSTOM_STRING[@]}; do
diff --git a/mfgtool/oem_tool/Makefile b/mfgtool/oem_tool/Makefile
index 58fd29c..c08fbf6 100644
--- a/mfgtool/oem_tool/Makefile
+++ b/mfgtool/oem_tool/Makefile
@@ -8,10 +8,13 @@ CC = gcc
 
 ifeq ($(target), kunlun2)
     hw_dep = hw2
+		CFLAGS += -DTARGET_VERSION=2
 else ifeq ($(target), kunlun3)
     hw_dep = hw3
+		CFLAGS += -DTARGET_VERSION=3
 else
     hw_dep = hw
+		CFLAGS += -DTARGET_VERSION=1
 endif
 
 ifeq ($(TOPDIR),)
diff --git a/tools/gen_img/gen_img.sh b/tools/gen_img/gen_img.sh
index 48f881f..4306fac 100755
--- a/tools/gen_img/gen_img.sh
+++ b/tools/gen_img/gen_img.sh
@@ -1004,8 +1004,8 @@ else
 
     # prepare oem.bin
     cp $TOP_DIR/sbl/.output/lib/kunlun_sbl.bin $CUR_DIR/sbl.bin
-    cp $TOP_DIR/mfgtool/ram/.output/lib/kl1_ram.bin $CUR_DIR/ram.bin
-    cp $TOP_DIR/mfgtool/ram/.output/lib/kl1_ram*.bin $CUR_DIR
+    cp $TOP_DIR/mfgtool/ram/.output/lib/kl${CHIP_VER_UPPER}_ram.bin $CUR_DIR/ram.bin
+    cp $TOP_DIR/mfgtool/ram/.output/lib/kl${CHIP_VER_UPPER}_ram*.bin $CUR_DIR
     cp $TOP_DIR/sp/boot/.output/lib/sp_fw.bin $CUR_DIR/sp.bin
 
     if [ "${IMG_UPPER}" == "FTM" ] || [ "${IMG_UPPER}" == "CKB" ]; then