Merge "Adding lua to Host SDK" into eel

diff --git a/meta-agl-bsp/conf/include/agl_h3ulcb.inc b/meta-agl-bsp/conf/include/agl_h3ulcb.inc
index e38cdc7..97f6c61 100644 (file)
--- a/meta-agl-bsp/conf/include/agl_h3ulcb.inc
+++ b/meta-agl-bsp/conf/include/agl_h3ulcb.inc
@@ -39,6 +39,10 @@ DISTRO_FEATURES_append = " h264dec_lib h264enc_lib aaclcdec_lib aaclcdec_mdw"
 
 DISTRO_FEATURES_BACKFILL_remove = "gobject-introspection-data"
 
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append = " \
+       u-boot-script-rcar-gen3 \
+"
+
 IMAGE_INSTALL_append_rcar-gen3 = " \
        kernel-devicetree \
        kernel-module-pvrsrvkm \

diff --git a/meta-agl-bsp/conf/include/agl_m3ulcb.inc b/meta-agl-bsp/conf/include/agl_m3ulcb.inc
index 808f74e..f4e731a 100644 (file)
--- a/meta-agl-bsp/conf/include/agl_m3ulcb.inc
+++ b/meta-agl-bsp/conf/include/agl_m3ulcb.inc
@@ -42,6 +42,10 @@ DISTRO_FEATURES_append = " h264dec_lib h264enc_lib aaclcdec_lib aaclcdec_mdw"
 
 DISTRO_FEATURES_BACKFILL_remove = "gobject-introspection-data"
 
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append = " \
+       u-boot-script-rcar-gen3 \
+"
+
 IMAGE_INSTALL_append_rcar-gen3 = " \
        kernel-devicetree \
        kernel-module-pvrsrvkm \

diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/ti-bt/ti-bt/ti-uim.service b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/ti-bt/ti-bt/ti-uim.service
new file mode 100644 (file)
index 0000000..214e607
--- /dev/null
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/ti-bt/ti-bt/ti-uim.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=User Mode Init Manager for TI shared transport
+Before=bluetooth.service
+
+[Service]
+ExecStartPre=-/sbin/modprobe -q btwilink
+ExecStart=/usr/bin/uim -f /sys/devices/platform/kim
+
+[Install]
+WantedBy=multi-user.target

diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/ti-bt/ti-bt_%.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/ti-bt/ti-bt_%.bbappend
new file mode 100644 (file)
index 0000000..45138b6
--- /dev/null
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/ti-bt/ti-bt_%.bbappend
@@ -0,0 +1,15 @@
+inherit systemd
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://ti-uim.service"
+
+SYSTEMD_SERVICE_${PN} = "ti-uim.service"
+
+do_install_append() {
+    # We do not want the blacklist
+    rm -f ${D}/${sysconfdir}/modprobe.d/ti_bt.conf
+
+    install -d ${D}${systemd_unitdir}/system/
+    install -m 0644 ${WORKDIR}/ti-uim.service ${D}${systemd_unitdir}/system
+}

diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/u-boot/u-boot-script-rcar-gen3.bb b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/u-boot/u-boot-script-rcar-gen3.bb
new file mode 100644 (file)
index 0000000..42a05ec
--- /dev/null
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/u-boot/u-boot-script-rcar-gen3.bb
@@ -0,0 +1,35 @@
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+DEPENDS = "u-boot-mkimage-native"
+
+SRC_URI = "file://boot.cmd"
+
+inherit deploy
+
+do_mkimage () {
+    uboot-mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
+                  -n "boot script" -d ${WORKDIR}/boot.cmd ${WORKDIR}/boot.scr
+}
+
+addtask mkimage after do_compile before do_install
+
+do_compile[noexec] = "1"
+
+do_install () {
+    install -D -m 644 ${WORKDIR}/boot.scr ${D}/boot/boot.scr
+}
+
+do_deploy () {
+    install -D -m 644 ${WORKDIR}/boot.scr \
+                      ${DEPLOYDIR}/boot.scr-${MACHINE}-${PV}-${PR}
+
+    cd ${DEPLOYDIR}
+    rm -f boot.scr-${MACHINE}
+    ln -sf boot.scr-${MACHINE}-${PV}-${PR} 6x_bootscript-${MACHINE}
+}
+
+addtask deploy after do_install before do_build
+
+FILES_${PN} += "/"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"

diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/u-boot/u-boot-script-rcar-gen3/boot.cmd b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/u-boot/u-boot-script-rcar-gen3/boot.cmd
new file mode 100644 (file)
index 0000000..61a7a92
--- /dev/null
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/u-boot/u-boot-script-rcar-gen3/boot.cmd
@@ -0,0 +1,4 @@
+setenv bootargs console=ttySC0,115200 root=/dev/mmcblk0p1 rootwait ro rootfstype=ext4
+ext4load mmc 0:1 0x48000000 /boot/${fdtfile}
+ext4load mmc 0:1 0x48080000 /boot/Image
+booti 0x48080000 - 0x48000000

diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-core/packagegroups/packagegroup-agl-core-connectivity.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-core/packagegroups/packagegroup-agl-core-connectivity.bbappend
new file mode 100644 (file)
index 0000000..01a7a9a
--- /dev/null
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-core/packagegroups/packagegroup-agl-core-connectivity.bbappend
@@ -0,0 +1,5 @@
+RDEPENDS_${PN} += "\
+       linux-firmware-wl18xx \
+       ti-bt \
+       si-tools \
+"

diff --git a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-10.0/0001-daemon-daemon.conf-disable-idle-exit.patch b/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-10.0/0001-daemon-daemon.conf-disable-idle-exit.patch
new file mode 100644 (file)
index 0000000..98f7ce4
--- /dev/null
+++ b/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-10.0/0001-daemon-daemon.conf-disable-idle-exit.patch
@@ -0,0 +1,28 @@
+From 4410e137da046afd072435ae8cf99a677b277442 Mon Sep 17 00:00:00 2001
+From: Matt Porter <mporter@konsulko.com>
+Date: Wed, 13 Dec 2017 17:24:10 -0500
+Subject: [PATCH] daemon: daemon.conf: disable idle exit
+
+Disable exit on idle by default.
+
+Signed-off-by: Matt Porter <mporter@konsulko.com>
+---
+ src/daemon/daemon.conf.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/daemon/daemon.conf.in b/src/daemon/daemon.conf.in
+index f3a1cc32..5c5e948c 100644
+--- a/src/daemon/daemon.conf.in
++++ b/src/daemon/daemon.conf.in
+@@ -39,7 +39,7 @@ ifelse(@HAVE_DBUS@, 1, [dnl
+ ; realtime-scheduling = yes
+ ; realtime-priority = 5
+ 
+-; exit-idle-time = 20
++exit-idle-time = -1
+ ; scache-idle-time = 20
+ 
+ ; dl-search-path = (depends on architecture)
+-- 
+2.11.0
+

diff --git a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio_10.0.bbappend b/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio_10.0.bbappend
index f59ee89..6833ca9 100644 (file)
--- a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio_10.0.bbappend
+++ b/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio_10.0.bbappend
@@ -8,6 +8,7 @@ SRC_URI += " \
        file://0005-sink-input-volume-Add-support-for-volume-ramp-factor.patch \
        file://0006-sink-input-Remove-pa_sink_input_set_volume_ramp.patch;apply=no \
        file://enable-ofono-hfp-backend.patch \
+       file://0001-daemon-daemon.conf-disable-idle-exit.patch \
 "
 
 PACKAGES =+ " pulseaudio-module-dev"

diff --git a/templates/machine/h3ulcb/50_bblayers.conf.inc b/templates/machine/h3ulcb/50_bblayers.conf.inc
index b58989c..f189718 100644 (file)
--- a/templates/machine/h3ulcb/50_bblayers.conf.inc
+++ b/templates/machine/h3ulcb/50_bblayers.conf.inc
@@ -1,3 +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/m3ulcb-nogfx/50_bblayers.conf.inc b/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc
index b58989c..f189718 100644 (file)
--- a/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc
+++ b/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc
@@ -1,3 +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/m3ulcb/50_bblayers.conf.inc b/templates/machine/m3ulcb/50_bblayers.conf.inc
index b58989c..f189718 100644 (file)
--- a/templates/machine/m3ulcb/50_bblayers.conf.inc
+++ b/templates/machine/m3ulcb/50_bblayers.conf.inc
@@ -1,3 +1,4 @@
 BBLAYERS =+ "\
   ${METADIR}/meta-renesas-rcar-gen3/meta-rcar-gen3 \
+  ${METADIR}/meta-renesas-rcar-gen3/meta-rcar-gen3-adas \
   "