From fb3a3948ac2b76d14456c9d6247638a63c85f4c6 Mon Sep 17 00:00:00 2001 From: Matt Porter Date: Thu, 7 Dec 2017 15:45:44 -0500 Subject: templates: rcar3: add meta-rcar-gen3-adas for KF support Bug-AGL: SPEC-1175 Change-Id: Iaaf3b308eae48be9df87e477c62ff391efa59b50 Signed-off-by: Matt Porter --- templates/machine/h3ulcb/50_bblayers.conf.inc | 1 + templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc | 1 + templates/machine/m3ulcb/50_bblayers.conf.inc | 1 + 3 files changed, 3 insertions(+) diff --git a/templates/machine/h3ulcb/50_bblayers.conf.inc b/templates/machine/h3ulcb/50_bblayers.conf.inc index b58989c6f..f1897181c 100644 --- 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 b58989c6f..f1897181c 100644 --- 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 b58989c6f..f1897181c 100644 --- 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 \ " -- cgit 1.2.3-korg From b8f17a47bdee67e5b3e7085199a17004caaf6f9c Mon Sep 17 00:00:00 2001 From: Matt Porter Date: Thu, 7 Dec 2017 15:47:50 -0500 Subject: meta-rcar-gen3: add WiLink8 tools for KF support Add WiLink8 firmware and BT daemon to support Kingfisher. Bug-AGL: SPEC-1175 Change-Id: I1457c89abfa3ba3d6afe25c1e158cbfee8e937ad Signed-off-by: Matt Porter --- .../packagegroups/packagegroup-agl-core-connectivity.bbappend | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 meta-agl-bsp/meta-rcar-gen3/recipes-core/packagegroups/packagegroup-agl-core-connectivity.bbappend 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 index 000000000..cc6f4910b --- /dev/null +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-core/packagegroups/packagegroup-agl-core-connectivity.bbappend @@ -0,0 +1,4 @@ +RDEPENDS_${PN} += "\ + linux-firmware-wl18xx \ + ti-bt \ +" -- cgit 1.2.3-korg From a6f5393f8cae8f36028acb18f6a2142bb9238bbb Mon Sep 17 00:00:00 2001 From: Matt Porter Date: Wed, 13 Dec 2017 10:55:51 -0500 Subject: ti-bt: add a systemd unit and enable We need to provide a systemd unit for UIM to be started at boot. We also do not want the blacklist that Cogent has created, so delete that. Bug-AGL: SPEC-1175 Change-Id: Ia35a6007722d4e42a7a76fe9d8d26b90b073f73b Signed-off-by: Matt Porter Signed-off-by: Tom Rini --- .../meta-rcar-gen3/recipes-bsp/ti-bt/ti-bt/ti-uim.service | 10 ++++++++++ .../meta-rcar-gen3/recipes-bsp/ti-bt/ti-bt_%.bbappend | 15 +++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 meta-agl-bsp/meta-rcar-gen3/recipes-bsp/ti-bt/ti-bt/ti-uim.service create mode 100644 meta-agl-bsp/meta-rcar-gen3/recipes-bsp/ti-bt/ti-bt_%.bbappend 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 index 000000000..214e60707 --- /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 index 000000000..45138b618 --- /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 +} -- cgit 1.2.3-korg From 6d60fccd6fa657660d78bfae5c3cf84dedcaced4 Mon Sep 17 00:00:00 2001 From: Matt Porter Date: Mon, 11 Dec 2017 19:38:41 -0500 Subject: meta-rcar-gen3: add si46xx radio tools for KF support Add userspace flashing/init/operational tools and userspace driver to support the si46xx radio on Kingfisher. Bug-AGL: SPEC-1175 Change-Id: I07fe2d5a3e19e4c094e3238430a9287c9aa52aff Signed-off-by: Matt Porter --- .../packagegroups/packagegroup-agl-core-connectivity.bbappend | 1 + 1 file changed, 1 insertion(+) 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 index cc6f4910b..01a7a9a41 100644 --- 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 @@ -1,4 +1,5 @@ RDEPENDS_${PN} += "\ linux-firmware-wl18xx \ ti-bt \ + si-tools \ " -- cgit 1.2.3-korg From 8e1e3e7be522095086e80bd4e1640ca3bb28a3c4 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 13 Dec 2017 18:18:29 -0500 Subject: meta-agl-bsp/meta-rcar-gen3: Add u-boot-script-rcar-gen3 to ease boot Introduce a boot.scr script to handle loading the kernel and device tree, along with setting up the bootargs. Change-Id: I6716197bc68c37e72d6203113f055fbc0d84ee37 Bug-AGL: SPEC-1175 Signed-off-by: Tom Rini --- meta-agl-bsp/conf/include/agl_h3ulcb.inc | 4 +++ meta-agl-bsp/conf/include/agl_m3ulcb.inc | 4 +++ .../recipes-bsp/u-boot/u-boot-script-rcar-gen3.bb | 35 ++++++++++++++++++++++ .../u-boot/u-boot-script-rcar-gen3/boot.cmd | 4 +++ 4 files changed, 47 insertions(+) create mode 100644 meta-agl-bsp/meta-rcar-gen3/recipes-bsp/u-boot/u-boot-script-rcar-gen3.bb create mode 100644 meta-agl-bsp/meta-rcar-gen3/recipes-bsp/u-boot/u-boot-script-rcar-gen3/boot.cmd diff --git a/meta-agl-bsp/conf/include/agl_h3ulcb.inc b/meta-agl-bsp/conf/include/agl_h3ulcb.inc index e38cdc70f..97f6c610d 100644 --- 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 808f74e3b..f4e731acb 100644 --- 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/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 index 000000000..42a05ec26 --- /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 index 000000000..61a7a925e --- /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 -- cgit 1.2.3-korg