Browse Source

update submodule repo:
1. Update uboot branch to Fedora_JH7100_upstream_devel
2. Update opensbi repo and branch

sw.multimedia 2 years ago
parent
commit
fc0a1ae647
4 changed files with 8 additions and 9 deletions
  1. 3 3
      .gitmodules
  2. 1 1
      HiFive_U-Boot
  3. 3 4
      Makefile
  4. 1 1
      opensbi

+ 3 - 3
.gitmodules

@@ -5,13 +5,13 @@
 [submodule "HiFive_U-Boot"]
 	path = HiFive_U-Boot
 	url = git@github.com:starfive-tech/u-boot.git
-	branch = JH7100_starlight_multimedia
+	branch = Fedora_JH7100_upstream_devel
 [submodule "linux"]
 	path = linux
 	url = git@github.com:starfive-tech/linux.git
 	branch = beaglev-5.13.y_multimedia
 [submodule "opensbi"]
 	path = opensbi
-	url = git@github.com:starfive-tech/sft-riscv-opensbi.git
-	branch = starfive
+	url = git@github.com:starfive-tech/opensbi.git
+	branch = master
 

+ 1 - 1
HiFive_U-Boot

@@ -1 +1 @@
-Subproject commit 79d31cb601310e4066a43ee66cb2b5e8135c6d30
+Subproject commit c787953247d7dec6e0aecad2e64ce3d57c7ca0a9

+ 3 - 4
Makefile

@@ -52,8 +52,8 @@ initramfs := $(wrkdir)/initramfs.cpio.gz
 
 sbi_srcdir := $(srcdir)/opensbi
 sbi_wrkdir := $(wrkdir)/opensbi
-sbi_bin := $(wrkdir)/opensbi/platform/starfive/vic7100/firmware/fw_payload.bin
-#sbi_bin := $(wrkdir)/opensbi/platform/generic/firmware/fw_payload.bin
+#sbi_bin := $(wrkdir)/opensbi/platform/starfive/vic7100/firmware/fw_payload.bin
+sbi_bin := $(wrkdir)/opensbi/platform/generic/firmware/fw_payload.bin
 fit := $(wrkdir)/image.fit
 
 fesvr_srcdir := $(srcdir)/riscv-fesvr
@@ -236,8 +236,7 @@ sbi: $(uboot) $(vmlinux)
 	rm -rf $(sbi_wrkdir)
 	mkdir -p $(sbi_wrkdir)
 	cd $(sbi_wrkdir) && O=$(sbi_wrkdir) CFLAGS="-mabi=$(ABI) -march=$(ISA)" ${MAKE} -C $(sbi_srcdir) CROSS_COMPILE=$(CROSS_COMPILE) \
-		PLATFORM=starfive/vic7100 FW_PAYLOAD_PATH=$(uboot) FW_PAYLOAD_FDT_PATH=$(uboot_dtb_file)
-
+		PLATFORM=generic FW_PAYLOAD_PATH=$(uboot) FW_FDT_PATH=$(uboot_dtb_file)
 
 $(fit): sbi $(vmlinux_bin) $(uboot) $(its_file) $(initramfs)
 	$(uboot_wrkdir)/tools/mkimage -f $(its_file) -A riscv -O linux -T flat_dt $@

+ 1 - 1
opensbi

@@ -1 +1 @@
-Subproject commit 9bbe683fa60bdd560ded480fcec30c9e591fcb70
+Subproject commit 395ff7eedec5e2b5b067e3725303a17352a07651