From 94ff1c259f3704a1f862978992d82c30e06951e2 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Wed, 19 Jun 2019 16:51:08 -0700 Subject: [PATCH] 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 --- conf/machine/baremetal-riscv32.conf | 2 +- conf/machine/baremetal-riscv64.conf | 2 +- conf/machine/freedom-u540.conf | 2 +- conf/machine/include/arch-riscv.inc | 10 ------- conf/machine/include/qemuriscv.inc | 45 ----------------------------- conf/machine/include/tune-riscv.inc | 19 ------------ conf/machine/qemuriscv32.conf | 2 +- conf/machine/qemuriscv64.conf | 11 ------- 8 files changed, 4 insertions(+), 89 deletions(-) delete mode 100644 conf/machine/include/arch-riscv.inc delete mode 100644 conf/machine/include/qemuriscv.inc delete mode 100644 conf/machine/include/tune-riscv.inc delete mode 100644 conf/machine/qemuriscv64.conf diff --git a/conf/machine/baremetal-riscv32.conf b/conf/machine/baremetal-riscv32.conf index fbc8d69..a010f21 100644 --- a/conf/machine/baremetal-riscv32.conf +++ b/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" diff --git a/conf/machine/baremetal-riscv64.conf b/conf/machine/baremetal-riscv64.conf index 39da3b6..22b91c6 100644 --- a/conf/machine/baremetal-riscv64.conf +++ b/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" diff --git a/conf/machine/freedom-u540.conf b/conf/machine/freedom-u540.conf index 28b2729..8683dfb 100644 --- a/conf/machine/freedom-u540.conf +++ b/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" diff --git a/conf/machine/include/arch-riscv.inc b/conf/machine/include/arch-riscv.inc deleted file mode 100644 index 19f8f3e..0000000 --- a/conf/machine/include/arch-riscv.inc +++ /dev/null @@ -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)}" diff --git a/conf/machine/include/qemuriscv.inc b/conf/machine/include/qemuriscv.inc deleted file mode 100644 index 72395a3..0000000 --- a/conf/machine/include/qemuriscv.inc +++ /dev/null @@ -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 \ -" diff --git a/conf/machine/include/tune-riscv.inc b/conf/machine/include/tune-riscv.inc deleted file mode 100644 index 0f516fc..0000000 --- a/conf/machine/include/tune-riscv.inc +++ /dev/null @@ -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" - diff --git a/conf/machine/qemuriscv32.conf b/conf/machine/qemuriscv32.conf index 196ea81..60bfd0b 100644 --- a/conf/machine/qemuriscv32.conf +++ b/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" diff --git a/conf/machine/qemuriscv64.conf b/conf/machine/qemuriscv64.conf deleted file mode 100644 index 029619b..0000000 --- a/conf/machine/qemuriscv64.conf +++ /dev/null @@ -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"