Просмотр исходного кода

Merge tag 'VF2_515_v2.10.4' into JH7110_VisionFive2_devel

VF2_515_v2.10.4 base on JH7110_515_SDK_v4.3.0, add below:

1. uboot: #3534: board:starfive:visionfive2: restructure load_distro_uenv
Andy Hu 1 год назад
Родитель
Сommit
5b23e04c3a
7 измененных файлов с 19 добавлено и 14 удалено
  1. 14 9
      Makefile
  2. 1 1
      buildroot
  3. BIN
      genimage_generic
  4. 1 1
      linux
  5. 1 1
      opensbi
  6. 1 1
      soft_3rdpart
  7. 1 1
      u-boot

+ 14 - 9
Makefile

@@ -79,8 +79,10 @@ uboot_dtb_file := $(wrkdir)/u-boot/arch/riscv/dts/starfive_$(HWBOARD).dtb
 
 uboot := $(uboot_wrkdir)/u-boot.bin
 
-spl_tool_srcdir :=$(CURDIR)/soft_3rdpart/spl_tool/
-spl_bin_normal_out :=$(wrkdir)/u-boot-spl.bin.normal.out
+spl_tool_srcdir :=$(CURDIR)/soft_3rdpart/spl_tool
+spl_tool := spl_tool
+
+spl_bin_normal_out := u-boot-spl.bin.normal.out
 
 uboot_config := starfive_$(HWBOARD)_defconfig
 
@@ -335,12 +337,14 @@ $(uboot): $(uboot_srcdir) $(target_gcc)
 	$(MAKE) -C $(uboot_srcdir) O=$(uboot_wrkdir) $(uboot_config)
 	$(MAKE) -C $(uboot_srcdir) O=$(uboot_wrkdir) CROSS_COMPILE=$(CROSS_COMPILE)
 
-$(spl_bin_normal_out): $(spl_tool_srcdir) $(uboot)
-	cd $(spl_tool_srcdir) && \
-	./create_sbl $(uboot_wrkdir)/spl/u-boot-spl.bin 0x01010101 && \
-	cd -
-	cp $(spl_tool_srcdir)/u-boot-spl.bin.normal.out $(spl_bin_normal_out)
-	rm -f $(spl_tool_srcdir)/u-boot-spl.bin*
+.PHONY: spl_tool
+spl_tool: $(spl_tool_srcdir)
+	$(MAKE) -C $(spl_tool_srcdir)
+	cp $(spl_tool_srcdir)/$(spl_tool) $(wrkdir)
+
+$(spl_bin_normal_out): spl_tool $(uboot)
+	$(wrkdir)/$(spl_tool) -c -f $(uboot_wrkdir)/spl/u-boot-spl.bin
+	cp $(uboot_wrkdir)/spl/$(spl_bin_normal_out) $(wrkdir)
 
 $(uboot_fit): $(sbi_bin) $(uboot_its_file) $(uboot)
 	$(uboot_wrkdir)/tools/mkimage -f $(uboot_its_file) -A riscv -O u-boot -T firmware $(uboot_fit)
@@ -367,6 +371,7 @@ clean:
 	rm -f work/linux/vmlinux*
 	rm -f work/u-boot-spl.bin.normal.out
 	rm -f work/version
+	rm -rf work/$(spl_tool)
 
 .PHONY: distclean
 distclean:
@@ -481,7 +486,7 @@ sdimg: $(buildroot_rootfs_ext)
 	@./genimage.sh
 
 img: sdimg
-	@./genimage_generic
+	$(wrkdir)/$(spl_tool) -i -f $(wrkdir)/sdcard.img
 
 #usb config
 format-usb-disk: $(sbi_bin) $(uboot) $(fit) $(vfat_image)

+ 1 - 1
buildroot

@@ -1 +1 @@
-Subproject commit eac4dda9b6f532cd83a118c131b453ffa1a1922e
+Subproject commit de2160340923fd0b8325eb95380d9b06a3869ed6

BIN
genimage_generic


+ 1 - 1
linux

@@ -1 +1 @@
-Subproject commit 59cf9af678dbfa3d73f6cb86ed1ae7219da9f5c9
+Subproject commit 4639179fefcf0ba72fb3dd2475bddf4148aeeed4

+ 1 - 1
opensbi

@@ -1 +1 @@
-Subproject commit 7700244f4d334d765ee5d994c3849ade09fb6844
+Subproject commit ced60104df4f835e1d6bd0697b38394de64e301a

+ 1 - 1
soft_3rdpart

@@ -1 +1 @@
-Subproject commit b580826be8a00fb8143bc5ea3310ba12af612468
+Subproject commit 7e127ac4f4f4c4e202a3b5c5b2702c02ce1bde5e

+ 1 - 1
u-boot

@@ -1 +1 @@
-Subproject commit f1d959f0b02e16842181a4c1723ba3ea30d2e04a
+Subproject commit 1539c1fb5a498fd7d20c2cffc84c187d703c8b66