From: Huang, Tao <huangtao@rock-chips.com>
Date: Sat, 21 Nov 2015 13:22:50 +0000 (+0800)
Subject: rk: arm64: support build kernel.img and resource.img
X-Git-Tag: firefly_0821_release~3600
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=622771b972d46491e546fe19ae3e8f1bb687a5fb;p=firefly-linux-kernel-4.4.55.git

rk: arm64: support build kernel.img and resource.img

Change-Id: Icc8efc2c706aaed9c4a91dc40d4489ea74d65771
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
---

diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
index cd822d8454c0..c1a8848f7609 100644
--- a/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@ -120,3 +120,15 @@ define archhelp
   echo  '                  (distribution) /sbin/installkernel or'
   echo  '                  install to $$(INSTALL_PATH) and run lilo'
 endef
+
+kernel.img: Image
+	$(Q)$(srctree)/scripts/mkkrnlimg $(objtree)/arch/arm64/boot/Image $(objtree)/kernel.img >/dev/null
+	@echo '  Image:  kernel.img is ready'
+
+LOGO := $(notdir $(wildcard $(srctree)/logo.bmp))
+LOGO_KERNEL := $(notdir $(wildcard $(srctree)/logo_kernel.bmp))
+%.img: rockchip/%.dtb kernel.img $(LOGO) $(LOGO_KERNEL)
+	$(Q) if [ -f $(srctree)/$(LOGO) -a "$(srctree)" != "$(objtree)" ]; then cp -a $(srctree)/$(LOGO) $(objtree)/; fi
+	$(Q) if [ -f $(srctree)/$(LOGO_KERNEL) -a "$(srctree)" != "$(objtree)" ]; then cp -a $(srctree)/$(LOGO_KERNEL) $(objtree)/; fi
+	$(Q)$(srctree)/scripts/resource_tool $(objtree)/arch/arm64/boot/dts/rockchip/$*.dtb $(LOGO) $(LOGO_KERNEL)
+	@echo '  Image:  resource.img (with $*.dtb $(LOGO) $(LOGO_KERNEL)) is ready'
diff --git a/mkkrnlimg b/mkkrnlimg
deleted file mode 100755
index 9249dc8dcdd0..000000000000
Binary files a/mkkrnlimg and /dev/null differ
diff --git a/pack-kernel.sh b/pack-kernel.sh
deleted file mode 100755
index 2416d7c8821a..000000000000
--- a/pack-kernel.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-set -e
-
-kerndir=$(cd .; pwd)	# get absolute path
-[ -d $kerndir ] || exit
-
-COMMON_EXCLUDES=(
-pack-kernel*
-defconfig
-kernel.img
-arch/arm/plat-rk/vpu*.c
-arch/arm/plat-rk/rk_pm_tests/*.c
-arch/arm/plat-rk/rk_pm_tests/*.h
-drivers/staging/rk29/vivante
-drivers/staging/rk29/ipp/rk29-ipp.c
-drivers/*rk28*.c
-include/*rk28*
-arch/arm/mach-rk29/*.c
-arch/arm/mach-rk29/*.h
-arch/arm/mach-rk29/*.S
-arch/arm/mach-rk29/Makefile*
-arch/arm/mach-rk29/include
-arch/arm/mach-rk30/*rk3168m*
-arch/arm/mach-rk*/*-fpga*
-arch/arm/configs/rk29_*
-arch/arm/configs/rk3168m_*
-arch/arm/configs/*_fpga_*
-arch/arm/configs/rk30_phone_*
-arch/arm/configs/*_openwrt_*
-
-arch/arm/mach-rk30/board-rk30-phone-*
-arch/arm/mach-rk30/board-rk30-phonepad.c
-arch/arm/mach-rk30/board-rk30-phonepad-key.c
-arch/arm/configs/rk30_phonepad*
-
-arch/arm/mach-rk2928/board-rk2928-a720*
-arch/arm/configs/rk2928_a720_defconfig
-
-arch/arm/mach-rk30/*rk3028*
-arch/arm/configs/rk3028_*
-)
-
-# ---------------------------------------------------------------------------
-make -j`grep 'processor' /proc/cpuinfo | wc -l` distclean >/dev/null 2>&1
-
-# fix local version
-echo "+" > $kerndir/.scmversion
-
-# tar kernel
-pushd $kerndir/../ >/dev/null
-package=$(basename $kerndir).tar
-ex=$package.ex
-> $ex
-for file in ${COMMON_EXCLUDES[@]}; do
-	echo "$file" >> $ex
-done
-echo TAR $(pwd)/$package
-tar cf $package --numeric-owner --exclude-from $ex --exclude=.git $(basename $kerndir)
-echo GZIP $(pwd)/$package.gz
-gzip -9 -c $package > $package.gz
-rm $ex
-popd >/dev/null
-
-rm -f $kerndir/.scmversion
-
-echo done
diff --git a/resource_tool b/resource_tool
deleted file mode 100755
index 53318bd73664..000000000000
Binary files a/resource_tool and /dev/null differ
diff --git a/scripts/mkkrnlimg b/scripts/mkkrnlimg
new file mode 100755
index 000000000000..9249dc8dcdd0
Binary files /dev/null and b/scripts/mkkrnlimg differ
diff --git a/scripts/resource_tool b/scripts/resource_tool
new file mode 100755
index 000000000000..53318bd73664
Binary files /dev/null and b/scripts/resource_tool differ