Raspberrypi 5 support for IC container

This patch add board support for raspberrypi5.

Bug-AGL: SPEC-5242

Change-Id: I9e9c244da74fd2c5d83f71b43eb40ae491276096
Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>

diff --git a/meta-agl-ic-container/conf/include/drm-lease-multi-display.inc b/meta-agl-ic-container/conf/include/drm-lease-multi-display.inc
index bcf2e73..398958f 100644 (file)
--- a/meta-agl-ic-container/conf/include/drm-lease-multi-display.inc
+++ b/meta-agl-ic-container/conf/include/drm-lease-multi-display.inc
@@ -2,4 +2,5 @@ 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)}"
 HAS_MULTI_DISPLAY += "${@bb.utils.contains("MACHINE", "raspberrypi4-64", "1", "" ,d)}"
+HAS_MULTI_DISPLAY += "${@bb.utils.contains("MACHINE", "raspberrypi5", "1", "" ,d)}"
 HAS_MULTI_DISPLAY += "${@bb.utils.contains("MACHINE", "salvator-x", "1", "" ,d)}"

diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/raspberrypi4/agl-flutter-ivi-demo.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/rpi/agl-flutter-ivi-demo.json
similarity index 100%
rename from meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/raspberrypi4/agl-flutter-ivi-demo.json
rename to meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/rpi/agl-flutter-ivi-demo.json

diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/raspberrypi4/agl-momi-ivi-demo.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/rpi/agl-momi-ivi-demo.json
similarity index 100%
rename from meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/raspberrypi4/agl-momi-ivi-demo.json
rename to meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/rpi/agl-momi-ivi-demo.json

diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/raspberrypi4/agl-qt-ivi-demo.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/rpi/agl-qt-ivi-demo.json
similarity index 100%
rename from meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/raspberrypi4/agl-qt-ivi-demo.json
rename to meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/rpi/agl-qt-ivi-demo.json

diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo/raspberrypi4/cluster-demo.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo/rpi/cluster-demo.json
similarity index 100%
rename from meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo/raspberrypi4/cluster-demo.json
rename to meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo/rpi/cluster-demo.json

diff --git a/meta-agl-ic-container/recipes-graphics/drm-lease-manager/drm-lease-manager-init/raspberrypi4/drm-lease-manager.ini b/meta-agl-ic-container/recipes-graphics/drm-lease-manager/drm-lease-manager-init/rpi/drm-lease-manager.ini
similarity index 100%
rename from meta-agl-ic-container/recipes-graphics/drm-lease-manager/drm-lease-manager-init/raspberrypi4/drm-lease-manager.ini
rename to meta-agl-ic-container/recipes-graphics/drm-lease-manager/drm-lease-manager-init/rpi/drm-lease-manager.ini

diff --git a/meta-agl-ic-container/recipes-platform/images/guest-image-cluster-demo.bb b/meta-agl-ic-container/recipes-platform/images/guest-image-cluster-demo.bb
index be3a884..d783054 100644 (file)
--- a/meta-agl-ic-container/recipes-platform/images/guest-image-cluster-demo.bb
+++ b/meta-agl-ic-container/recipes-platform/images/guest-image-cluster-demo.bb
@@ -13,7 +13,7 @@ IMAGE_INSTALL += " \
     pipewire-ic-ipc \
 "
 
-IMAGE_INSTALL:append:raspberrypi4 = " mesa-megadriver"
+IMAGE_INSTALL:append:rpi = " mesa-megadriver"
 
 IMAGE_OVERHEAD_FACTOR = "0"
 EXTRA_IMAGECMD:append = " -L agl-cluster"

diff --git a/meta-agl-ic-container/recipes-platform/images/guest-image-drm-lease-test-cluster.bb b/meta-agl-ic-container/recipes-platform/images/guest-image-drm-lease-test-cluster.bb
index 13563da..d580c2f 100644 (file)
--- a/meta-agl-ic-container/recipes-platform/images/guest-image-drm-lease-test-cluster.bb
+++ b/meta-agl-ic-container/recipes-platform/images/guest-image-drm-lease-test-cluster.bb
@@ -10,4 +10,4 @@ IMAGE_INSTALL += " \
     weston-ini-conf-drm-lease-test-cluster \
 "
 
-IMAGE_INSTALL:append:raspberrypi4 = " mesa-megadriver"
+IMAGE_INSTALL:append:rpi = " mesa-megadriver"

diff --git a/meta-agl-ic-container/recipes-platform/images/guest-image-drm-lease-test-ivi.bb b/meta-agl-ic-container/recipes-platform/images/guest-image-drm-lease-test-ivi.bb
index be8fcbf..8ce4129 100644 (file)
--- a/meta-agl-ic-container/recipes-platform/images/guest-image-drm-lease-test-ivi.bb
+++ b/meta-agl-ic-container/recipes-platform/images/guest-image-drm-lease-test-ivi.bb
@@ -10,4 +10,4 @@ IMAGE_INSTALL += " \
     weston-ini-conf-drm-lease-test-ivi \
 "
 
-IMAGE_INSTALL:append:raspberrypi4 = " mesa-megadriver"
+IMAGE_INSTALL:append:rpi = " mesa-megadriver"

diff --git a/meta-agl-ic-container/recipes-platform/images/guest-image-ivi-demo.bb b/meta-agl-ic-container/recipes-platform/images/guest-image-ivi-demo.bb
index 4ac579a..2218457 100644 (file)
--- a/meta-agl-ic-container/recipes-platform/images/guest-image-ivi-demo.bb
+++ b/meta-agl-ic-container/recipes-platform/images/guest-image-ivi-demo.bb
@@ -27,7 +27,7 @@ IMAGE_INSTALL += " \
     wireplumber-policy-config-agl \
 "
 
-IMAGE_INSTALL:append:raspberrypi4 = " mesa-megadriver"
+IMAGE_INSTALL:append:rpi = " mesa-megadriver"
 
 IMAGE_OVERHEAD_FACTOR = "0"
 EXTRA_IMAGECMD:append = " -L agl-momi-ivi"