bsp: add salvator-x H3 support 45/13345/2
authorMartin Kelly <mkelly@xevo.com>
Sat, 27 Jan 2018 01:34:56 +0000 (17:34 -0800)
committerMartin Kelly <mkelly@xevo.com>
Mon, 5 Feb 2018 18:19:52 +0000 (10:19 -0800)
The Salvator-X uses the same SoC as the H3 but includes other
peripherals. As a result, it can reuse the same h3ulcb config but needs
a different device tree and kernel config. This is already supported in
meta-rcar-gen3 but needs AGL plumbing, so add it.

There is also an M3 version of the Salvator-X, but I don't have one and
cannot test it. So I've added support only for the H3 version here.

Change-Id: I64683f4f65dda3fee63e6243f0ba916e568ca245
Signed-off-by: Martin Kelly <mkelly@xevo.com>
meta-agl-bsp/conf/include/agl_h3-salvator-x.inc [new file with mode: 0644]
templates/machine/h3-salvator-x/50_bblayers.conf.inc [new file with mode: 0644]
templates/machine/h3-salvator-x/50_local.conf.inc [new file with mode: 0644]
templates/machine/h3-salvator-x/50_setup.sh [new file with mode: 0644]

diff --git a/meta-agl-bsp/conf/include/agl_h3-salvator-x.inc b/meta-agl-bsp/conf/include/agl_h3-salvator-x.inc
new file mode 100644 (file)
index 0000000..7403611
--- /dev/null
@@ -0,0 +1,3 @@
+# The H3-based (as opposed to the M3-based version) salvator-x needs a different
+# MACHINE but otherwise uses the same config as the H3.
+require conf/include/agl_h3ulcb.inc
diff --git a/templates/machine/h3-salvator-x/50_bblayers.conf.inc b/templates/machine/h3-salvator-x/50_bblayers.conf.inc
new file mode 100644 (file)
index 0000000..b58989c
--- /dev/null
@@ -0,0 +1,3 @@
+BBLAYERS =+ "\
+  ${METADIR}/meta-renesas-rcar-gen3/meta-rcar-gen3 \
+  "
diff --git a/templates/machine/h3-salvator-x/50_local.conf.inc b/templates/machine/h3-salvator-x/50_local.conf.inc
new file mode 100644 (file)
index 0000000..05cca97
--- /dev/null
@@ -0,0 +1,4 @@
+MACHINE = "salvator-x"
+#see meta-agl/meta-agl-bsp/conf/include/agl_h3-salvator-x.inc
+require conf/include/agl_h3-salvator-x.inc
+
diff --git a/templates/machine/h3-salvator-x/50_setup.sh b/templates/machine/h3-salvator-x/50_setup.sh
new file mode 100644 (file)
index 0000000..abd2a33
--- /dev/null
@@ -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