Explorar el Código

conf/machine: Update with qemuriscv64 in OE-Core

Now that the qemuriscv64 machine is in OE-Core let's update the
meta-riscv layer to use that.

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Alistair Francis hace 4 años
padre
commit
94ff1c259f

+ 1 - 1
conf/machine/baremetal-riscv32.conf

@@ -4,7 +4,7 @@
 
 DEFAULTTUNE = "riscv32"
 require conf/machine/include/qemu.inc
-require conf/machine/include/tune-riscv.inc
+require conf/machine/include/riscv/tune-riscv.inc
 
 # qemuboot options
 QB_MACHINE = "-machine virt"

+ 1 - 1
conf/machine/baremetal-riscv64.conf

@@ -4,7 +4,7 @@
 
 DEFAULTTUNE = "riscv64"
 require conf/machine/include/qemu.inc
-require conf/machine/include/tune-riscv.inc
+require conf/machine/include/riscv/tune-riscv.inc
 
 # qemuboot options
 QB_MACHINE = "-machine virt"

+ 1 - 1
conf/machine/freedom-u540.conf

@@ -3,7 +3,7 @@
 #@SOC: Freedom U540
 #@DESCRIPTION: Machine configuration for the HiFive Unleashed development board
 
-require conf/machine/include/tune-riscv.inc
+require conf/machine/include/riscv/tune-riscv.inc
 
 MACHINE_FEATURES = "screen keyboard ext2 ext3 serial"
 

+ 0 - 10
conf/machine/include/arch-riscv.inc

@@ -1,10 +0,0 @@
-# RISCV Architecture definition
-
-DEFAULTTUNE ?= "riscv64"
-
-TUNE_ARCH = "${TUNE_ARCH_tune-${DEFAULTTUNE}}"
-TUNE_PKGARCH = "${TUNE_PKGARCH_tune-${DEFAULTTUNE}}"
-TUNE_CCARGS .= ""
-
-# QEMU usermode fails with invalid instruction error (For riscv32)
-MACHINE_FEATURES_BACKFILL_CONSIDERED_append = "${@bb.utils.contains('TUNE_FEATURES', 'riscv32', ' qemu-usermode', '', d)}"

+ 0 - 45
conf/machine/include/qemuriscv.inc

@@ -1,45 +0,0 @@
-PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
-
-require conf/machine/include/qemu.inc
-require conf/machine/include/tune-riscv.inc
-
-MACHINE_FEATURES = "screen keyboard ext2 ext3 serial"
-
-KERNEL_IMAGETYPE = "Image"
-
-SERIAL_CONSOLES ?= "115200;ttyS0 115200;hvc0"
-
-IMAGE_FSTYPES_append = " ext4"
-
-MACHINE_EXTRA_RRECOMMENDS += " kernel-modules"
-
-EXTRA_IMAGEDEPENDS += "opensbi"
-RISCV_SBI_PLAT ?= "qemu/virt"
-RISCV_SBI_PAYLOAD ?= "${KERNEL_IMAGETYPE}-${MACHINE}.bin"
-
-# qemuboot options
-QB_KERNEL_CMDLINE_APPEND = "earlycon=sbi"
-QB_MEM = "-m 512"
-QB_MACHINE = "-machine virt"
-QB_DEFAULT_KERNEL = "fw_jump.elf"
-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"
-# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
-QB_OPT_APPEND = " -object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-device,rng=rng0"
-
-BAD_RECOMMENDATIONS += "\
-    libcxx-dev \
-    libcxx-staticdev \
-    compiler-rt-dev \
-    compiler-rt-staticdev \
-"
-
-ASSUME_PROVIDED += "\
-    libcxx-dev \
-    libcxx-staticdev \
-    compiler-rt-dev \
-    compiler-rt-staticdev \
-"

+ 0 - 19
conf/machine/include/tune-riscv.inc

@@ -1,19 +0,0 @@
-require conf/machine/include/arch-riscv.inc
-
-TUNEVALID[riscv64] = "Enable 64-bit RISC-V optimizations"
-TUNEVALID[riscv32] = "Enable 32-bit RISC-V optimizations"
-
-TUNEVALID[littleendian] = "Little endian mode"
-
-AVAILTUNES += "riscv64 riscv32"
-
-TUNE_FEATURES_tune-riscv64 = "riscv64 littleendian"
-TUNE_ARCH_tune-riscv64 = "riscv64"
-TUNE_PKGARCH_tune-riscv64 = "riscv64"
-PACKAGE_EXTRA_ARCHS_tune-riscv64 = "riscv64"
-
-TUNE_FEATURES_tune-riscv32 = "riscv32 littleendian"
-TUNE_ARCH_tune-riscv32 = "riscv32"
-TUNE_PKGARCH_tune-riscv32 = "riscv32"
-PACKAGE_EXTRA_ARCHS_tune-riscv32 = "riscv32"
-

+ 1 - 1
conf/machine/qemuriscv32.conf

@@ -2,7 +2,7 @@
 #@NAME: generic riscv32 machine
 #@DESCRIPTION: Machine configuration for running a generic riscv32
 
-require conf/machine/include/qemuriscv.inc
+require conf/machine/include/riscv/qemuriscv.inc
 
 DEFAULTTUNE = "riscv32"
 

+ 0 - 11
conf/machine/qemuriscv64.conf

@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: generic riscv64 machine
-#@DESCRIPTION: Machine configuration for running a generic riscv64
-
-require conf/machine/include/qemuriscv.inc
-
-QB_OPT_APPEND += "-show-cursor -monitor null -device loader,file=${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE},addr=0x80200000"
-
-EXTRA_IMAGEDEPENDS += "u-boot"
-UBOOT_MACHINE = "qemu-riscv64_defconfig"
-UBOOT_ELF = "u-boot"