diff --git a/build.sh b/build.sh index 6ad37db5d67823d6908ef8f90c564bb5325044b4..4475a50ae37deb0665283f3078adce69b20be7ae 100755 --- a/build.sh +++ b/build.sh @@ -32,6 +32,7 @@ set -e echo "sh param:$1,$2,$3,$4,$5,$6,$7" destination=".config" +config_file="" tee="" outdir="../..$3/test_info/gen/kernel/test" if [ "$5" = "tee" ]; then @@ -41,15 +42,19 @@ productName="$(basename $7)" source="tools/build/config/${productName}_release.config" if [ "$2" = "clang" ]; then if [ "$4" = "debug" ]; then - source="tools/build/config/debug/${productName}_$2$tee.config" + config_file="${productName}_$2$tee.config" + source="tools/build/config/debug/$config_file" else - source="tools/build/config/${productName}_$2_release$tee.config" + config_file="${productName}_$2_release$tee.config" + source="tools/build/config/$config_file" fi elif [ "$2" = "gcc" ]; then if [ "$4" = "debug" ]; then - source="tools/build/config/${productName}_debug_shell$tee.config" + config_file="${productName}_debug_shell$tee.config" + source="tools/build/config/$config_file" else - source="tools/build/config/${productName}_release$tee.config" + config_file="${productName}_release$tee.config" + source="tools/build/config/$config_file" fi fi if [ -d "./out" ]; then @@ -58,6 +63,9 @@ fi if [ -f "$destination" ]; then rm -rf $destination fi +if [ ! -f "$source" ]; then + source="$7/config/sys/$config_file" +fi cp $source $destination mkdir -p $outdir diff --git a/platform/Kconfig b/platform/Kconfig index a9886b3ce8979e55c8a4cee97389045371808566..4982bcacde1563a140a6228465b9f752a11511a2 100755 --- a/platform/Kconfig +++ b/platform/Kconfig @@ -5,7 +5,7 @@ config PLATFORM default "virt" if PLATFORM_QEMU_ARM_VIRT_CA7 config PRODUCT_NAME - string + string "unknown" default "ipcamera_hi3516dv300_liteos" if PRODUCT_IPCAMERA_HI3516DV300_LITEOS default "ipcamera_hi3518ev300_liteos" if PRODUCT_IPCAMERA_HI3518EV300_LITEOS default "hispark_taurus" if PRODUCT_HISPARK_TAURUS @@ -13,7 +13,7 @@ config PRODUCT_NAME default "arm_virt" if PRODUCT_QEMU_ARM config DEVICE_COMPANY - string + string "unknown" default "hisilicon" if PLATFORM_HI3516DV300 default "hisilicon" if PLATFORM_HI3518EV300 default "qemu" if PLATFORM_QEMU_ARM_VIRT_CA7