Ver código fonte

dubhe: starfive-dubhe: Update config variable

Update gcc,qemu,opensbi config version and starfive-dubhe machine conf with conditional variable assignment that support different image build.

Signed-off-by: yang.lee <yang.lee@starfivetech.com>
yang.lee 1 ano atrás
pai
commit
77ef2e488a
1 arquivos alterados com 8 adições e 8 exclusões
  1. 8 8
      conf/machine/starfive-dubhe.conf

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

@@ -15,15 +15,15 @@ PACKAGE_DEBUG_SPLIT_STYLE = 'debug-file-directory'
 EXTRA_IMAGEDEPENDS:append = " qemu-helper-native:do_addto_recipe_sysroot"
 IMAGE_CLASSES += " qemuboot "
 QB_MACHINE = "-machine virt"
-QB_DEFAULT_KERNEL = "${@oe.utils.conditional('ENABLE_NFS','1','Image-starfive-dubhe.bin','Image-initramfs-starfive-dubhe.bin',d)}"
+QB_DEFAULT_KERNEL = "${@oe.utils.conditional('ENABLE_INIT','1','Image-initramfs-starfive-dubhe.bin','Image-starfive-dubhe.bin',d)}"
 QB_DEFAULT_BIOS = "fw_payload.bin"
-QB_CPU = "-cpu rv64,x-h=true,x-b=true,x-v=true"
-QB_DEFAULT_FSTYPE = "${@oe.utils.conditional('ENABLE_NFS','1','ext4','cpio.gz',d)}"
+QB_CPU = "-cpu rv64"
+QB_DEFAULT_FSTYPE = "${@oe.utils.conditional('ENABLE_INIT','1','cpio.gz','ext4',d)}"
 SERIAL_CONSOLES = "115200;ttyS0"
 QB_SYSTEM_NAME = "qemu-system-riscv64"
 QB_MEM = "-m 2048"
 QB_OPT_APPEND = "-smp 8"
-QB_ROOTFS_OPT = "${@oe.utils.conditional('ENABLE_NFS','1','-drive file=@ROOTFS@,format=raw,id=mmc0,if=none -device virtio-blk-device,drive=mmc0','',d)}"
+QB_ROOTFS_OPT = "${@oe.utils.conditional('ENABLE_EXT4','1','-drive file=@ROOTFS@,format=raw,id=mmc0,if=none -device virtio-blk-device,drive=mmc0','',d)}"
 
 require conf/machine/include/riscv/tune-riscv.inc
 
@@ -38,15 +38,15 @@ INITRAMFS_MAXSIZE = "524288"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-starfive-dev"
 RISCV_SBI_PLAT = "generic"
-RISCV_SBI_PAYLOAD = "${@oe.utils.conditional('ENABLE_NFS','1','Image-starfive-dubhe.bin','Image-initramfs-starfive-dubhe.bin',d)}"
+RISCV_SBI_PAYLOAD = "${@oe.utils.conditional('ENABLE_INIT','1','Image-initramfs-starfive-dubhe.bin','Image-starfive-dubhe.bin',d)}"
 
 QEMU_EXTRAOPTIONS:riscv64 = " -cpu rv64,x-b=true,x-v=true"
 
 GLIBCVERSION = "2.36"
 BINUVERSION = "2.39"
-GCCVERSION = "12.1.0"
-QEMUVERSION = "6.0.0"
-PREFERRED_VERSION_opensbi = "1.1"
+GCCVERSION = "12.2.0"
+QEMUVERSION = "7.2.0"
+PREFERRED_VERSION_opensbi = "1.2"
 #
 ###IMAGE_FSTYPES += "wic.gz wic.bmap ext4 cpio"