diff options
34 files changed, 185 insertions, 23 deletions
diff --git a/meta-agl-bsp/conf/include/agl_ebisu.inc b/meta-agl-bsp/conf/include/agl_ebisu.inc index f7a737232..2ac93adf0 100644 --- a/meta-agl-bsp/conf/include/agl_ebisu.inc +++ b/meta-agl-bsp/conf/include/agl_ebisu.inc @@ -1,4 +1,4 @@ -require conf/include/agl_ulcb.inc +require conf/include/agl_rcar.inc SOC_FAMILY = "r8a77990" BOARD_NAME = "ebisu" diff --git a/meta-agl-bsp/conf/include/agl_h3-salvator-x-nogfx.inc b/meta-agl-bsp/conf/include/agl_h3-salvator-x-nogfx.inc new file mode 100644 index 000000000..c12026351 --- /dev/null +++ b/meta-agl-bsp/conf/include/agl_h3-salvator-x-nogfx.inc @@ -0,0 +1,10 @@ +require conf/include/agl_rcar-nogfx.inc +SOC_FAMILY = "r8a7795" +BOARD_NAME = "h3-salvator-x" + +DTB_SUFFIX = "r8a7795-salvator-xs" + +# Mask graphic Pkgs +BBMASK += "gles-user-module|kernel-module-gles|wayland-kms|libgbm" +# Mask MMP recipes +BBMASK += "kernel-module-uvcs-drv|omx-user-module" diff --git a/meta-agl-bsp/conf/include/agl_h3-salvator-x.inc b/meta-agl-bsp/conf/include/agl_h3-salvator-x.inc index 74036111d..d338a5663 100644 --- a/meta-agl-bsp/conf/include/agl_h3-salvator-x.inc +++ b/meta-agl-bsp/conf/include/agl_h3-salvator-x.inc @@ -1,3 +1,9 @@ -# 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 +require conf/include/agl_rcar.inc +SOC_FAMILY = "r8a7795" +BOARD_NAME = "h3-salvator-x" + +DTB_SUFFIX = "r8a7795-salvator-xs" + +IMAGE_INSTALL_append_rcar-gen3 = " \ + kernel-module-vspmif \ +" diff --git a/meta-agl-bsp/conf/include/agl_h3ulcb-nogfx.inc b/meta-agl-bsp/conf/include/agl_h3ulcb-nogfx.inc index cee2acc38..25755d247 100644 --- a/meta-agl-bsp/conf/include/agl_h3ulcb-nogfx.inc +++ b/meta-agl-bsp/conf/include/agl_h3ulcb-nogfx.inc @@ -1,4 +1,4 @@ -require conf/include/agl_ulcb-nogfx.inc +require conf/include/agl_rcar-nogfx.inc SOC_FAMILY = "r8a7795" BOARD_NAME = "h3ulcb" diff --git a/meta-agl-bsp/conf/include/agl_h3ulcb.inc b/meta-agl-bsp/conf/include/agl_h3ulcb.inc index 00c2a70a3..eb3836abb 100644 --- a/meta-agl-bsp/conf/include/agl_h3ulcb.inc +++ b/meta-agl-bsp/conf/include/agl_h3ulcb.inc @@ -1,4 +1,4 @@ -require conf/include/agl_ulcb.inc +require conf/include/agl_rcar.inc SOC_FAMILY = "r8a7795" BOARD_NAME = "h3ulcb" diff --git a/meta-agl-bsp/conf/include/agl_m3-salvator-x-nogfx.inc b/meta-agl-bsp/conf/include/agl_m3-salvator-x-nogfx.inc new file mode 100644 index 000000000..7f1248065 --- /dev/null +++ b/meta-agl-bsp/conf/include/agl_m3-salvator-x-nogfx.inc @@ -0,0 +1,10 @@ +require conf/include/agl_rcar-nogfx.inc +SOC_FAMILY = "r8a7796" +BOARD_NAME = "m3-salvator-x" + +DTB_SUFFIX = "r8a7796-salvator-xs" + +# Mask graphic Pkgs +BBMASK += "gles-user-module|kernel-module-gles|wayland-kms|libgbm" +# Mask MMP recipes +BBMASK += "kernel-module-uvcs-drv|omx-user-module" diff --git a/meta-agl-bsp/conf/include/agl_m3-salvator-x.inc b/meta-agl-bsp/conf/include/agl_m3-salvator-x.inc new file mode 100644 index 000000000..5dcb5373d --- /dev/null +++ b/meta-agl-bsp/conf/include/agl_m3-salvator-x.inc @@ -0,0 +1,9 @@ +require conf/include/agl_rcar.inc +SOC_FAMILY = "r8a7796" +BOARD_NAME = "m3-salvator-x" + +DTB_SUFFIX = "r8a7796-salvator-xs" + +IMAGE_INSTALL_append_rcar-gen3 = " \ + kernel-module-vspmif \ +" diff --git a/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc b/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc index e045b3f66..5092c4bcb 100644 --- a/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc +++ b/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc @@ -1,4 +1,4 @@ -require conf/include/agl_ulcb-nogfx.inc +require conf/include/agl_rcar-nogfx.inc SOC_FAMILY = "r8a7796" BOARD_NAME = "m3ulcb" diff --git a/meta-agl-bsp/conf/include/agl_m3ulcb.inc b/meta-agl-bsp/conf/include/agl_m3ulcb.inc index 71c0a0bcb..b845e8c3c 100644 --- a/meta-agl-bsp/conf/include/agl_m3ulcb.inc +++ b/meta-agl-bsp/conf/include/agl_m3ulcb.inc @@ -1,4 +1,4 @@ -require conf/include/agl_ulcb.inc +require conf/include/agl_rcar.inc SOC_FAMILY = "r8a7796" BOARD_NAME = "m3ulcb" diff --git a/meta-agl-bsp/conf/include/agl_ulcb-nogfx.inc b/meta-agl-bsp/conf/include/agl_rcar-nogfx.inc index 380011896..380011896 100644 --- a/meta-agl-bsp/conf/include/agl_ulcb-nogfx.inc +++ b/meta-agl-bsp/conf/include/agl_rcar-nogfx.inc diff --git a/meta-agl-bsp/conf/include/agl_ulcb.inc b/meta-agl-bsp/conf/include/agl_rcar.inc index d71a6941c..a21931a02 100644 --- a/meta-agl-bsp/conf/include/agl_ulcb.inc +++ b/meta-agl-bsp/conf/include/agl_rcar.inc @@ -1,11 +1,8 @@ -require conf/include/agl_ulcb-nogfx.inc +require conf/include/agl_rcar-nogfx.inc # Enable AGL virtualization features MACHINE_FEATURES_append = " agl-egvirt" -# for Wayland/Weston weston-laucher -DISTRO_FEATURES_append = " pam" - # Enable Gfx Pkgs MACHINE_FEATURES_append = " gsx" MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2" diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/alsa-state/alsa-state.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/alsa-state/alsa-state.bbappend index 642a71e4e..38c5e706a 100644 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/alsa-state/alsa-state.bbappend +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/alsa-state/alsa-state.bbappend @@ -1,6 +1,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -COMPATIBLE_MACHINE = "(m3ulcb|h3ulcb|ebisu)" +COMPATIBLE_MACHINE = "(salvator-x|m3ulcb|h3ulcb|ebisu)" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-h3-salvator-x.txt b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-h3-salvator-x.txt new file mode 100644 index 000000000..9a8dc560d --- /dev/null +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-h3-salvator-x.txt @@ -0,0 +1,18 @@ +bootkaddr=0x49090000 +bootdaddr=0x48000000 +bootiaddr=0x5C3F9520 + +bootargs_console=console=ttySC0,115200 ignore_loglevel +bootargs_extra=rw rootfstype=ext4 rootwait rootdelay=2 +bootargs_root=ostree_root=/dev/mmcblk1p2 root=/dev/ram0 ramdisk_size=16384 + +bootmmc=0:1 +rootmmc=0:2 + +booteload_sd=ext4load mmc ${rootmmc} ${bootkaddr} boot/loader/uEnv.txt; env import -t ${bootkaddr} ${filesize} +bootkload_sd=ext4load mmc ${rootmmc} ${bootkaddr} boot/${kernel_image} +bootiload_sd=ext4load mmc ${rootmmc} ${bootiaddr} boot/${ramdisk_image}; setenv ramdisk_size ${filesize} +bootdload_sd=fatload mmc ${bootmmc} ${bootdaddr} r8a7795-salvator-xs.dtb + +bootcmd=run booteload_sd; setenv bootargs ${bootargs} ${bootargs_console} ${bootargs_root} ${bootargs_extra}; run bootkload_sd; run bootiload_sd; run bootdload_sd; booti ${bootkaddr} ${bootiaddr}:${ramdisk_size} ${bootdaddr} + diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-m3-salvator-x.txt b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-m3-salvator-x.txt new file mode 100644 index 000000000..7b76e1ef9 --- /dev/null +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-m3-salvator-x.txt @@ -0,0 +1,18 @@ +bootkaddr=0x49090000 +bootdaddr=0x48000000 +bootiaddr=0x5C3F9520 + +bootargs_console=console=ttySC0,115200 ignore_loglevel +bootargs_extra=rw rootfstype=ext4 rootwait rootdelay=2 +bootargs_root=ostree_root=/dev/mmcblk1p2 root=/dev/ram0 ramdisk_size=16384 + +bootmmc=0:1 +rootmmc=0:2 + +booteload_sd=ext4load mmc ${rootmmc} ${bootkaddr} boot/loader/uEnv.txt; env import -t ${bootkaddr} ${filesize} +bootkload_sd=ext4load mmc ${rootmmc} ${bootkaddr} boot/${kernel_image} +bootiload_sd=ext4load mmc ${rootmmc} ${bootiaddr} boot/${ramdisk_image}; setenv ramdisk_size ${filesize} +bootdload_sd=fatload mmc ${bootmmc} ${bootdaddr} r8a7796-salvator-xs.dtb + +bootcmd=run booteload_sd; setenv bootargs ${bootargs} ${bootargs_console} ${bootargs_root} ${bootargs_extra}; run bootkload_sd; run bootiload_sd; run bootdload_sd; booti ${bootkaddr} ${bootiaddr}:${ramdisk_size} ${bootdaddr} + 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 db08f3f46..4007e7f96 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,13 +4,14 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384 inherit deploy -COMPATIBLE_MACHINE = "(m3ulcb|h3ulcb|ebisu)" +COMPATIBLE_MACHINE = "(salvator-x|m3ulcb|h3ulcb|ebisu)" S = "${WORKDIR}" SRC_URI_append_sota = "file://uEnv-ota-m3ulcb.txt \ - file://uEnv-ota-h3ulcb.txt" - + file://uEnv-ota-h3ulcb.txt \ + file://uEnv-ota-h3-salvator-xs \ + file://uEnv-ota-m3-salvator-xs" do_deploy() { install -d ${DEPLOYDIR}/${PN} } 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 198f83f10..44615c331 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,7 +1,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += "file://kingfisher_output.cfg" -SRC_URI_append_ebisu += "file://ebisu_output.cfg" +SRC_URI_append_ulcb = " file://kingfisher_output.cfg" +SRC_URI_append_ebisu = " file://ebisu_output.cfg" +SRC_URI_append_salvator-x = " file://salvator-x_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 index 618f04e71..2bca54f02 100644 --- 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 @@ -1,4 +1,11 @@ [output] -name=VGA-1 +name=HDMI-A-2 +mode=off + +[output] +name=LVDS-1 mode=off +[output] +name=VGA-1 +mode=off diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf/kingfisher_output.cfg b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf/kingfisher_output.cfg index a194a4a46..99fde3063 100644 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf/kingfisher_output.cfg +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf/kingfisher_output.cfg @@ -5,4 +5,3 @@ mode=off [output] name=LVDS-1 mode=off - diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf/salvator-x_output.cfg b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf/salvator-x_output.cfg new file mode 100644 index 000000000..7359e6ec9 --- /dev/null +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf/salvator-x_output.cfg @@ -0,0 +1,12 @@ +[output] +name=HDMI-A-2 +mode=off + +[output] +name=LVDS-1 +mode=off + +[output] +name=VGA-1 +mode=off + diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston_%.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston_%.bbappend index 38590dcdb..6ce747270 100644 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston_%.bbappend +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston_%.bbappend @@ -1 +1 @@ -DEPENDS_append_ulcb = " gstreamer1.0-plugins-base" +DEPENDS_append_rcar-gen3 = " gstreamer1.0-plugins-base" diff --git a/meta-agl-profile-graphical/recipes-multimedia/gstreamer1.0-plugins-bad/gstreamer1.0-plugins-bad_1.16.%.bbappend b/meta-agl-profile-graphical/recipes-multimedia/gstreamer1.0-plugins-bad/gstreamer1.0-plugins-bad_1.16.%.bbappend index df13a042d..4597428fa 100644 --- a/meta-agl-profile-graphical/recipes-multimedia/gstreamer1.0-plugins-bad/gstreamer1.0-plugins-bad_1.16.%.bbappend +++ b/meta-agl-profile-graphical/recipes-multimedia/gstreamer1.0-plugins-bad/gstreamer1.0-plugins-bad_1.16.%.bbappend @@ -1,2 +1,2 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI_append="${@bb.utils.contains_any("MACHINE", "m3ulcb h3ulcb m3ulcb-nogfx", " "," file://0001-install-wayland.h.patch", d)}" +SRC_URI_append="${@bb.utils.contains_any("MACHINE", "salvator-x m3ulcb h3ulcb m3ulcb-nogfx", " "," file://0001-install-wayland.h.patch", d)}" 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* + |