From 71cadfda29d4b41598bb466add4dd7241cd6ac44 Mon Sep 17 00:00:00 2001 From: andy <1414772332@qq.com> Date: Sat, 14 Dec 2024 15:43:03 +0800 Subject: [PATCH] =?UTF-8?q?kl1=20=E4=BD=BF=E7=94=A8=E5=A4=9A=E7=BA=BF?= =?UTF-8?q?=E7=A8=8B=E7=BC=96=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/build_flash_cco.sh | 10 +++++----- build/build_flash_sta.sh | 10 +++++----- build/build_time_cost_test.py | 17 +++++++++++++++++ tools/gen_img/gen_img.sh | 4 ++-- 4 files changed, 29 insertions(+), 12 deletions(-) create mode 100755 build/build_time_cost_test.py diff --git a/build/build_flash_cco.sh b/build/build_flash_cco.sh index 7a27b81..1627f57 100755 --- a/build/build_flash_cco.sh +++ b/build/build_flash_cco.sh @@ -181,7 +181,7 @@ if [ $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 PLATFORM=CHIP APP=$APP_SEL -C .. + . env_tmp.sh && make -j APP=$APP_SEL -C .. clobber && make -j PLATFORM=CHIP APP=$APP_SEL -C .. rm env_tmp.sh for STR in ${CUSTOM_STRING[@]}; do cd ../tools/gen_img @@ -203,7 +203,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 PLATFORM=CHIP APP=$APP_SEL -C .. + . env_tmp.sh && make -j APP=$APP_SEL -C .. clobber && make -j PLATFORM=CHIP APP=$APP_SEL -C .. rm env_tmp.sh for STR in ${CUSTOM_STRING[@]}; do cd ../tools/gen_img @@ -249,7 +249,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 PLATFORM=CHIP FLASH_SIZE=$FLASH_SIZE_nM APP=$APP_SEL -C .. + . env_tmp.sh && make -j APP=$APP_SEL -C .. clobber && make -j PLATFORM=CHIP FLASH_SIZE=$FLASH_SIZE_nM APP=$APP_SEL -C .. rm env_tmp.sh cd ../tools/gen_img @@ -271,7 +271,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 PLATFORM=CHIP FLASH_SIZE=$FLASH_SIZE_nM APP=$APP_SEL -C .. + . env_tmp.sh && make -j APP=$APP_SEL -C .. clobber && make -j PLATFORM=CHIP FLASH_SIZE=$FLASH_SIZE_nM APP=$APP_SEL -C .. rm env_tmp.sh cd ../tools/gen_img @@ -300,7 +300,7 @@ elif [ $BUILD_FLAGS == 5 ]; then echo $ENV_STRING >> env_tmp.sh cat env_tmp.sh - . env_tmp.sh && make APP=$APP_SEL -C .. clobber && make PLATFORM=CHIP FLASH_SIZE=$FLASH_SIZE_nM APP=$APP_SEL -C .. + . env_tmp.sh && make -j APP=$APP_SEL -C .. clobber && make -j PLATFORM=CHIP FLASH_SIZE=$FLASH_SIZE_nM APP=$APP_SEL -C .. rm env_tmp.sh for STR in ${CUSTOM_STRING[@]}; do diff --git a/build/build_flash_sta.sh b/build/build_flash_sta.sh index dee57e1..90c902e 100755 --- a/build/build_flash_sta.sh +++ b/build/build_flash_sta.sh @@ -213,7 +213,7 @@ if [ $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 PLATFORM=CHIP APP=$APP_SEL -C .. + . env_tmp.sh && make -j APP=$APP_SEL -C .. clobber && make -j PLATFORM=CHIP APP=$APP_SEL -C .. rm env_tmp.sh for STR in ${CUSTOM_STRING[@]}; do cd ../tools/gen_img @@ -249,7 +249,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 PLATFORM=CHIP APP=$APP_SEL -C .. + . env_tmp.sh && make -j APP=$APP_SEL -C .. clobber && make -j PLATFORM=CHIP APP=$APP_SEL -C .. rm env_tmp.sh for STR in ${CUSTOM_STRING[@]}; do cd ../tools/gen_img @@ -311,7 +311,7 @@ elif [ $BUILD_FLAGS == 3 ]; then ENV_STRING=${FLASH_SIZE_ENV}${FLASH_SIZE_nM} echo $ENV_STRING >> env_tmp.sh cat env_tmp.sh - . env_tmp.sh && make APP=$APP_SEL -C .. clobber && make PLATFORM=CHIP FLASH_SIZE=$FLASH_SIZE_nM APP=$APP_SEL -C .. + . env_tmp.sh && make -j APP=$APP_SEL -C .. clobber && make -j PLATFORM=CHIP FLASH_SIZE=$FLASH_SIZE_nM APP=$APP_SEL -C .. rm env_tmp.sh cd ../tools/gen_img for IMG in ${IMG_TYPE[@]}; do @@ -344,7 +344,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 PLATFORM=CHIP FLASH_SIZE=$FLASH_SIZE_nM APP=$APP_SEL -C .. + . env_tmp.sh && make -j APP=$APP_SEL -C .. clobber && make -j PLATFORM=CHIP FLASH_SIZE=$FLASH_SIZE_nM APP=$APP_SEL -C .. rm env_tmp.sh cd ../tools/gen_img for IMG in ${IMG_TYPE[@]}; do @@ -379,7 +379,7 @@ elif [ $BUILD_FLAGS == 5 ]; 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 PLATFORM=CHIP FLASH_SIZE=$FLASH_SIZE_nM APP=$APP_SEL -C .. + . env_tmp.sh && make -j APP=$APP_SEL -C .. clobber && make -j PLATFORM=CHIP FLASH_SIZE=$FLASH_SIZE_nM APP=$APP_SEL -C .. rm env_tmp.sh for STR in ${CUSTOM_STRING[@]}; do diff --git a/build/build_time_cost_test.py b/build/build_time_cost_test.py new file mode 100755 index 0000000..4454d0a --- /dev/null +++ b/build/build_time_cost_test.py @@ -0,0 +1,17 @@ +#!/usr/bin/python3 +# -*- coding: utf-8 -*- + + +import os +import sys +import time + +if __name__ == "__main__": + time_start=time.time() + cmd=f"{' '.join(sys.argv[1:])} > build_log.log" + print(cmd) + os.system("python3 ../clear_output.py") + os.system(cmd) + time_end=time.time() + print(f"build end, cost {time_end-time_start} s") + print(time.asctime()) diff --git a/tools/gen_img/gen_img.sh b/tools/gen_img/gen_img.sh index 365d711..48f881f 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/kl_ram.bin $CUR_DIR/ram.bin - cp $TOP_DIR/mfgtool/ram/.output/lib/kl_ram*.bin $CUR_DIR + 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/sp/boot/.output/lib/sp_fw.bin $CUR_DIR/sp.bin if [ "${IMG_UPPER}" == "FTM" ] || [ "${IMG_UPPER}" == "CKB" ]; then