Support Salvator-X/XS board

Add new machines to build with AGL:
- h3-salvator-x-nogfx
- h3-salvator-x
- m3-salvator-x-nogfx
- m3-salvator-x

Bug-AGL: SPEC-3169

Change-Id: I0cfa838ad40f8afda01aeb693fbf595bad8b4730
Signed-off-by: Duy Dang <duy.dang.yw@renesas.com>

13 files changed, 75 insertions, 1 deletions

diff --git a/templates/machine/h3-salvator-x-nogfx/50_bblayers.conf.inc b/templates/machine/h3-salvator-x-nogfx/50_bblayers.conf.inc
new file mode 100644
index 000000000..5f410f0ff
--- /dev/null
+++ b/templates/machine/h3-salvator-x-nogfx/50_bblayers.conf.inc
@@ -0,0 +1,4 @@
+BBLAYERS =+ "\
+  ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \
+  ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \
+  "
diff --git a/templates/machine/h3-salvator-x-nogfx/50_local.conf.inc b/templates/machine/h3-salvator-x-nogfx/50_local.conf.inc
new file mode 100644
index 000000000..32a8c9273
--- /dev/null
+++ b/templates/machine/h3-salvator-x-nogfx/50_local.conf.inc
@@ -0,0 +1,7 @@
+MACHINE = "salvator-x"
+#see meta-agl/meta-agl-bsp/conf/include/agl_h3-salvator-x-nogfx.inc
+require conf/include/agl_h3-salvator-x-nogfx.inc
+
+# custom inclusion of cogent layer
+#see meta-agl/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc
+require conf/include/rcar-gen3-adas.inc
diff --git a/templates/machine/h3-salvator-x-nogfx/README_machine_h3-salvator-x-nogfx.md b/templates/machine/h3-salvator-x-nogfx/README_machine_h3-salvator-x-nogfx.md
new file mode 100644
index 000000000..d258e8f33
--- /dev/null
+++ b/templates/machine/h3-salvator-x-nogfx/README_machine_h3-salvator-x-nogfx.md
@@ -0,0 +1,9 @@
+---
+description: Machine h3-salvator-x-nogfx
+authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Kevin Hilman <khilman@baylibre.com>, Ronan Le Martret <ronan.lemartret@iot.bzh>, Yannick Gicquel <yannick.gicquel@iot.bzh>, Duy Dang <duy.dang.yw@renesas.com>
+---
+	
+### Machine h3-salvator-x-nogfx
+	 
+*Description is missing - please complete file meta-agl/templates/machine/h3-salvator-x-nogfx/README_machine_h3-salvator-x-nogfx.md*
+
diff --git a/templates/machine/h3-salvator-x/50_bblayers.conf.inc b/templates/machine/h3-salvator-x/50_bblayers.conf.inc
index 7b0db440a..5f410f0ff 100644
--- a/templates/machine/h3-salvator-x/50_bblayers.conf.inc
+++ b/templates/machine/h3-salvator-x/50_bblayers.conf.inc
@@ -1,3 +1,4 @@
 BBLAYERS =+ "\
   ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \
+  ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \
   "
diff --git a/templates/machine/h3-salvator-x/50_local.conf.inc b/templates/machine/h3-salvator-x/50_local.conf.inc
index 05cca9743..5e44b183e 100644
--- a/templates/machine/h3-salvator-x/50_local.conf.inc
+++ b/templates/machine/h3-salvator-x/50_local.conf.inc
@@ -2,3 +2,6 @@ MACHINE = "salvator-x"
 #see meta-agl/meta-agl-bsp/conf/include/agl_h3-salvator-x.inc
 require conf/include/agl_h3-salvator-x.inc
 
+#see meta-agl/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc
+require conf/include/rcar-gen3-adas.inc
+
diff --git a/templates/machine/h3-salvator-x/README_machine_h3-salvator-x.md b/templates/machine/h3-salvator-x/README_machine_h3-salvator-x.md
index 2dcdcd42c..2e47b665b 100644
--- a/templates/machine/h3-salvator-x/README_machine_h3-salvator-x.md
+++ b/templates/machine/h3-salvator-x/README_machine_h3-salvator-x.md
@@ -1,6 +1,6 @@
 ---
 description: Machine h3-salvator-x
-authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Martin Kelly <mkelly@xevo.com>
+authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Martin Kelly <mkelly@xevo.com>, Ronan Le Martret <ronan.lemartret@iot.bzh> Duy Dang <duy.dang.yw@renesas.com>
 ---
 	
 ### Machine h3-salvator-x
