From c1e34baa79d3e1000f31f46f38e7b934c8694b58 Mon Sep 17 00:00:00 2001 From: Pierre Marzin Date: Wed, 15 May 2019 09:36:08 +0200 Subject: machine: Add new ebisu machine * Add ebisu dependency within renesas bootfiles * Delete rcar ADAS layers support * Add weston video output config * Add missing modules and gst plugin Bug-AGL: SPEC-2564 Change-Id: I61a44f831d0bc55210847eade2a1eacc7599fa74 Signed-off-by: Pierre Marzin --- meta-agl-bsp/conf/include/agl_ebisu.inc | 13 +++++++++++++ .../recipes-bsp/bootfiles/renesas-ota-bootfiles.bb | 2 +- .../recipes-graphics/wayland/weston-ini-conf.bbappend | 1 + .../wayland/weston-ini-conf/ebisu_output.cfg | 4 ++++ templates/machine/ebisu/50_bblayers.conf.inc | 3 +++ templates/machine/ebisu/50_local.conf.inc | 6 ++++++ templates/machine/ebisu/50_setup.sh | 10 ++++++++++ 7 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 meta-agl-bsp/conf/include/agl_ebisu.inc create mode 100644 meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf/ebisu_output.cfg create mode 100644 templates/machine/ebisu/50_bblayers.conf.inc create mode 100644 templates/machine/ebisu/50_local.conf.inc create mode 100644 templates/machine/ebisu/50_setup.sh diff --git a/meta-agl-bsp/conf/include/agl_ebisu.inc b/meta-agl-bsp/conf/include/agl_ebisu.inc new file mode 100644 index 000000000..f7a737232 --- /dev/null +++ b/meta-agl-bsp/conf/include/agl_ebisu.inc @@ -0,0 +1,13 @@ +require conf/include/agl_ulcb.inc +SOC_FAMILY = "r8a77990" +BOARD_NAME = "ebisu" + +DTB_SUFFIX = "r8a77990-ebisu" + +DISTRO_FEATURES_remove = " use_eva_pkg" + +# Configuration for USB 3.0 +MACHINE_FEATURES_append = " usb3" + +IMAGE_INSTALL_append = " gstreamer1.0-omx gstreamer1.0-plugin-vspfilter" +IMAGE_INSTALL_append = " kernel-module-mmngr kernel-module-mmngrbuf kernel-module-uvcs-drv kernel-module-vspmif" diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/renesas-ota-bootfiles.bb b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/renesas-ota-bootfiles.bb index f247ef743..db08f3f46 100644 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/renesas-ota-bootfiles.bb +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/renesas-ota-bootfiles.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384 inherit deploy -COMPATIBLE_MACHINE = "(m3ulcb|h3ulcb)" +COMPATIBLE_MACHINE = "(m3ulcb|h3ulcb|ebisu)" S = "${WORKDIR}" diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf.bbappend index e232d6e51..198f83f10 100644 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf.bbappend +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf.bbappend @@ -1,6 +1,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "file://kingfisher_output.cfg" +SRC_URI_append_ebisu += "file://ebisu_output.cfg" do_configure() { echo repaint-window=34 >> ${WORKDIR}/core.cfg diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf/ebisu_output.cfg b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf/ebisu_output.cfg new file mode 100644 index 000000000..618f04e71 --- /dev/null +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf/ebisu_output.cfg @@ -0,0 +1,4 @@ +[output] +name=VGA-1 +mode=off + diff --git a/templates/machine/ebisu/50_bblayers.conf.inc b/templates/machine/ebisu/50_bblayers.conf.inc new file mode 100644 index 000000000..7b0db440a --- /dev/null +++ b/templates/machine/ebisu/50_bblayers.conf.inc @@ -0,0 +1,3 @@ +BBLAYERS =+ "\ + ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \ + " diff --git a/templates/machine/ebisu/50_local.conf.inc b/templates/machine/ebisu/50_local.conf.inc new file mode 100644 index 000000000..e780501a5 --- /dev/null +++ b/templates/machine/ebisu/50_local.conf.inc @@ -0,0 +1,6 @@ +MACHINE = "ebisu" +#see meta-agl/meta-agl-bsp/conf/include/agl_ebisu.inc +require conf/include/agl_ebisu.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/ebisu/50_setup.sh b/templates/machine/ebisu/50_setup.sh new file mode 100644 index 000000000..abd2a33af --- /dev/null +++ b/templates/machine/ebisu/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