diff --git a/Makefile b/Makefile index 537c10a..b1099c9 100644 --- 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 index 7e1f091..b1d64a1 100644 --- 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 deleted file mode 100644 index 404f156..0000000 --- a/Makefile.rockchip.debug.mk +++ /dev/null @@ -1,43 +0,0 @@ -run: image - rkflashtool/rkflashloader rk3328evb - -.PHONY: maskrom run image flash -maskrom: - cat rkbin/rk33/rk3328_ddr_$(ROCKCHIP_DDR_SPEED)_v$(ROCKCHIP_DDR_VERSION).bin | openssl rc4 -K 7c4e0304550509072d2c7b38170d1711 | rkflashtool l - sleep 1s - cat rkbin/rk33/rk3328_usbplug_v$(ROCKCHIP_LOADER_VERSION).bin | openssl rc4 -K 7c4e0304550509072d2c7b38170d1711 | rkflashtool L - sleep 1s - rkflashtool e 64 32704 - rkflashtool b - sleep 1s - cat rkbin/rk33/rk3328_ddr_$(ROCKCHIP_DDR_SPEED)_v$(ROCKCHIP_DDR_VERSION).bin | openssl rc4 -K 7c4e0304550509072d2c7b38170d1711 | rkflashtool l - sleep 1s - cat rkbin/rk33/rk3328_miniloader_v$(ROCKCHIP_LOADER_VERSION).bin | openssl rc4 -K 7c4e0304550509072d2c7b38170d1711 | rkflashtool L - sleep 2s - -flashrom: - cat rkbin/rk33/rk3328_ddr_$(ROCKCHIP_DDR_SPEED)_v$(ROCKCHIP_DDR_VERSION).bin | openssl rc4 -K 7c4e0304550509072d2c7b38170d1711 | rkflashtool l - sleep 1s - cat rkbin/rk33/rk3328_usbplug_v$(ROCKCHIP_LOADER_VERSION).bin | openssl rc4 -K 7c4e0304550509072d2c7b38170d1711 | rkflashtool L - sleep 1s - rkflashtool e 64 32704 - rkflashtool w 64 8000 < image/rk3328evb-miniloader.img - rkflashtool b - sleep 2s - rkflashtool w 8192 8192 < image/rk3328evb-uboot.bin - rkflashtool w 16384 8192 < image/rk3328evb-trust.img - sleep 1s - rkflashtool b - -maskload: - make maskrom - rkflashtool w 8192 8192 < image/rk3328evb-uboot.bin - rkflashtool w 16384 8192 < image/rk3328evb-trust.img - rkflashtool b - sleep 1s - cat rkbin/rk33/rk3328_ddr_$(ROCKCHIP_DDR_SPEED)_v$(ROCKCHIP_DDR_VERSION).bin | openssl rc4 -K 7c4e0304550509072d2c7b38170d1711 | rkflashtool l - sleep 1s - cat rkbin/rk33/rk3328_miniloader_v$(ROCKCHIP_LOADER_VERSION).bin | openssl rc4 -K 7c4e0304550509072d2c7b38170d1711 | rkflashtool L - -reboot: - rkflashtool b diff --git a/Makefile.rockchip.mk b/Makefile.rockchip.mk deleted file mode 100644 index 57598f4..0000000 --- a/Makefile.rockchip.mk +++ /dev/null @@ -1,51 +0,0 @@ -ROCKCHIP_DDR_VERSION ?= 1.08 -ROCKCHIP_DDR_SPEED ?= 333MHz -ROCKCHIP_LOADER_VERSION ?= 2.44 -ROCKCHIP_UBOOT_CONFIG ?= rock64-rk3328_defconfig - -arm-trusted-firmware: - git clone https://github.com/ARM-software/arm-trusted-firmware.git - -rkbin: - git clone https://github.com/rockchip-linux/rkbin - -u-boot-rockchip: - git clone https://github.com/ayufan-rock64/linux-u-boot u-boot-rockchip -b mainline-master - -rkbin/rk33/bl31.bin: arm-trusted-firmware $(LINARO) - make -C $< CROSS_COMPILE="$(LINARO_CC)" PLAT=rk3328 bl31 - cp $> $@.tmp - mv $@.tmp $@ - rm miniloader.tmp - -image/rk3328evb-uboot.bin: u-boot-rockchip/u-boot-dtb.bin - rkbin/tools/loaderimage --pack --uboot $< $@ 0x200000 - -.PHONY: image-rockchip -image-rockchip: \ - image/rk3328evb-trust.img \ - image/rk3328evb-miniloader.img \ - image/rk3328evb-uboot.bin