diff --git a/templates/machine/m3-salvator-x-nogfx/50_bblayers.conf.inc b/templates/machine/m3-salvator-x-nogfx/50_bblayers.conf.inc
new file mode 100644
index 000000000..5f410f0ff
--- /dev/null
+++ b/templates/machine/m3-salvator-x-nogfx/50_bblayers.conf.inc
@@ -0,0 +1,4 @@
+BBLAYERS =+ "\
+  ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \
+  ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \
+  "
diff --git a/templates/machine/m3-salvator-x-nogfx/50_local.conf.inc b/templates/machine/m3-salvator-x-nogfx/50_local.conf.inc
new file mode 100644
index 000000000..1c1180536
--- /dev/null
+++ b/templates/machine/m3-salvator-x-nogfx/50_local.conf.inc
@@ -0,0 +1,7 @@
+MACHINE = "salvator-x"
+#see meta-agl/meta-agl-bsp/conf/include/agl_m3-salvator-x-nogfx.inc
+require conf/include/agl_m3-salvator-x-nogfx.inc
+
+# custom inclusion of cogent layer
+#see meta-agl/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc
+require conf/include/rcar-gen3-adas.inc
diff --git a/templates/machine/m3-salvator-x-nogfx/README_machine_m3-salvator-x-nogfx.md b/templates/machine/m3-salvator-x-nogfx/README_machine_m3-salvator-x-nogfx.md
new file mode 100644
index 000000000..8f987204c
--- /dev/null
+++ b/templates/machine/m3-salvator-x-nogfx/README_machine_m3-salvator-x-nogfx.md
@@ -0,0 +1,9 @@
+---
+description: Machine m3-salvator-x-nogfx
+authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Kevin Hilman <khilman@baylibre.com>, Ronan Le Martret <ronan.lemartret@iot.bzh>, Yannick Gicquel <yannick.gicquel@iot.bzh>, Duy Dang <duy.dang.yw@renesas.com>
+---
+	
+### Machine m3-salvator-nogfx
+	 
+*Description is missing - please complete file meta-agl/templates/machine/m3-salvator-x-nogfx/README_machine_m3-salvator-x-nogfx.md*
+
diff --git a/templates/machine/m3-salvator-x/50_bblayers.conf.inc b/templates/machine/m3-salvator-x/50_bblayers.conf.inc
new file mode 100644
index 000000000..5f410f0ff
--- /dev/null
+++ b/templates/machine/m3-salvator-x/50_bblayers.conf.inc
@@ -0,0 +1,4 @@
+BBLAYERS =+ "\
+  ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \
+  ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \
+  "
diff --git a/templates/machine/m3-salvator-x/50_local.conf.inc b/templates/machine/m3-salvator-x/50_local.conf.inc
new file mode 100644
index 000000000..8ede9ae01
--- /dev/null
+++ b/templates/machine/m3-salvator-x/50_local.conf.inc
@@ -0,0 +1,7 @@
+MACHINE = "salvator-x"
+#see meta-agl/meta-agl-bsp/conf/include/agl_m3-salvator-x.inc
+require conf/include/agl_m3-salvator-x.inc
+
+#see meta-agl/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc
+require conf/include/rcar-gen3-adas.inc
+
diff --git a/templates/machine/m3-salvator-x/50_setup.sh b/templates/machine/m3-salvator-x/50_setup.sh
new file mode 100644
index 000000000..abd2a33af
--- /dev/null
+++ b/templates/machine/m3-salvator-x/50_setup.sh
@@ -0,0 +1,10 @@
+# setup proprietary gfx drivers and multimedia packages
+pushd $METADIR 2>/dev/null
+
+SETUP_MM_SCRIPT=$METADIR/meta-agl/meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh
+if [ -f $SETUP_MM_SCRIPT ]; then
+	. $SETUP_MM_SCRIPT
+	copy_mm_packages
+fi
+
+popd 2>/dev/null
diff --git a/templates/machine/m3-salvator-x/README_machine_m3-salvator-x.md b/templates/machine/m3-salvator-x/README_machine_m3-salvator-x.md
new file mode 100644
index 000000000..0e4f1354a
--- /dev/null
+++ b/templates/machine/m3-salvator-x/README_machine_m3-salvator-x.md
@@ -0,0 +1,9 @@
+---
+description: Machine m3-salvator-x
+authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Ronan Le Martret <ronan.lemartret@iot.bzh> Duy Dang <duy.dang.yw@renesas.com>
+---
+	
+### Machine m3-salvator-x
+	 
+*Description is missing - please complete file meta-agl/templates/machine/m3-salvator-x/README_machine_m3-salvator-x.md*
+