Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0

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

diff --git a/pack-kernel.sh b/pack-kernel.sh
index c56a82b94c732a48309aa62702d7b147888ed23a..c6d52741330b9cff5d17d67322b5349f69e95091 100755 (executable)
--- a/pack-kernel.sh
+++ b/pack-kernel.sh
@@ -26,11 +26,6 @@ EXCLUDES=()
 
 if [ "$arch" == "rk30" ]; then
 
-FILES=(
-arch/arm/mach-rk30/clock_data.c
-arch/arm/mach-rk30/ddr.c
-)
-
 EXCLUDES=(
 arch/arm/mach-rk30/*rk3066b*
 arch/arm/mach-rk30/include/mach/*rk3066b*
@@ -52,11 +47,6 @@ defconfig=rk3066_sdk_defconfig
 
 elif [ "$arch" == "rk2928" ]; then
 
-FILES=(
-arch/arm/mach-rk2928/clock_data.c
-arch/arm/mach-rk2928/ddr.c
-)
-
 EXCLUDES=(
 arch/arm/mach-rk30/*.c
 arch/arm/mach-rk30/*.h
@@ -84,14 +74,16 @@ defconfig=rk2928_sdk_defconfig
 
 elif [ "$arch" == "rk3066b" ]; then
 
-FILES=(
-arch/arm/mach-rk30/clock_data-rk3066b.c
-arch/arm/mach-rk30/ddr.c
-)
-
 EXCLUDES=(
 arch/arm/mach-rk30/clock_data.c
-arch/arm/mach-rk30/board-rk30-*
+arch/arm/mach-rk30/board-rk30-ds*
+arch/arm/mach-rk30/board-rk30-phone*
+arch/arm/mach-rk30/board-rk30-sdk.c
+arch/arm/mach-rk30/board-rk30-sdk-tps65910.c
+arch/arm/mach-rk30/board-rk30-sdk-twl80032.c
+arch/arm/mach-rk30/board-rk30-sdk-rfkill.c
+arch/arm/mach-rk30/board-rk30-sdk-wm8326.c
+
 arch/arm/configs/rk30_*
 arch/arm/configs/rk3066_*
 
@@ -103,7 +95,7 @@ arch/arm/mach-rk29*/include
 arch/arm/configs/rk29*
 )
 
-defconfig=rk3066b_sdk_defconfig
+defconfig=rk3168_tb_defconfig
 
 else
        echo "unknown arch" && usage
@@ -118,6 +110,10 @@ drivers/staging/rk29/vivante
 drivers/staging/rk29/ipp/rk29-ipp.c
 drivers/*rk28*.c
 include/*rk28*
+arch/arm/mach-rk3188/*.c
+arch/arm/mach-rk3188/*.h
+arch/arm/mach-rk3188/Makefile*
+arch/arm/mach-rk3188/include
 arch/arm/mach-rk29/*.c
 arch/arm/mach-rk29/*.h
 arch/arm/mach-rk29/*.S
@@ -125,6 +121,7 @@ arch/arm/mach-rk29/Makefile*
 arch/arm/mach-rk29/include
 arch/arm/mach-rk*/*-fpga*
 arch/arm/mach-rk*/*-tb*
+arch/arm/configs/rk3188_*
 arch/arm/configs/rk29_*
 arch/arm/configs/*_fpga_*
 arch/arm/configs/*_tb_*
@@ -149,6 +146,7 @@ echo build kernel on $kerndir with $defconfig, arch is $arch
 make clean >/dev/null 2>&1
 make $defconfig >/dev/null 2>&1
 
+[ -z "${files}${DIRS}" ] ||
 make -j`grep 'processor' /proc/cpuinfo | wc -l` ${files[@]/.[cS]/.o} ${DIRS[@]}
 
 for file in ${FILES[@]}; do