update build-kernel.sh and sync-master.sh/sync-p.sh

Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>

4 files changed, 48 insertions, 33 deletions

diff --git a/build.sh b/build.sh
index fdfd4ea..56f500a 100755
--- a/build.sh
+++ b/build.sh
@@ -321,14 +321,19 @@ function build_board_ver(){
 }
 
 export CFG_TEE_SUPP_LOG_LEVEL=3
+#export TARGET_KERNEL_USE=4.14
+#export TARGET_KERNEL_SOURCE=kernel/linaro/hisilicon-4.9
+
+rm -fr out/target/product/hikey/obj/kernel
 #build_board_ver hikey o
 #build_board_ver x15 o
-#build_board_ver hikey p
+build_board_ver hikey p
 #build_board_ver x15 p
-build_board_ver x15 master
+#build_board_ver x15 master
 #export TARGET_KERNEL_SOURCE=kernel/linaro/hisilicon-4.4
 #build_board_ver hikey master
 #make -j"${CPUs}" vts cts
+
 #source build/envsetup.sh
 #lunch hikey-userdebug
 #make -j"${CPUs}" vts
diff --git a/host-tools/build-kernel.sh b/host-tools/build-kernel.sh
index f663f65..683dc25 100755
--- a/host-tools/build-kernel.sh
+++ b/host-tools/build-kernel.sh
@@ -106,8 +106,11 @@ KERNEL_OUT_BASE="${AOSP_ROOT}/out/target/product/hikey/obj"
 function build_single_version(){
     local ver=$1 && shift
     rm -fr ${KERNEL_OUT_BASE}/kernel-${ver}/arch/arm64/boot/Image.gz-dtb
+    rm -fr ${AOSP_ROOT}/out/target/product/hikey/boot-${ver}.img
     build_kernel "${KERNEL_SRC_BASE}/hisilicon-${ver}" ${KERNEL_OUT_BASE}/kernel-${ver}
     make_bootimg ${KERNEL_OUT_BASE}/kernel-${ver}/arch/arm64/boot/Image.gz-dtb ${F_RAMDISK} ${AOSP_ROOT}/out/target/product/hikey/boot-${ver}.img
 }
 
 build_single_version 4.14
+build_single_version 4.9
+build_single_version 4.4
diff --git a/sync-master.sh b/sync-master.sh
index c73cf82..4cddac1 100755
--- a/sync-master.sh
+++ b/sync-master.sh
@@ -29,29 +29,21 @@ ${BASE}/sync-projects.sh  \
                           android-patchsets \
                           android-build-configs \
                           device/linaro/hikey \
-                          kernel/linaro/hisilicon-4.14 \
-                          kernel/linaro/hisilicon-4.9 \
-                          kernel/linaro/hisilicon-4.4 \
-                          frameworks/base \
-                          frameworks/av \
 
-#                          bionic \
-#                          build \
-
-#${BASE}/sync-projects.sh \
-#                        system/extras \
-#                        system/vold \
-#                        system/core \
+if [ -d kernel/linaro/hisilicon-4.14 ]; then
+    ${BASE}/sync-projects.sh kernel/linaro/hisilicon-4.14
+fi
+if [ -d kernel/linaro/hisilicon-4.9 ]; then
+    ${BASE}/sync-projects.sh kernel/linaro/hisilicon-4.9
+fi
+if [ -d kernel/linaro/hisilicon-4.4 ]; then
+    ${BASE}/sync-projects.sh kernel/linaro/hisilicon-4.4
+fi
 
 ${BASE}/sync-projects.sh \
                         external/libdrm \
                         device/ti/beagle-x15 \
 
-#                        kernel/ti/x15/ \
-#                        ti/u-boot/ \
-#                          art \
-#                          external/opencv-upstream \
-
 ${BASE}/sync-projects.sh \
                         external/optee_client \
                         external/optee_test \
@@ -64,9 +56,12 @@ fi
 func_apply_patch MASTER-RLCR-PATCHSET
 func_apply_patch hikey-master-workarounds
 func_apply_patch hikey-optee-master
-#func_apply_patch hikey-optee-4.9
-func_apply_patch hikey-optee-4.14
-#func_apply_patch MASTER-CLANG-PATCHSET
+if [ -d kernel/linaro/hisilicon-4.14 ]; then
+    func_apply_patch hikey-optee-4.14
+fi
+if [ -d kernel/linaro/hisilicon-4.9 ]; then
+    func_apply_patch hikey-optee-4.9-new
+fi
 func_apply_patch x15-master-workarounds
 func_apply_patch x15-master-workarounds-lcr
 #func_apply_patch NOUGAT-BOOTTIME-OPTIMIZATIONS-HIKEY
diff --git a/sync-p.sh b/sync-p.sh
index ec31fc1..70628cc 100755
--- a/sync-p.sh
+++ b/sync-p.sh
@@ -24,19 +24,27 @@ main "$@"
 if true; then
 ${BASE}/sync-projects.sh  \
                           android-patchsets \
+                          android-build-configs \
                           device/linaro/hikey \
-                          kernel/linaro/hisilicon-4.14 \
-                          kernel/linaro/hisilicon-4.9 \
-                          kernel/linaro/hisilicon-4.4 \
 
+if [ -d kernel/linaro/hisilicon-4.14 ]; then
+    ${BASE}/sync-projects.sh kernel/linaro/hisilicon-4.14
+fi
+if [ -d kernel/linaro/hisilicon-4.9 ]; then
+    ${BASE}/sync-projects.sh kernel/linaro/hisilicon-4.9
+fi
+if [ -d kernel/linaro/hisilicon-4.4 ]; then
+    ${BASE}/sync-projects.sh kernel/linaro/hisilicon-4.4
+fi
 
-#                        system/vold \
-
+${BASE}/sync-projects.sh \
+                        external/libdrm \
+                        device/ti/beagle-x15 \
 
-#                          art \
-#                        kernel/ti/x15/ \
-#                        ti/u-boot/ \
-#                          external/opencv-upstream \
+${BASE}/sync-projects.sh \
+                        external/optee_client \
+                        external/optee_test \
+                        optee/optee_os \
 
 fi
 #export http_proxy=192.168.0.102:37586
@@ -45,8 +53,12 @@ fi
 func_apply_patch P-RLCR-PATCHSET
 func_apply_patch hikey-p-workarounds
 func_apply_patch hikey-optee-p
-func_apply_patch hikey-optee-4.14
-#func_apply_patch hikey-clang-4.9
+if [ -d kernel/linaro/hisilicon-4.14 ]; then
+    func_apply_patch hikey-optee-4.14
+fi
+if [ -d kernel/linaro/hisilicon-4.9 ]; then
+    func_apply_patch hikey-optee-4.9-new
+fi
 #func_apply_patch OREO-BOOTTIME-OPTIMIZATIONS-HIKEY
 #func_apply_patch x15-p-workarounds
 #func_apply_patch NOUGAT-BOOTTIME-OPTIMIZATIONS-X15