Explorar el Código

dubhe: starfive-dubhe: update config for ext4 support

Update starfive-dubhe machine conf with conditional variable assignment that support different image build.
Signed-off-by: yang.lee <yang.lee@starfivetech.com>
yang.lee hace 1 año
padre
commit
ebd5f12db0
Se han modificado 1 ficheros con 9 adiciones y 10 borrados
  1. 9 10
      conf/machine/starfive-dubhe.conf

+ 9 - 10
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 = "Image-initramfs-starfive-dubhe.bin"
+QB_DEFAULT_KERNEL = "${@oe.utils.conditional('ENABLE_EXT4','1','Image-starfive-dubhe.bin','Image-initramfs-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 = "cpio.gz"
+QB_DEFAULT_FSTYPE = "${@oe.utils.conditional('ENABLE_EXT4','1','ext4','cpio.gz',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_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,7 +38,7 @@ INITRAMFS_MAXSIZE = "524288"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-starfive-dev"
 RISCV_SBI_PLAT = "generic"
-RISCV_SBI_PAYLOAD = "Image-initramfs-starfive-dubhe.bin"
+RISCV_SBI_PAYLOAD = "${@oe.utils.conditional('ENABLE_EXT4','1','Image-starfive-dubhe.bin','Image-initramfs-starfive-dubhe.bin',d)}"
 
 QEMU_EXTRAOPTIONS:riscv64 = " -cpu rv64,x-b=true,x-v=true"
 
@@ -59,11 +59,10 @@ PREFERRED_VERSION_opensbi = "0.9"
 
 
 ## wic default support
-###WKS_FILE_DEPENDS ?= " \
-###    opensbi \
-###    e2fsprogs-native \
-###    bmap-tools-native \
-###"
+WKS_FILE_DEPENDS ?= " \
+    opensbi \
+    bmap-tools-native \
+"
 
 
 ###IMAGE_BOOT_FILES ?= " \
@@ -73,4 +72,4 @@ PREFERRED_VERSION_opensbi = "0.9"
 ###    boot.scr.uimg \
 ###"
 
-WKS_FILE ?= "starfive-dubhe-initramfs.wks"
+WKS_FILE ?= "starfive-dubhe.wks"