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 83462cecc1f308cd838877b647ef103a830f85c8..6bb24bf0bd16df5ea82de773152156887f244cca 100755 (executable)
--- a/pack-kernel.sh
+++ b/pack-kernel.sh
@@ -5,8 +5,7 @@ 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
@@ -26,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
 
@@ -46,12 +47,15 @@ arch/arm/configs/rk29_FIH_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
 }
 
@@ -67,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