Browse Source

Merge branch 'CR_1336_opensbi_Andy.Hu' into 'jh7110-devel'

CR_1336: building: update makefile, its files and .gitmodules for new opensbi

See merge request sdk/freelight-u-sdk!41
andy.hu 1 year ago
parent
commit
8b91371211
4 changed files with 5 additions and 5 deletions
  1. 1 1
      .gitmodules
  2. 2 2
      Makefile
  3. 1 1
      conf/evb-uboot-fit-image.its
  4. 1 1
      conf/visionfive-uboot-fit-image.its

+ 1 - 1
.gitmodules

@@ -13,4 +13,4 @@
 [submodule "opensbi"]
 	path = opensbi
 	url = http://192.168.110.45/sdk/opensbi.git
-	branch = jh7110-devel
+	branch = master

+ 2 - 2
Makefile

@@ -49,7 +49,7 @@ initramfs := $(wrkdir)/initramfs.cpio.gz
 sbi_srcdir := $(srcdir)/opensbi
 sbi_wrkdir := $(wrkdir)/opensbi
 
-sbi_bin := $(wrkdir)/opensbi/platform/starfive/firmware/fw_payload.bin
+sbi_bin := $(wrkdir)/opensbi/platform/generic/firmware/fw_payload.bin
 
 fit := $(wrkdir)/image.fit
 uboot_fit := $(wrkdir)/$(HWBOARD)_fw_payload.img
@@ -224,7 +224,7 @@ $(sbi_bin): $(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 FW_PAYLOAD_PATH=$(uboot) FW_FDT_PATH=$(uboot_dtb_file)
+		PLATFORM=generic FW_PAYLOAD_PATH=$(uboot) FW_FDT_PATH=$(uboot_dtb_file)
 
 $(fit): $(sbi_bin) $(vmlinux_bin) $(uboot) $(its_file) ${initramfs}
 	$(uboot_wrkdir)/tools/mkimage -f $(its_file) -A riscv -O linux -T flat_dt $@

+ 1 - 1
conf/evb-uboot-fit-image.its

@@ -7,7 +7,7 @@
 	images {
 		firmware {
 			description = "u-boot";
-			data = /incbin/("../work/opensbi/platform/starfive/firmware/fw_payload.bin");
+			data = /incbin/("../work/opensbi/platform/generic/firmware/fw_payload.bin");
 			type = "firmware";
 			arch = "riscv";
 			os = "u-boot";

+ 1 - 1
conf/visionfive-uboot-fit-image.its

@@ -7,7 +7,7 @@
 	images {
 		firmware {
 			description = "u-boot";
-			data = /incbin/("../work/opensbi/platform/starfive/firmware/fw_payload.bin");
+			data = /incbin/("../work/opensbi/platform/generic/firmware/fw_payload.bin");
 			type = "firmware";
 			arch = "riscv";
 			os = "u-boot";