Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop

[firefly-linux-kernel-4.4.55.git] / pack-kernel.sh

diff --git a/pack-kernel.sh b/pack-kernel.sh
index c8244a830259714611ccfa97d51998a3d42922ab..6bb24bf0bd16df5ea82de773152156887f244cca 100755 (executable)
--- a/pack-kernel.sh
+++ b/pack-kernel.sh
@@ -5,10 +5,10 @@ FILES=(
 # arch
 arch/arm/mach-rk29/clock.c
 arch/arm/mach-rk29/ddr.c
-arch/arm/mach-rk29/vpu.c
-arch/arm/mach-rk29/vpu_mem.c
+arch/arm/mach-rk29/vpu*.c
 
 drivers/staging/rk29/ipp/rk29-ipp.c
+sound/soc/codecs/rt5625.c
 )
 
 DIRS=(
@@ -25,6 +25,8 @@ sound/*rk28*.c
 sound/*rk28*.h
 include/*rk28*
 
+arch/arm/mach-rk29/ddr_reconfig.c
+
 drivers/staging/rk29/vivante/*.c
 drivers/staging/rk29/vivante/*.h
 
@@ -40,17 +42,20 @@ arch/arm/configs/rk29_Winaccord_defconfig
 arch/arm/mach-rk29/board-rk29-a22*
 arch/arm/configs/rk29_a22_defconfig
 
-arch/arm/mach-rk29/board-rk29-fih.c
+arch/arm/mach-rk29/board-rk29-fih*
 arch/arm/configs/rk29_FIH_defconfig
 
-arch/arm/mach-rk29/board-rk29-phonesdk*
-arch/arm/configs/rk29_phonesdk_defconfig
+arch/arm/mach-rk29/board-rk29-newton*
+arch/arm/configs/rk29_newton_defconfig
+
+arch/arm/mach-rk29/board-rk29-p91*
+arch/arm/configs/rk29_p91_defconfig
 )
 
 # ---------------------------------------------------------------------------
 usage() {
        echo usage: $0 kerneldir defconfig
-       echo example: $0 . rk29_sdk_defconfig
+       echo example: $0 . rk29_ddr3sdk_defconfig
        exit
 }
 
@@ -66,7 +71,7 @@ kerndir=${1-.}
 kerndir=$(cd $kerndir; pwd)    # get absolute path
 [ -d $kerndir ] || usage
 
-defconfig=${2-rk29_sdk_defconfig}
+defconfig=${2-rk29_ddr3sdk_defconfig}
 if [ "$defconfig" = ".config" ]; then
        [ -f $kerndir/.config ] || usage
 else
@@ -88,6 +93,11 @@ for d in ${DIRS[@]}; do
        [ -d $d ] && find $d -type f -name '*.uu' -print0 | xargs -0 rm -f
 done
 
+#zwp
+mv sound/soc/codecs/rt5625.c sound/soc/codecs/rt5625.c.bak
+mv sound/soc/codecs/rt5625.c.enc sound/soc/codecs/rt5625.c
+####
+
 echo build kernel on $kerndir with $defconfig
 make clean >/dev/null 2>&1
 make $defconfig >/dev/null 2>&1
@@ -109,7 +119,12 @@ for d in ${DIRS[@]}; do
        done
 done
 
-make clean >/dev/null 2>&1
+#zwp
+mv sound/soc/codecs/rt5625.c sound/soc/codecs/rt5625.c.enc
+mv sound/soc/codecs/rt5625.c.bak sound/soc/codecs/rt5625.c
+####
+
+make distclean >/dev/null 2>&1
 
 popd >/dev/null
 
@@ -124,6 +139,8 @@ done
 for file in ${EXCLUDES[@]}; do
        echo "$file" >> $ex
 done
+echo sound/soc/codecs/rt5625.c >>$ex
+echo sound/soc/codecs/rt5625.c.enc >>$ex
 echo TAR $(pwd)/$package
 tar cf $package --numeric-owner --exclude-from $ex --exclude=.git --exclude=`basename $0` $(basename $kerndir)
 tar rf $package --numeric-owner --exclude=.git toolchain/arm-eabi-4.4.0