diff options
Diffstat (limited to 'poky/meta/conf/machine')
-rw-r--r-- | poky/meta/conf/machine/include/mips/feature-mips-mips16e.inc | 2 | ||||
-rw-r--r-- | poky/meta/conf/machine/include/qemu.inc | 2 | ||||
-rw-r--r-- | poky/meta/conf/machine/include/x86/x86-base.inc | 2 | ||||
-rw-r--r-- | poky/meta/conf/machine/qemuarm.conf | 2 | ||||
-rw-r--r-- | poky/meta/conf/machine/qemuarm64.conf | 2 | ||||
-rw-r--r-- | poky/meta/conf/machine/qemuarmv5.conf | 5 |
6 files changed, 8 insertions, 7 deletions
diff --git a/poky/meta/conf/machine/include/mips/feature-mips-mips16e.inc b/poky/meta/conf/machine/include/mips/feature-mips-mips16e.inc index 101d5331b..6fd12fb84 100644 --- a/poky/meta/conf/machine/include/mips/feature-mips-mips16e.inc +++ b/poky/meta/conf/machine/include/mips/feature-mips-mips16e.inc @@ -11,7 +11,7 @@ MIPSPKGSFX_MIPS16E .= "${@bb.utils.contains('TUNE_FEATURES', 'mips16e', '-m16', TUNEVALID[no-interlink-compressed] = "Disable mixing of standard and MIPS16e code" MIPS16_TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'no-interlink-compressed', ' -mno-interlink-compressed', ' -minterlink-compressed', d)}" TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'mips16e', ' ${MIPS16_TUNE_CCARGS}', '', d)}" -OVERRIDES .= "${@bb.utils.contains('TUNE_FEATURES', 'mips16e', ':mips16e', '', d)}" +MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'mips16e', 'mips16e:', '', d)}" # show status (if compiling in MIPS16e mode) BUILDCFG_VARS += "${@['', 'MIPS_INSTRUCTION_SET'][d.getVar('MIPS_INSTRUCTION_SET') == 'mips16e']}" diff --git a/poky/meta/conf/machine/include/qemu.inc b/poky/meta/conf/machine/include/qemu.inc index c7136da71..642c322ab 100644 --- a/poky/meta/conf/machine/include/qemu.inc +++ b/poky/meta/conf/machine/include/qemu.inc @@ -21,7 +21,7 @@ RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" # Use a common kernel recipe for all QEMU machines PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" -EXTRA_IMAGEDEPENDS += "qemu-system-native qemu-helper-native" +EXTRA_IMAGEDEPENDS += "qemu-system-native qemu-helper-native:do_addto_recipe_sysroot" # Provide the nfs server kernel module for all qemu images KERNEL_FEATURES:append:pn-linux-yocto = " features/nfsd/nfsd-enable.scc" diff --git a/poky/meta/conf/machine/include/x86/x86-base.inc b/poky/meta/conf/machine/include/x86/x86-base.inc index 958b3490e..44e4b4ec4 100644 --- a/poky/meta/conf/machine/include/x86/x86-base.inc +++ b/poky/meta/conf/machine/include/x86/x86-base.inc @@ -18,7 +18,7 @@ SERIAL_CONSOLES ?= "115200;ttyS0" # kernel-related variables # PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" -PREFERRED_VERSION_linux-yocto ??= "5.13%" +PREFERRED_VERSION_linux-yocto ??= "5.14%" # # XSERVER subcomponents, used to build the XSERVER variable diff --git a/poky/meta/conf/machine/qemuarm.conf b/poky/meta/conf/machine/qemuarm.conf index 93d855b6e..d71a793ed 100644 --- a/poky/meta/conf/machine/qemuarm.conf +++ b/poky/meta/conf/machine/qemuarm.conf @@ -20,7 +20,7 @@ QB_SMP = "-smp 4" # Standard Serial console 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_GRAPHICS = "-device VGA,edid=on" +QB_GRAPHICS = "-device virtio-gpu-pci" 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" diff --git a/poky/meta/conf/machine/qemuarm64.conf b/poky/meta/conf/machine/qemuarm64.conf index ea7fae272..3b08deddd 100644 --- a/poky/meta/conf/machine/qemuarm64.conf +++ b/poky/meta/conf/machine/qemuarm64.conf @@ -19,7 +19,7 @@ QB_CPU = "-cpu cortex-a57" QB_SMP = "-smp 4" QB_CPU_KVM = "-cpu host -machine gic-version=3" # For graphics to work we need to define the VGA device as well as the necessary USB devices -QB_GRAPHICS = "-device VGA,edid=on" +QB_GRAPHICS = "-device virtio-gpu-pci" 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" diff --git a/poky/meta/conf/machine/qemuarmv5.conf b/poky/meta/conf/machine/qemuarmv5.conf index 6c99a5296..3c2c4997b 100644 --- a/poky/meta/conf/machine/qemuarmv5.conf +++ b/poky/meta/conf/machine/qemuarmv5.conf @@ -13,8 +13,9 @@ SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;ttyAMA1" QB_SYSTEM_NAME = "qemu-system-arm" QB_MACHINE = "-machine versatilepb" QB_KERNEL_CMDLINE_APPEND = "vmalloc=256" -QB_OPT_APPEND = "-usb -device usb-tablet" -PREFERRED_VERSION_linux-yocto ??= "5.13%" +QB_GRAPHICS = "-device virtio-gpu-pci" +QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd" +PREFERRED_VERSION_linux-yocto ??= "5.14%" QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" KMACHINE:qemuarmv5 = "qemuarm" |