Selaa lähdekoodia

Merge tag 'JH7110_515_SDK_v4.2.0' into jh7110-mm-devel

version JH7110_515_SDK_v4.2.0 for JH7110 EVB board
1. Fix hibernation issue: AQC107 PCIe NIC
2. Support linux driver module build for: PDM, TDM, I2S, Watchdog, QSPI
3. #3253 open source for spl_tool
4. #3211 fix gst-omx crashed upon calling OMX_UseEGLImage func
5. #3262 Fix hdmi mipi dual display crash dump issue
Andy Hu 1 vuosi sitten
vanhempi
commit
d13f0f097d
3 muutettua tiedostoa jossa 15 lisäystä ja 10 poistoa
  1. 13 8
      Makefile
  2. 1 1
      linux
  3. 1 1
      soft_3rdpart

+ 13 - 8
Makefile

@@ -75,8 +75,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
 
@@ -309,12 +311,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 $@
@@ -340,6 +344,7 @@ clean:
 	rm -f work/initramfs.cpio.gz
 	rm -f work/linux/vmlinux*
 	rm -f work/u-boot-spl.bin.normal.out
+	rm -rf work/$(spl_tool)
 
 .PHONY: distclean
 distclean:

+ 1 - 1
linux

@@ -1 +1 @@
-Subproject commit 7447339118f624bc7ef7d8fdb6ae7903296b0fca
+Subproject commit cbf92daa945c1bfe7f8b5b9afe3b43277d74d653

+ 1 - 1
soft_3rdpart

@@ -1 +1 @@
-Subproject commit b580826be8a00fb8143bc5ea3310ba12af612468
+Subproject commit 9594ea03f0ba85a2f39955a5966fbffbf06915d4