Add load address

ayufan-rock64 · Sep 12, 2017 · 97e98a1 · 97e98a1
1 parent 2e6915e
commit 97e98a1
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/Makefile.rockchip.mk b/Makefile.rockchip.mk
@@ -12,34 +12,37 @@ 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 gcc-linaro-6.3.1-2017.05-x86_64_aarch64-linux-gnu
+rkbin/rk33/bl31.bin: arm-trusted-firmware $(LINARO)
 	make -C $< CROSS_COMPILE="$(LINARO_CC)" PLAT=rk3328 bl31
 	cp $</build/rk3328/release/bl31.bin $@
 
 ifeq ($(FORCE), 1)
 .PHONY: u-boot-rockchip/.config
 endif
-u-boot-rockchip/.config: u-boot-rockchip/configs/$(ROCKCHIP_UBOOT_CONFIG)
-	make -C u-boot-rockchip $(ROCKCHIP_UBOOT_CONFIG)
+u-boot-rockchip/.config: u-boot-rockchip/configs/$(ROCKCHIP_UBOOT_CONFIG) $(LINARO)
+	make -C u-boot-rockchip $(ROCKCHIP_UBOOT_CONFIG) CROSS_COMPILE="$(LINARO_CC)"
 
 u-boot-rockchip/u-boot-dtb.bin: u-boot-rockchip/.config
-	make -C u-boot-rockchip CROSS_COMPILE="ccache aarch64-linux-gnu-" DEBUG=$(DEBUG) all -j4
+	make -C u-boot-rockchip CROSS_COMPILE="$(LINARO_CC)" DEBUG=$(DEBUG) all -j4
 
 .PHONY: u-boot-rockchip-build
 u-boot-rockchip-build: image/rk3328evb-uboot.bin
 
 image/rk3328evb-trust.img: # rkbin/rk33/bl31.bin
 	rkbin/tools/trust_merger blobs/rk3328trust.ini
 
-image/rk3328evb-miniloader.img: rkbin/rk33/rk3328_ddr_$(ROCKCHIP_DDR_SPEED)_v$(ROCKCHIP_DDR_VERSION).bin rkbin/rk33/rk3328_miniloader_v$(ROCKCHIP_LOADER_VERSION).bin
+ifeq ($(FORCE), 1)
+.PHONY: image/rk3328evb-miniloader.img
+endif
+image/rk3328evb-miniloader.img: rkbin/rk33/rk3328_ddr_$(ROCKCHIP_DDR_SPEED)_v$(ROCKCHIP_DDR_VERSION).bin rkbin/rk33/rk3328_miniloader_v$(ROCKCHIP_LOADER_VERSION).bin u-boot-rockchip/u-boot-dtb.bin
 	cat rkbin/rk33/rk3328_ddr_$(ROCKCHIP_DDR_SPEED)_v$(ROCKCHIP_DDR_VERSION).bin | dd of=miniloader.tmp bs=4 skip=1
 	u-boot-rockchip/tools/mkimage -n rk3328 -T rksd -d miniloader.tmp $@.tmp
 	cat rkbin/rk33/rk3328_miniloader_v$(ROCKCHIP_LOADER_VERSION).bin >> $@.tmp
 	mv $@.tmp $@
 	rm miniloader.tmp
 
 image/rk3328evb-uboot.bin: u-boot-rockchip/u-boot-dtb.bin
-	rkbin/tools/loaderimage --pack --uboot $< $@
+	rkbin/tools/loaderimage --pack --uboot $< $@ 0x200000
 
 .PHONY: image-rockchip
 image-rockchip: \