agl-lxc: rcar-gen3: Support agl-refhw-h3 in lxc demo

Added tentative mechanism for determining multi-display support
and added agl-refhw-h3 into that multi-display group as same as
kingfisher. After this change two demo containers (cluster and
ivi) can be boot automatically on agl-refhw-h3 board by running
lxc-host-image-demo.

BUG-AGL: SPEC-4155

Signed-off-by: Hiroyuki Ishii <ishii.hiroyuki002@jp.panasonic.com>
Change-Id: I3372a998ea7a073b10160831e969c949045ce6c2

diff --git a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-cluster-demo_1.0.bbappend b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-cluster-demo_1.0.bbappend
index 1f6ef54..92888ba 100644 (file)
--- a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-cluster-demo_1.0.bbappend
+++ b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-cluster-demo_1.0.bbappend
@@ -1,6 +1,8 @@
+require multi-display.inc
+
 FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 
 # If you want to change display assign in your board, please change this line in your recipe.
-DRM_LEASE_DEVICE ?= "${@bb.utils.contains("AGL_FEATURES", "kingfisher", "card0-HDMI-A-2", "card0-HDMI-A-1" ,d)}"
+DRM_LEASE_DEVICE ?= "${@bb.utils.contains("HAS_MULTI_DISPLAY", "1", "card0-HDMI-A-2", "card0-HDMI-A-1" ,d)}"
 
 LXC_AUTO_START ?= "1"

diff --git a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-ivi-demo_1.0.bbappend b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-ivi-demo_1.0.bbappend
index 013bdfb..f58fe2c 100644 (file)
--- a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-ivi-demo_1.0.bbappend
+++ b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-ivi-demo_1.0.bbappend
@@ -1,6 +1,5 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
+require multi-display.inc
 
-# If you want to change display assign in your board, please change this line in your recipe.
-DRM_LEASE_DEVICE ?= "${@bb.utils.contains("AGL_FEATURES", "kingfisher", "card0-HDMI-A-1", "card0-HDMI-A-1" ,d)}"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 
-LXC_AUTO_START ?= "${@bb.utils.contains("AGL_FEATURES", "kingfisher", "1", "0" ,d)}"
+LXC_AUTO_START ?= "${@bb.utils.contains("HAS_MULTI_DISPLAY", "1", "1", "0" ,d)}"

diff --git a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/multi-display.inc b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/multi-display.inc
new file mode 100644 (file)
index 0000000..96a3e29
--- /dev/null
+++ b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/multi-display.inc
@@ -0,0 +1,3 @@
+HAS_MULTI_DISPLAY ?= ""
+HAS_MULTI_DISPLAY += "${@bb.utils.contains("AGL_FEATURES", "kingfisher", "1", "" ,d)}"
+HAS_MULTI_DISPLAY += "${@bb.utils.contains("AGL_FEATURES", "agl-refhw-h3", "1", "" ,d)}"