Skip to content

Commit 97e98a1

Browse files
committed
Add load address
1 parent 2e6915e commit 97e98a1

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

Makefile.rockchip.mk

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,34 +12,37 @@ rkbin:
1212
u-boot-rockchip:
1313
git clone https://github.com/ayufan-rock64/linux-u-boot u-boot-rockchip -b mainline-master
1414

15-
rkbin/rk33/bl31.bin: arm-trusted-firmware gcc-linaro-6.3.1-2017.05-x86_64_aarch64-linux-gnu
15+
rkbin/rk33/bl31.bin: arm-trusted-firmware $(LINARO)
1616
make -C $< CROSS_COMPILE="$(LINARO_CC)" PLAT=rk3328 bl31
1717
cp $</build/rk3328/release/bl31.bin $@
1818

1919
ifeq ($(FORCE), 1)
2020
.PHONY: u-boot-rockchip/.config
2121
endif
22-
u-boot-rockchip/.config: u-boot-rockchip/configs/$(ROCKCHIP_UBOOT_CONFIG)
23-
make -C u-boot-rockchip $(ROCKCHIP_UBOOT_CONFIG)
22+
u-boot-rockchip/.config: u-boot-rockchip/configs/$(ROCKCHIP_UBOOT_CONFIG) $(LINARO)
23+
make -C u-boot-rockchip $(ROCKCHIP_UBOOT_CONFIG) CROSS_COMPILE="$(LINARO_CC)"
2424

2525
u-boot-rockchip/u-boot-dtb.bin: u-boot-rockchip/.config
26-
make -C u-boot-rockchip CROSS_COMPILE="ccache aarch64-linux-gnu-" DEBUG=$(DEBUG) all -j4
26+
make -C u-boot-rockchip CROSS_COMPILE="$(LINARO_CC)" DEBUG=$(DEBUG) all -j4
2727

2828
.PHONY: u-boot-rockchip-build
2929
u-boot-rockchip-build: image/rk3328evb-uboot.bin
3030

3131
image/rk3328evb-trust.img: # rkbin/rk33/bl31.bin
3232
rkbin/tools/trust_merger blobs/rk3328trust.ini
3333

34-
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
34+
ifeq ($(FORCE), 1)
35+
.PHONY: image/rk3328evb-miniloader.img
36+
endif
37+
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
3538
cat rkbin/rk33/rk3328_ddr_$(ROCKCHIP_DDR_SPEED)_v$(ROCKCHIP_DDR_VERSION).bin | dd of=miniloader.tmp bs=4 skip=1
3639
u-boot-rockchip/tools/mkimage -n rk3328 -T rksd -d miniloader.tmp $@.tmp
3740
cat rkbin/rk33/rk3328_miniloader_v$(ROCKCHIP_LOADER_VERSION).bin >> $@.tmp
3841
mv $@.tmp $@
3942
rm miniloader.tmp
4043

4144
image/rk3328evb-uboot.bin: u-boot-rockchip/u-boot-dtb.bin
42-
rkbin/tools/loaderimage --pack --uboot $< $@
45+
rkbin/tools/loaderimage --pack --uboot $< $@ 0x200000
4346

4447
.PHONY: image-rockchip
4548
image-rockchip: \

0 commit comments

Comments
 (0)