Procházet zdrojové kódy

qemuriscv64.conf,freedom-u540.conf: Pin default libc to glibc

musl is not yet supported
Additionally sync with qemu invocation definitions from OE-Core qemus

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Khem Raj před 5 roky
rodič
revize
9d71c72b43
2 změnil soubory, kde provedl 10 přidání a 2 odebrání
  1. 2 0
      conf/machine/freedom-u540.conf
  2. 8 2
      conf/machine/qemuriscv64.conf

+ 2 - 0
conf/machine/freedom-u540.conf

@@ -38,6 +38,8 @@ WIC_CREATE_EXTRA_ARGS ?= "--no-fstab-update"
 
 IMAGE_BOOT_FILES = ""
 
+TCLIBC = "glibc"
+
 ### wic default support
 WKS_FILE_DEPENDS ?= " \
     riscv-pk \

+ 8 - 2
conf/machine/qemuriscv64.conf

@@ -16,6 +16,7 @@ GDBVERSION = "riscv"
 
 SERIAL_CONSOLES = "115200;ttyS0 115200;hvc0"
 
+TCLIBC = "glibc"
 IMAGE_FSTYPES_append = " ext4"
 
 MACHINE_EXTRA_RRECOMMENDS += " kernel-modules"
@@ -24,11 +25,16 @@ EXTRA_IMAGEDEPENDS += "riscv-pk"
 RISCV_BBL_PAYLOAD ?= "${KERNEL_IMAGETYPE}"
 
 # qemuboot options
+QB_KERNEL_CMDLINE_APPEND = "console=hvc0,115200"
 QB_MACHINE = "-machine virt"
 QB_DEFAULT_KERNEL = "bbl"
-QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@"
-QB_ROOTFS_OPT = "-drive file=@ROOTFS@,format=raw,id=hd0 -device virtio-blk-device,drive=hd0"
 QB_SLIRP_OPT = "-netdev user,id=net0,hostfwd=tcp::22222-:22"
+QB_OPT_APPEND = "-show-cursor -monitor null"
+QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no"
+QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@"
+QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=none,format=raw -device virtio-blk-device,drive=disk0"
+QB_SERIAL_OPT = "-device virtio-serial-device -chardev null,id=virtcon -device virtconsole,chardev=virtcon"
+QB_TCPSERIAL_OPT = " -device virtio-serial-device -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1 -device virtconsole,chardev=virtcon"
 
 BAD_RECOMMENDATIONS += "\
     libcxx-dev \