Merge "low-level-can-service: bump to new version"

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 78be211..c934e0c 100644 (file)
--- 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 += "${@bb.utils.contains("MACHINE_FEATURES", "multimedia", "file://v4l2-renderer.cfg", "",d)}"
+SRC_URI += "file://kingfisher_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/kingfisher_output.cfg b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf/kingfisher_output.cfg
new file mode 100644 (file)
index 0000000..a194a4a
--- /dev/null
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf/kingfisher_output.cfg
@@ -0,0 +1,8 @@
+[output]
+name=HDMI-A-2
+mode=off
+
+[output]
+name=LVDS-1
+mode=off
+

diff --git a/scripts/mkefi-agl.sh b/scripts/mkefi-agl.sh
index 43a0c3e..f2480e2 100755 (executable)
--- a/scripts/mkefi-agl.sh
+++ b/scripts/mkefi-agl.sh
@@ -415,10 +415,14 @@ if [ -f $HDDIMG_MNT/vmlinuz ]; then
    debug "kernel is vmlinuz"
 fi
 if [ -f $HDDIMG_MNT/bzimage ]; then
-   cp $HDDIMG_MNT/bzimage $BOOTFS_MNT 1>&3 2>&1 || die "Failed to copy vmlinuz"
+   cp $HDDIMG_MNT/bzimage $BOOTFS_MNT 1>&3 2>&1 || die "Failed to copy bzimage"
    KERNEL_TYPE="BZIMAGE"
    debug "kernel is bzimage"
 fi
+if [ -f $HDDIMG_MNT/microcode.cpio ]; then
+   cp $HDDIMG_MNT/microcode.cpio $BOOTFS_MNT 1>&3 2>&1 || die "Failed to copy microcode.cpio"
+   debug "microcode.cpio copied"
+fi
 [ -z $KERNEL_TYPE ] && die "Linux kernel type in $HDDIMG is unsupported"
 
 if [ -f $HDDIMG_MNT/initrd ]