diff options
Diffstat (limited to 'poky/meta/conf/machine')
-rw-r--r-- | poky/meta/conf/machine/include/powerpc/arch-powerpc64.inc | 3 | ||||
-rw-r--r-- | poky/meta/conf/machine/include/qemuboot-mips.inc | 2 | ||||
-rw-r--r-- | poky/meta/conf/machine/include/riscv/qemuriscv.inc | 2 | ||||
-rw-r--r-- | poky/meta/conf/machine/include/tune-cortexa32.inc | 6 | ||||
-rw-r--r-- | poky/meta/conf/machine/qemuarm.conf | 6 | ||||
-rw-r--r-- | poky/meta/conf/machine/qemuarm64.conf | 6 | ||||
-rw-r--r-- | poky/meta/conf/machine/qemuarmv5.conf | 2 | ||||
-rw-r--r-- | poky/meta/conf/machine/qemuppc64.conf | 24 | ||||
-rw-r--r-- | poky/meta/conf/machine/qemuriscv32.conf | 16 |
9 files changed, 52 insertions, 15 deletions
diff --git a/poky/meta/conf/machine/include/powerpc/arch-powerpc64.inc b/poky/meta/conf/machine/include/powerpc/arch-powerpc64.inc index cf5c3ef8e..467abc5fa 100644 --- a/poky/meta/conf/machine/include/powerpc/arch-powerpc64.inc +++ b/poky/meta/conf/machine/include/powerpc/arch-powerpc64.inc @@ -10,9 +10,6 @@ TUNE_ARCH .= "${@bb.utils.contains('TUNE_FEATURES', [ 'm64' ], 'powerpc64${ENDIA # musl only supports elfv2 ABI for ppc64 TUNE_CCARGS .= "${@['', ' -mabi=elfv2']['libc-musl' in d.getVar('OVERRIDES').split(':')]}" -# user mode qemu doesn't support ppc64 -MACHINE_FEATURES_BACKFILL_CONSIDERED_append = " ${@bb.utils.contains('TUNE_FEATURES', 'm64', 'qemu-usermode', '', d)}" - AVAILTUNES += "powerpc64 powerpc64le" TUNE_FEATURES_tune-powerpc64 = "m64 fpu-hard bigendian" diff --git a/poky/meta/conf/machine/include/qemuboot-mips.inc b/poky/meta/conf/machine/include/qemuboot-mips.inc index 230f032c5..4954f3068 100644 --- a/poky/meta/conf/machine/include/qemuboot-mips.inc +++ b/poky/meta/conf/machine/include/qemuboot-mips.inc @@ -5,4 +5,4 @@ QB_KERNEL_CMDLINE_APPEND = "console=ttyS0 console=tty" QB_OPT_APPEND = "-usb -device usb-tablet" # For graphics to work we need to define the VGA device as well as the necessary USB devices -QB_OPT_APPEND += "-vga std" +QB_GRAPHICS = "-vga std" diff --git a/poky/meta/conf/machine/include/riscv/qemuriscv.inc b/poky/meta/conf/machine/include/riscv/qemuriscv.inc index 47d7e9b17..428d28bde 100644 --- a/poky/meta/conf/machine/include/riscv/qemuriscv.inc +++ b/poky/meta/conf/machine/include/riscv/qemuriscv.inc @@ -34,3 +34,5 @@ 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" +QB_GRAPHICS = "-device bochs-display" +QB_OPT_APPEND = "-device virtio-mouse-pci -device virtio-keyboard-pci" diff --git a/poky/meta/conf/machine/include/tune-cortexa32.inc b/poky/meta/conf/machine/include/tune-cortexa32.inc index e86de6ccb..b9ae2b1c5 100644 --- a/poky/meta/conf/machine/include/tune-cortexa32.inc +++ b/poky/meta/conf/machine/include/tune-cortexa32.inc @@ -9,9 +9,9 @@ require conf/machine/include/arm/arch-armv8a.inc AVAILTUNES += "cortexa32 cortexa32-crypto" ARMPKGARCH_tune-cortexa32 = "cortexa32" ARMPKGARCH_tune-cortexa32-crypto = "cortexa32" -TUNE_FEATURES_tune-cortexa32 = "armv8a cortexa32 crc" +TUNE_FEATURES_tune-cortexa32 = "armv8a cortexa32 crc callconvention-hard neon" TUNE_FEATURES_tune-cortexa32-crypto = "${TUNE_FEATURES_tune-cortexa32} crypto" -PACKAGE_EXTRA_ARCHS_tune-cortexa32 = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc} cortexa32" -PACKAGE_EXTRA_ARCHS_tune-cortexa32-crypto = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc-crypto} cortexa32 cortexa32-crypto" +PACKAGE_EXTRA_ARCHS_tune-cortexa32 = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc} cortexa32 cortexa32hf-neon" +PACKAGE_EXTRA_ARCHS_tune-cortexa32-crypto = "${PACKAGE_EXTRA_ARCHS_tune-armv8a-crc-crypto} cortexa32 cortexa32hf-neon cortexa32hf-neon-crypto" BASE_LIB_tune-cortexa32 = "lib" BASE_LIB_tune-cortexa32-crypto = "lib" diff --git a/poky/meta/conf/machine/qemuarm.conf b/poky/meta/conf/machine/qemuarm.conf index 257cfa3e6..e5ec4cc06 100644 --- a/poky/meta/conf/machine/qemuarm.conf +++ b/poky/meta/conf/machine/qemuarm.conf @@ -17,10 +17,10 @@ QB_SYSTEM_NAME = "qemu-system-arm" QB_MACHINE = "-machine virt,highmem=off" QB_CPU = "-cpu cortex-a15" # Standard Serial console -QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0 vmalloc=256" +QB_KERNEL_CMDLINE_APPEND = "vmalloc=256" # For graphics to work we need to define the VGA device as well as the necessary USB devices -QB_OPT_APPEND = "-device VGA,edid=on" -QB_OPT_APPEND += "-device qemu-xhci -device usb-tablet -device usb-kbd" +QB_GRAPHICS = "-device VGA,edid=on" +QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd" # Virtio Networking support QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@" diff --git a/poky/meta/conf/machine/qemuarm64.conf b/poky/meta/conf/machine/qemuarm64.conf index 2f61eb0ae..51f7ecdcf 100644 --- a/poky/meta/conf/machine/qemuarm64.conf +++ b/poky/meta/conf/machine/qemuarm64.conf @@ -17,11 +17,9 @@ QB_SYSTEM_NAME = "qemu-system-aarch64" QB_MACHINE = "-machine virt" QB_CPU = "-cpu cortex-a57" QB_CPU_KVM = "-cpu host -machine gic-version=3" -# Standard Serial console -QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0" # For graphics to work we need to define the VGA device as well as the necessary USB devices -QB_OPT_APPEND = "-device VGA,edid=on" -QB_OPT_APPEND += "-device qemu-xhci -device usb-tablet -device usb-kbd" +QB_GRAPHICS = "-device VGA,edid=on" +QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd" # Virtio Networking support QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@" diff --git a/poky/meta/conf/machine/qemuarmv5.conf b/poky/meta/conf/machine/qemuarmv5.conf index dfe2a8957..7050bae08 100644 --- a/poky/meta/conf/machine/qemuarmv5.conf +++ b/poky/meta/conf/machine/qemuarmv5.conf @@ -12,7 +12,7 @@ SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;ttyAMA1" # For runqemu QB_SYSTEM_NAME = "qemu-system-arm" QB_MACHINE = "-machine versatilepb" -QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty vmalloc=256" +QB_KERNEL_CMDLINE_APPEND = "vmalloc=256" QB_OPT_APPEND = "-usb -device usb-tablet" PREFERRED_VERSION_linux-yocto ??= "5.10%" QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" diff --git a/poky/meta/conf/machine/qemuppc64.conf b/poky/meta/conf/machine/qemuppc64.conf new file mode 100644 index 000000000..0682e752b --- /dev/null +++ b/poky/meta/conf/machine/qemuppc64.conf @@ -0,0 +1,24 @@ +#@TYPE: Machine +#@NAME: QEMU PPC64 machine +#@DESCRIPTION: Machine configuration for running a PPC system on QEMU + +require conf/machine/include/qemu.inc +require conf/machine/include/tune-power9.inc + +KERNEL_IMAGETYPE = "vmlinux" + +SERIAL_CONSOLES ?= "115200;hvc0" + +# For runqemu +QB_SYSTEM_NAME = "qemu-system-ppc64" +QB_MACHINE = "-machine pseries" +QB_CPU = "-cpu POWER9" +QB_KERNEL_CMDLINE_APPEND = "console=hvc0" +#QB_OPT_APPEND += "-device qemu-xhci -device usb-tablet -device usb-kbd" +QB_OPT_APPEND = "-usb -device usb-tablet" + +#prelink broken on ppc64 +#USER_CLASSES_remove = "image-prelink" +#IMAGE_PREPROCESS_COMMAND_remove = "prelink_image;" + +MACHINE_EXTRA_RRECOMMENDS += " kernel-modules" diff --git a/poky/meta/conf/machine/qemuriscv32.conf b/poky/meta/conf/machine/qemuriscv32.conf new file mode 100644 index 000000000..d3858dc05 --- /dev/null +++ b/poky/meta/conf/machine/qemuriscv32.conf @@ -0,0 +1,16 @@ +#@TYPE: Machine +#@NAME: generic riscv32 machine +#@DESCRIPTION: Machine configuration for running a generic riscv32 + +require conf/machine/include/riscv/qemuriscv.inc + +DEFAULTTUNE = "riscv32" + +PREFERRED_VERSION_openocd-native = "riscv" +PREFERRED_VERSION_openocd = "riscv" + +XVISOR_PLAT = "riscv/virt32" + +EXTRA_IMAGEDEPENDS += "u-boot" +UBOOT_MACHINE = "qemu-riscv32_smode_defconfig" +UBOOT_ELF = "u-boot" |