Browse Source

dubhe: starfive-dubhe.conf: Update machine config
Removed device tree variations for different bootargs.
Add U-Boot support to Dubhe-80 and Dubhe-90.

Signed-off-by: weiheng.cheng <weiheng.cheng@starfivetech.com>

weiheng.cheng 6 months ago
parent
commit
495d539898
1 changed files with 8 additions and 9 deletions
  1. 8 9
      conf/machine/starfive-dubhe.conf

+ 8 - 9
conf/machine/starfive-dubhe.conf

@@ -5,7 +5,7 @@
 
 LLVMVERSION = "16.0.5"
 CLANGSDK = "1"
-EXTRA_IMAGEDEPENDS:append = " llvm file-native rpm-native popt-native openocd-native"
+EXTRA_IMAGEDEPENDS:append = " llvm file-native rpm-native popt-native openocd-native u-boot-starfive"
 EXTRA_IMAGE_FEATURES:append = " dbg-pkgs tools-profile"
 
 PACKAGE_DEBUG_SPLIT_STYLE = 'debug-file-directory'
@@ -31,14 +31,7 @@ MACHINE_FEATURES = "screen keyboard ext2 ext3 serial"
 
 KERNEL_DEVICETREE ?= " \
 	starfive/dubhe80_fpga.dtb \
-	starfive/dubhe80_fpga_ext4.dtb \
-        starfive/dubhe80_fpga_ubi.dtb \
-        starfive/dubhe80_fpga_nfs.dtb \
 	starfive/dubhe90_fpga.dtb \
-	starfive/dubhe90_fpga_dual.dtb \
-	starfive/dubhe90_fpga_ext4.dtb \
-	starfive/dubhe90_fpga_ubi.dtb \
-	starfive/dubhe90_fpga_nfs.dtb \
 "
 KERNEL_IMAGETYPE = "Image"
 
@@ -48,8 +41,8 @@ INITRAMFS_MAXSIZE = "524288"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-starfive-dev"
 PREFERRED_VERSION_linux-starfive-dev = "6.1%"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-starfive"
 RISCV_SBI_PLAT = "generic"
-RISCV_SBI_PAYLOAD = "Image-starfive-dubhe.bin"
 
 QEMU_EXTRAOPTIONS:riscv64 = " -cpu rv64,x-b=true,x-v=true"
 
@@ -63,6 +56,12 @@ PREFERRED_VERSION_opensbi = "1.2"
 
 #UBOOT_CONFIG = "defconfig"
 
+UBOOT_MACHINE = "starfive_dubhe_fpga_defconfig"
+UBOOT_DTB_BINARY = "dubhe_fpga.dtb"
+
+SPL_BINARY = "spl/u-boot-spl.bin"
+SPL_NORMAL_BINARY = "u-boot-spl.bin.normal.out"
+
 ## Do not update fstab file when using wic images
 ###WIC_CREATE_EXTRA_ARGS ?= "--no-fstab-update"