summaryrefslogtreecommitdiffstats
path: root/meta-rcar-gen3/conf/machine/salvator-x.conf
diff options
context:
space:
mode:
authorStephane Desneux <stephane.desneux@iot.bzh>2017-08-23 07:57:41 +0000
committerRonan Le Martret <ronan.lemartret@iot.bzh>2018-05-16 09:34:37 +0200
commit35d2cfba531f26befbfdf436990b4b0b14345254 (patch)
tree0af8c8464b8abb060a7a580d4c0b7bcb3c25f4b0 /meta-rcar-gen3/conf/machine/salvator-x.conf
parent448635cbd48d288434e7b698cf7469644b1728d5 (diff)
[COMMUNITY] use mesa preferred version 17.%
This avoids a conflict between the two following options: * poky/meta/recipes-graphics/mesa/mesa_17.0.2.bb * poky/meta/recipes-graphics/mesa/mesa_git.bb Change-Id: I566ba2f5c3152efe08e9e3e883c79439813ef7ea Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
Diffstat (limited to 'meta-rcar-gen3/conf/machine/salvator-x.conf')
-rw-r--r--meta-rcar-gen3/conf/machine/salvator-x.conf8
1 files changed, 6 insertions, 2 deletions
diff --git a/meta-rcar-gen3/conf/machine/salvator-x.conf b/meta-rcar-gen3/conf/machine/salvator-x.conf
index 74bd180..132e66c 100644
--- a/meta-rcar-gen3/conf/machine/salvator-x.conf
+++ b/meta-rcar-gen3/conf/machine/salvator-x.conf
@@ -23,7 +23,9 @@ USE_32BIT_MMP ?= "0"
MACHINE_FEATURES = ""
KERNEL_IMAGETYPE = "Image"
-IMAGE_FSTYPES_append = " tar.bz2 ext4"
+
+#cpio do not support extended attribut, so cpio image when smack is used
+IMAGE_FSTYPES ?= "tar.bz2 ext4 ${@bb.utils.contains('DISTRO_FEATURES', 'smack', '', 'cpio.gz', d)}"
SERIAL_CONSOLE = "115200 ttySC0"
@@ -42,6 +44,7 @@ KERNEL_DEVICETREE_r8a7796 = " \
renesas/r8a7796-salvator-x.dtb \
renesas/r8a7796-salvator-xs.dtb \
"
+
# Device tree for M3N
KERNEL_DEVICETREE_r8a77965 = " \
renesas/r8a77965-salvator-x.dtb \
@@ -61,8 +64,9 @@ UBOOT_MACHINE_r8a7796 = "r8a7796_salvator-x_defconfig"
# M3N u-boot configure
UBOOT_MACHINE_r8a77965 = "r8a77965_salvator-x_defconfig"
-# libdrm
+# libdrm + mesa
PREFERRED_VERSION_libdrm = "2.4.85"
+PREFERRED_VERSION_mesa = "17.%"
# Add variable to Build Configuration in build log
BUILDCFG_VARS_append = " SOC_FAMILY"