Do not compile Rockchip u-boot as this is already done by linux-build

ayufan-rock64 · Jan 7, 2018 · 12a0f81 · 12a0f81
1 parent 97e98a1
commit 12a0f81
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 101 deletions.
diff --git a/Makefile b/Makefile
@@ -4,13 +4,9 @@ include Makefile.kernel.mk
 include Makefile.linaro.mk
 include Makefile.pxe.mk
 include Makefile.rancheros.mk
-include Makefile.rockchip.mk
-include Makefile.rockchip.debug.mk
 include Makefile.sunxi.mk
 
 image: image-kernel \
-	image-rockchip \
-	image-sunxi \
 	image-pxe \
 	image-rancher
 

diff --git a/Makefile.kernel.mk b/Makefile.kernel.mk
@@ -10,11 +10,13 @@ ifeq ($(FORCE), 1)
 .PHONY: image/kernel-arm64
 endif
 image/kernel-arm64: kernel/.config
-	make -C kernel Image ARCH=arm64 CROSS_COMPILE="ccache aarch64-linux-gnu-" -j4
+	make -C kernel Image ARCH=arm64 CROSS_COMPILE="ccache aarch64-linux-gnu-" -j$$(nproc)
 	cp kernel/arch/arm64/boot/Image $@
 
-image/dtbs/rockchip/rk3328-rock64.dtb: image/kernel-arm64 kernel/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts kernel/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-	make -C kernel dtbs ARCH=arm64 CROSS_COMPILE="ccache aarch64-linux-gnu-" -j4
+image/dtbs/rockchip/rk3328-rock64.dtb: image/kernel-arm64 \
+	kernel/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts \
+	kernel/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+	make -C kernel dtbs ARCH=arm64 CROSS_COMPILE="ccache aarch64-linux-gnu-" -j$$(nproc)
 	make -C kernel dtbs_install ARCH=arm64 INSTALL_DTBS_PATH=$(CURDIR)/image/dtbs
 
 .PHONY: image-kernel

diff --git a/Makefile.rockchip.debug.mk b/Makefile.rockchip.debug.mk
diff --git a/Makefile.rockchip.mk b/Makefile.rockchip.mk