From 197ccb61885ba5f1029131166309e5ec98fa9859 Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Tue, 28 Aug 2018 16:38:56 +0800 Subject: [PATCH] rk: arm64: Fix build problem with O= mkkrnlimg/resource_tool is build from source, don't use $(srctree) on Makefile. make modules when $(srctree) == $(objtree) otherwise build will fail. Change-Id: If8461a30d450aef089ae7db5f5851d4837e7c303 Signed-off-by: Tao Huang --- arch/arm64/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index 7f9be09fba1d..6edd48b23f1b 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -164,10 +164,10 @@ define archhelp endef kernel.img: Image.lz4 - $(Q)$(srctree)/scripts/mkkrnlimg $(objtree)/arch/arm64/boot/Image $(objtree)/kernel.img >/dev/null + $(Q)scripts/mkkrnlimg $(objtree)/arch/arm64/boot/Image $(objtree)/kernel.img >/dev/null @echo ' Image: kernel.img is ready' ifdef CONFIG_MODULES - $(Q)$(MAKE) modules + $(Q)if [ "$(srctree)" = "$(objtree)" ]; then $(MAKE) modules; fi endif LOGO := $(notdir $(wildcard $(srctree)/logo.bmp)) @@ -175,7 +175,7 @@ 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) + $(Q)scripts/resource_tool $(objtree)/arch/arm64/boot/dts/rockchip/$*.dtb $(LOGO) $(LOGO_KERNEL) @echo ' Image: resource.img (with $*.dtb $(LOGO) $(LOGO_KERNEL)) is ready' $(Q) if [ -x $(srctree)/scripts/mkbootimg ]; then \ $(srctree)/scripts/mkbootimg \