From 04d0b23f57f453517201ec08d70deba7a8af5463 Mon Sep 17 00:00:00 2001
From: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Date: Mon, 6 Nov 2017 21:48:09 +0100
Subject: [Community] Do not _append to IMAGE_FSTYPES but use default value if
 unset
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The MACHINE config should not _append but set a default if unset.

Bug-AGL: SPEC-1037

Change-Id: Iaac4901ad2515564f7ebecfb1bd8f160c89fadf9
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
---
 meta-rcar-gen3/conf/machine/h3ulcb.conf     |  8 +++++---
 meta-rcar-gen3/conf/machine/m3ulcb.conf     |  8 +++++---
 meta-rcar-gen3/conf/machine/salvator-x.conf | 27 +++++++--------------------
 3 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/meta-rcar-gen3/conf/machine/h3ulcb.conf b/meta-rcar-gen3/conf/machine/h3ulcb.conf
index d5fa600..8a9de35 100644
--- a/meta-rcar-gen3/conf/machine/h3ulcb.conf
+++ b/meta-rcar-gen3/conf/machine/h3ulcb.conf
@@ -17,7 +17,9 @@ USE_32BIT_MMP ?= "0"
 MACHINE_FEATURES = ""
 
 KERNEL_IMAGETYPE = "Image"
-IMAGE_FSTYPES_append = " tar.bz2 ext4"
+
+# only if not already defined by distro or user!
+IMAGE_FSTYPES_append ?= " tar.bz2 ext4 cpio.gz"
 
 SERIAL_CONSOLE = "115200 ttySC0"
 
@@ -36,8 +38,8 @@ PREFERRED_VERSION_u-boot = "v2015.04%"
 EXTRA_IMAGEDEPENDS += " u-boot"
 UBOOT_MACHINE = "h3ulcb_defconfig"
 
-# libdrm
-PREFERRED_VERSION_libdrm = "2.4.85"
+# libdrm + mesa
+PREFERRED_VERSION_libdrm = "2.4.68"
 PREFERRED_VERSION_mesa = "17.%"
 
 # Add variable to Build Configuration in build log
diff --git a/meta-rcar-gen3/conf/machine/m3ulcb.conf b/meta-rcar-gen3/conf/machine/m3ulcb.conf
index 07d9c38..a77b282 100644
--- a/meta-rcar-gen3/conf/machine/m3ulcb.conf
+++ b/meta-rcar-gen3/conf/machine/m3ulcb.conf
@@ -17,7 +17,9 @@ USE_32BIT_MMP ?= "0"
 MACHINE_FEATURES = ""
 
 KERNEL_IMAGETYPE = "Image"
-IMAGE_FSTYPES_append = " tar.bz2 ext4"
+
+# only if not already defined by distro or user!
+IMAGE_FSTYPES_append = " tar.bz2 ext4 cpio.gz"
 
 SERIAL_CONSOLE = "115200 ttySC0"
 
@@ -33,8 +35,8 @@ PREFERRED_VERSION_u-boot = "v2015.04%"
 EXTRA_IMAGEDEPENDS += " u-boot"
 UBOOT_MACHINE = "m3ulcb_defconfig"
 
-# libdrm
-PREFERRED_VERSION_libdrm = "2.4.85"
+# libdrm + mesa
+PREFERRED_VERSION_libdrm = "2.4.68"
 PREFERRED_VERSION_mesa = "17.%"
 
 # Add variable to Build Configuration in build log
diff --git a/meta-rcar-gen3/conf/machine/salvator-x.conf b/meta-rcar-gen3/conf/machine/salvator-x.conf
index 1213713..5d034a8 100644
--- a/meta-rcar-gen3/conf/machine/salvator-x.conf
+++ b/meta-rcar-gen3/conf/machine/salvator-x.conf
@@ -2,17 +2,9 @@
 #@NAME: Salvator-X machine
 #@DESCRIPTION: Machine configuration for running Salvator-X
 
-require conf/machine/include/${SOC_FAMILY}.inc
-# Add default tune for H3/M3
 DEFAULTTUNE ?= "cortexa57-cortexa53"
-# Add default tune for M3N
-DEFAULTTUNE_r8a77965 = "cortexa57"
-
-# Add tune configure file for M3N
-TUNE_CONF ?= "conf/machine/include/tune-cortexa57-cortexa53.inc"
-TUNE_CONF_r8a77965 = "conf/machine/include/tune-cortexa57.inc"
-
-require ${TUNE_CONF}
+require conf/machine/include/tune-cortexa57-cortexa53.inc
+require conf/machine/include/${SOC_FAMILY}.inc
 
 # 32BIT package install (default is disable)
 # This variables can be used only in multilib.
@@ -23,7 +15,9 @@ USE_32BIT_MMP ?= "0"
 MACHINE_FEATURES = ""
 
 KERNEL_IMAGETYPE = "Image"
-IMAGE_FSTYPES_append = " tar.bz2 ext4"
+
+# only if not already defined by distro or user!
+IMAGE_FSTYPES_append = " tar.bz2 ext4 cpio.gz"
 
 SERIAL_CONSOLE = "115200 ttySC0"
 
@@ -40,11 +34,6 @@ 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 \
-    renesas/r8a77965-salvator-xs.dtb \
-"
 
 # Configuration for ARM Trusted Firmware
 EXTRA_IMAGEDEPENDS += " arm-trusted-firmware optee-os"
@@ -56,11 +45,9 @@ EXTRA_IMAGEDEPENDS += " u-boot"
 UBOOT_MACHINE_r8a7795 = "r8a7795_salvator-x_defconfig"
 # M3 u-boot configure
 UBOOT_MACHINE_r8a7796 = "r8a7796_salvator-x_defconfig"
-# M3N u-boot configure
-UBOOT_MACHINE_r8a77965 = "r8a77965_salvator-x_defconfig"
 
-# libdrm
-PREFERRED_VERSION_libdrm = "2.4.85"
+# libdrm + mesa
+PREFERRED_VERSION_libdrm = "2.4.68"
 PREFERRED_VERSION_mesa = "17.%"
 
 # Add variable to Build Configuration in build log
-- 
cgit 1.2.3-korg