Преглед изворни кода

dubhe: starfive-dubhe: Update config for nfs support

Update starfive-dubhe machine conf with conditional variable assignment that support different image build and removed auto.conf.

Signed-off-by: yang.lee <yang.lee@starfivetech.com>
yang.lee пре 1 година
родитељ
комит
4ae0312331
2 измењених фајлова са 5 додато и 34 уклоњено
  1. 0 29
      conf/auto.conf
  2. 5 5
      conf/machine/starfive-dubhe.conf

+ 0 - 29
conf/auto.conf

@@ -1,29 +0,0 @@
-MACHINE ?= "starfive-dubhe"
-#IMAGE_FEATURES += "tools-debug"
-#IMAGE_FEATURES += "tools-tweaks"
-#IMAGE_FEATURES += "dbg-pkgs"
-# rootfs for debugging
-#IMAGE_GEN_DEBUGFS = "1"
-#IMAGE_FSTYPES_DEBUGFS = "tar.gz"
-#EXTRA_IMAGE_FEATURES:append = " ssh-server-dropbear"
-EXTRA_IMAGE_FEATURES:append = " package-management"
-PACKAGECONFIG:append:pn-qemu-native = " sdl"
-PACKAGECONFIG:append:pn-nativesdk-qemu = " sdl"
-USER_CLASSES ?= "buildstats buildhistory buildstats-summary"
-
-require conf/distro/include/no-static-libs.inc
-require conf/distro/include/yocto-uninative.inc
-require conf/distro/include/security_flags.inc
-
-INHERIT += "uninative"
-
-DISTRO_FEATURES:append = " largefile opengl ptest multiarch wayland pam  systemd "
-DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit"
-VIRTUAL-RUNTIME_init_manager = "systemd"
-##VIRTUAL-RUNTIME_initscripts = ""
-##VIRTUAL-RUNTIME_syslog = ""
-HOSTTOOLS_NONFATAL:append = " ssh"
-
-DISTRO_NAME = "StarFive Linux SDK"
-#DISTRO_VERSION = ""
-#DISTRO_CODENAME = ""

+ 5 - 5
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_EXT4','1','Image-starfive-dubhe.bin','Image-initramfs-starfive-dubhe.bin',d)}"
+QB_DEFAULT_KERNEL = "${@oe.utils.conditional('ENABLE_NFS','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 = "${@oe.utils.conditional('ENABLE_EXT4','1','ext4','cpio.gz',d)}"
+QB_DEFAULT_FSTYPE = "${@oe.utils.conditional('ENABLE_NFS','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)}"
+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)}"
 
 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 = "${@oe.utils.conditional('ENABLE_EXT4','1','Image-starfive-dubhe.bin','Image-initramfs-starfive-dubhe.bin',d)}"
+RISCV_SBI_PAYLOAD = "${@oe.utils.conditional('ENABLE_NFS','1','Image-starfive-dubhe.bin','Image-initramfs-starfive-dubhe.bin',d)}"
 
 QEMU_EXTRAOPTIONS:riscv64 = " -cpu rv64,x-b=true,x-v=true"
 
@@ -48,7 +48,7 @@ BINUVERSION = "2.37"
 
 QEMUVERSION = "6.0.0"
 
-PREFERRED_VERSION_opensbi = "0.9"
+PREFERRED_VERSION_opensbi = "1.1"
 #
 ###IMAGE_FSTYPES += "wic.gz wic.bmap ext4 cpio"