diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2016-03-30 15:21:19 -0500 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2016-03-30 15:21:19 -0500 |
| commit | b4a027550acf2c1051c34f997b8e7e845017af4b (patch) | |
| tree | 9e38d3c17b42cb1e6765620a87e908973a93c821 /yocto-poky/meta/conf/machine | |
| parent | 2fe86d90044af218ced8f42fdded6b136f1046d2 (diff) | |
| parent | f1e5d6968976c2341c6d554bfcc8895f1b33c26b (diff) | |
| download | talos-openbmc-b4a027550acf2c1051c34f997b8e7e845017af4b.tar.gz talos-openbmc-b4a027550acf2c1051c34f997b8e7e845017af4b.zip | |
Merge commit 'f1e5d6968976c2341c6d554bfcc8895f1b33c26b' from yocto-2.0.1
Diffstat (limited to 'yocto-poky/meta/conf/machine')
| -rw-r--r-- | yocto-poky/meta/conf/machine/include/qemu.inc | 2 | ||||
| -rw-r--r-- | yocto-poky/meta/conf/machine/include/tune-thunderx.inc | 19 | ||||
| -rw-r--r-- | yocto-poky/meta/conf/machine/qemux86-64.conf | 2 | ||||
| -rw-r--r-- | yocto-poky/meta/conf/machine/qemux86.conf | 2 |
4 files changed, 22 insertions, 3 deletions
diff --git a/yocto-poky/meta/conf/machine/include/qemu.inc b/yocto-poky/meta/conf/machine/include/qemu.inc index d5c0b376c..16e94691d 100644 --- a/yocto-poky/meta/conf/machine/include/qemu.inc +++ b/yocto-poky/meta/conf/machine/include/qemu.inc @@ -5,7 +5,7 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" XSERVER ?= "xserver-xorg \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ xf86-input-evdev \ xf86-input-mouse \ xf86-video-fbdev \ diff --git a/yocto-poky/meta/conf/machine/include/tune-thunderx.inc b/yocto-poky/meta/conf/machine/include/tune-thunderx.inc new file mode 100644 index 000000000..40de61dc2 --- /dev/null +++ b/yocto-poky/meta/conf/machine/include/tune-thunderx.inc @@ -0,0 +1,19 @@ +require conf/machine/include/arm/arch-armv8.inc + +DEFAULTTUNE ?= "thunderx" +AVAILTUNES += "thunderx thunderx_be" + +TUNEVALID[thunderx] = "Enable instructions for Cavium ThunderX" + +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "thunderx", " -mcpu=thunderx ", "",d)}" + +ARMPKGARCH_tune-thunderx ?= "thunderx" +ARMPKGARCH_tune-thunderx_be ?= "thunderx_be" + +TUNE_FEATURES_tune-thunderx ?= "${TUNE_FEATURES_tune-aarch64} thunderx" +TUNE_FEATURES_tune-thunderx_be ?= "${TUNE_FEATURES_tune-thunderx} bigendian" +BASE_LIB_tune-thunderx = "lib64" +BASE_LIB_tune-thunderx_be = "lib64" + +PACKAGE_EXTRA_ARCHS_tune-thunderx = "aarch64 thunderx" +PACKAGE_EXTRA_ARCHS_tune-thunderx_be = "aarch64_be thunderx_be" diff --git a/yocto-poky/meta/conf/machine/qemux86-64.conf b/yocto-poky/meta/conf/machine/qemux86-64.conf index a4fd43ce1..489194aa6 100644 --- a/yocto-poky/meta/conf/machine/qemux86-64.conf +++ b/yocto-poky/meta/conf/machine/qemux86-64.conf @@ -16,7 +16,7 @@ KERNEL_IMAGETYPE = "bzImage" SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1" XSERVER = "xserver-xorg \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ xf86-input-vmmouse \ xf86-input-keyboard \ xf86-input-evdev \ diff --git a/yocto-poky/meta/conf/machine/qemux86.conf b/yocto-poky/meta/conf/machine/qemux86.conf index 96cea66b4..3cc809158 100644 --- a/yocto-poky/meta/conf/machine/qemux86.conf +++ b/yocto-poky/meta/conf/machine/qemux86.conf @@ -15,7 +15,7 @@ KERNEL_IMAGETYPE = "bzImage" SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1" XSERVER = "xserver-xorg \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ xf86-input-vmmouse \ xf86-input-keyboard \ xf86-input-evdev \ |
