visionfive2: Use upstream u-boot

Use upstream u-boot provided by poky instead of u-boot-starfive. Upstream u-boot expects to boot an efi binary. Signed-off-by: Leonard Anderweit <[email protected]>
riscv · Jan 15, 2025 · dc4171a · dc4171a
1 parent c07de36
commit dc4171a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/conf/machine/visionfive2.conf b/conf/machine/visionfive2.conf
@@ -18,6 +18,10 @@ KERNEL_DEVICETREE ?= "starfive/jh7110-starfive-visionfive-2-v1.3b.dtb"
 
 #============================================
 # Uboot Configuration
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
+UBOOT_SUFFIX = "itb"
 UBOOT_MACHINE = "starfive_visionfive2_defconfig"
-UBOOT_DTB_BINARY = "starfive_visionfive2.dtb"
+UBOOT_DTB_BINARY = "jh7110-starfive-visionfive-2.dtb"
+SPL_BINARY = "spl/u-boot-spl.bin.normal.out"
+UBOOT_ENV = ""
 #============================================
diff --git a/wic/visionfive2.wks b/wic/visionfive2.wks
@@ -14,7 +14,7 @@
 #
 part spl --source rawcopy --sourceparams="file=u-boot-spl.bin.normal.out" --part-name spl --offset 4096S --size 2M --part-type 2E54B353-1271-4842-806F-E436D6AF6985
 
-part uboot --source rawcopy --sourceparams="file=visionfive2_fw_payload.img" --part-name uboot --offset 8192S --size 4M --part-type 5B193300-FC78-40CD-8002-E86C45580B47
+part uboot --source rawcopy --sourceparams="file=u-boot.itb" --part-name uboot --offset 8192S --size 4M --part-type 5B193300-FC78-40CD-8002-E86C45580B47
 
 part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --use-uuid --part-name boot --part-type EBD0A0A2-B9E5-4433-87C0-68B6B72699C7 --align 4096 --size 292M