From 2fe60ed6b40ae96e43d1edd9c3da978dc6e8db0c Mon Sep 17 00:00:00 2001 From: Duy Dang Date: Wed, 26 Feb 2020 15:34:38 +0700 Subject: 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 --- .../recipes-bsp/alsa-state/alsa-state.bbappend | 2 +- .../bootfiles/files/uEnv-ota-h3-salvator-x.txt | 18 ++++++++++++++++++ .../bootfiles/files/uEnv-ota-m3-salvator-x.txt | 18 ++++++++++++++++++ .../recipes-bsp/bootfiles/renesas-ota-bootfiles.bb | 7 ++++--- .../recipes-graphics/wayland/weston-ini-conf.bbappend | 5 +++-- .../wayland/weston-ini-conf/ebisu_output.cfg | 9 ++++++++- .../wayland/weston-ini-conf/kingfisher_output.cfg | 1 - .../wayland/weston-ini-conf/salvator-x_output.cfg | 12 ++++++++++++ .../recipes-graphics/wayland/weston_%.bbappend | 2 +- 9 files changed, 65 insertions(+), 9 deletions(-) create mode 100644 meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-h3-salvator-x.txt create mode 100644 meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-m3-salvator-x.txt create mode 100644 meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf/salvator-x_output.cfg (limited to 'meta-agl-bsp/meta-rcar-gen3') 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" -- cgit 1.2.3-korg