diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2016-08-29 12:38:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.200> | 2016-08-29 12:38:14 +0000 |
| commit | df72ee883ec73cab47cfaa23e0f2feff9f1d2862 (patch) | |
| tree | e2b596c332c78370d746ba6d29c3d405f53bb0d0 /meta-sota/conf | |
| parent | 208d0258a615f5eccfcaa573d4c42bd64168381a (diff) | |
| parent | 69d6b7adc9aef8d39ca66ef8688ac968876ae040 (diff) | |
Merge "Replaced functionality in qemux86-ota machine with algsetup.sh feature. otaimg is now a live image."
Diffstat (limited to 'meta-sota/conf')
| -rw-r--r-- | meta-sota/conf/machine/qemux86-ota.conf | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/meta-sota/conf/machine/qemux86-ota.conf b/meta-sota/conf/machine/qemux86-ota.conf deleted file mode 100644 index 3c58870..0000000 --- a/meta-sota/conf/machine/qemux86-ota.conf +++ /dev/null @@ -1,37 +0,0 @@ -#@TYPE: Machine -#@NAME: common_pc -#@DESCRIPTION: Machine configuration for running a common x86 - -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -PREFERRED_PROVIDER_virtual/libgl ?= "mesa" -PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" -PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" - -require conf/machine/include/qemu.inc -require conf/machine/include/tune-i586.inc - -KERNEL_IMAGETYPE = "bzImage" - -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-buildrom" -UBOOT_MACHINE = "qemu-x86_defconfig" - -IMAGE_CLASSES += "image_types_ota" -IMAGE_FSTYPES += "otaimg" - -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1" - -XSERVER = "xserver-xorg \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ - xf86-input-vmmouse \ - xf86-input-keyboard \ - xf86-input-evdev \ - xf86-video-cirrus \ - xf86-video-fbdev \ - xf86-video-vmware" - -MACHINE_FEATURES += "x86" - -MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" - -MACHINEOVERRIDES .= ":qemux86" -KMACHINE = "qemux86" |