From 35d1d0bc5899c4f0309882b66aedfc6963ec7e5d Mon Sep 17 00:00:00 2001 From: Hiroyuki Ishii Date: Fri, 3 Dec 2021 14:08:56 +0900 Subject: 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 Change-Id: I3372a998ea7a073b10160831e969c949045ce6c2 --- .../lxc-config/lxc-config-cluster-demo_1.0.bbappend | 4 +++- .../recipes-container/lxc-config/lxc-config-ivi-demo_1.0.bbappend | 7 +++---- .../meta-rcar-gen3/recipes-container/lxc-config/multi-display.inc | 3 +++ 3 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/multi-display.inc (limited to 'meta-agl-lxc/dynamic-layers/meta-rcar-gen3') 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 1f6ef541..92888ba8 100644 --- 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 013bdfb0..f58fe2cb 100644 --- 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 index 00000000..96a3e29e --- /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)}" -- cgit 1.2.3-korg