From d6edc2872b1fc53f93607e7e38dc3ae87e12128c Mon Sep 17 00:00:00 2001 From: Martin Kelly Date: Fri, 26 Jan 2018 17:34:56 -0800 Subject: bsp: add salvator-x H3 support 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. Bug-AGL: SPEC-1376 Change-Id: I64683f4f65dda3fee63e6243f0ba916e568ca245 Signed-off-by: Martin Kelly --- meta-agl-bsp/conf/include/agl_h3-salvator-x.inc | 3 +++ templates/machine/h3-salvator-x/50_bblayers.conf.inc | 4 ++++ templates/machine/h3-salvator-x/50_local.conf.inc | 4 ++++ templates/machine/h3-salvator-x/50_setup.sh | 10 ++++++++++ 4 files changed, 21 insertions(+) create mode 100644 meta-agl-bsp/conf/include/agl_h3-salvator-x.inc create mode 100644 templates/machine/h3-salvator-x/50_bblayers.conf.inc create mode 100644 templates/machine/h3-salvator-x/50_local.conf.inc create mode 100644 templates/machine/h3-salvator-x/50_setup.sh 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 index 000000000..74036111d --- /dev/null +++ b/meta-agl-bsp/conf/include/agl_h3-salvator-x.inc @@ -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 index 000000000..f1897181c --- /dev/null +++ b/templates/machine/h3-salvator-x/50_bblayers.conf.inc @@ -0,0 +1,4 @@ +BBLAYERS =+ "\ + ${METADIR}/meta-renesas-rcar-gen3/meta-rcar-gen3 \ + ${METADIR}/meta-renesas-rcar-gen3/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 new file mode 100644 index 000000000..05cca9743 --- /dev/null +++ b/templates/machine/h3-salvator-x/50_local.conf.inc @@ -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 index 000000000..abd2a33af --- /dev/null +++ b/templates/machine/h3-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 -- cgit 1.2.3-korg