aboutsummaryrefslogtreecommitdiffstats
path: root/meta-agl-bsp/conf/include
diff options
context:
space:
mode:
authorDuy Dang <duy.dang.yw@renesas.com>2020-02-26 15:34:38 +0700
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2020-03-18 12:40:52 +0000
commit2fe60ed6b40ae96e43d1edd9c3da978dc6e8db0c (patch)
tree4df13eb28040bacaffb502a0db19437016f4e695 /meta-agl-bsp/conf/include
parentfbb9935ee800146d931dbdb53a9626e5d90db27c (diff)
Support Salvator-X/XS board
Add new machines to build with AGL: - h3-salvator-x-nogfx - h3-salvator-x - m3-salvator-x-nogfx - m3-salvator-x Bug-AGL: SPEC-3169 Change-Id: I0cfa838ad40f8afda01aeb693fbf595bad8b4730 Signed-off-by: Duy Dang <duy.dang.yw@renesas.com>
Diffstat (limited to 'meta-agl-bsp/conf/include')
-rw-r--r--meta-agl-bsp/conf/include/agl_ebisu.inc2
-rw-r--r--meta-agl-bsp/conf/include/agl_h3-salvator-x-nogfx.inc10
-rw-r--r--meta-agl-bsp/conf/include/agl_h3-salvator-x.inc12
-rw-r--r--meta-agl-bsp/conf/include/agl_h3ulcb-nogfx.inc2
-rw-r--r--meta-agl-bsp/conf/include/agl_h3ulcb.inc2
-rw-r--r--meta-agl-bsp/conf/include/agl_m3-salvator-x-nogfx.inc10
-rw-r--r--meta-agl-bsp/conf/include/agl_m3-salvator-x.inc9
-rw-r--r--meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc2
-rw-r--r--meta-agl-bsp/conf/include/agl_m3ulcb.inc2
-rw-r--r--meta-agl-bsp/conf/include/agl_rcar-nogfx.inc (renamed from meta-agl-bsp/conf/include/agl_ulcb-nogfx.inc)0
-rw-r--r--meta-agl-bsp/conf/include/agl_rcar.inc (renamed from meta-agl-bsp/conf/include/agl_ulcb.inc)5
11 files changed, 44 insertions, 12 deletions
diff --git a/meta-agl-bsp/conf/include/agl_ebisu.inc b/meta-agl-bsp/conf/include/agl_ebisu.inc
index f7a737232..2ac93adf0 100644
--- a/meta-agl-bsp/conf/include/agl_ebisu.inc
+++ b/meta-agl-bsp/conf/include/agl_ebisu.inc
@@ -1,4 +1,4 @@
-require conf/include/agl_ulcb.inc
+require conf/include/agl_rcar.inc
SOC_FAMILY = "r8a77990"
BOARD_NAME = "ebisu"
diff --git a/meta-agl-bsp/conf/include/agl_h3-salvator-x-nogfx.inc b/meta-agl-bsp/conf/include/agl_h3-salvator-x-nogfx.inc
new file mode 100644
index 000000000..c12026351
--- /dev/null
+++ b/meta-agl-bsp/conf/include/agl_h3-salvator-x-nogfx.inc
@@ -0,0 +1,10 @@
+require conf/include/agl_rcar-nogfx.inc
+SOC_FAMILY = "r8a7795"
+BOARD_NAME = "h3-salvator-x"
+
+DTB_SUFFIX = "r8a7795-salvator-xs"
+
+# Mask graphic Pkgs
+BBMASK += "gles-user-module|kernel-module-gles|wayland-kms|libgbm"
+# Mask MMP recipes
+BBMASK += "kernel-module-uvcs-drv|omx-user-module"
diff --git a/meta-agl-bsp/conf/include/agl_h3-salvator-x.inc b/meta-agl-bsp/conf/include/agl_h3-salvator-x.inc
index 74036111d..d338a5663 100644
--- a/meta-agl-bsp/conf/include/agl_h3-salvator-x.inc
+++ b/meta-agl-bsp/conf/include/agl_h3-salvator-x.inc
@@ -1,3 +1,9 @@
-# The H3-based (as opposed to the M3-based version) salvator-x needs a different
-# MACHINE but otherwise uses the same config as the H3.
-require conf/include/agl_h3ulcb.inc
+require conf/include/agl_rcar.inc
+SOC_FAMILY = "r8a7795"
+BOARD_NAME = "h3-salvator-x"
+
+DTB_SUFFIX = "r8a7795-salvator-xs"
+
+IMAGE_INSTALL_append_rcar-gen3 = " \
+ kernel-module-vspmif \
+"
diff --git a/meta-agl-bsp/conf/include/agl_h3ulcb-nogfx.inc b/meta-agl-bsp/conf/include/agl_h3ulcb-nogfx.inc
index cee2acc38..25755d247 100644
--- a/meta-agl-bsp/conf/include/agl_h3ulcb-nogfx.inc
+++ b/meta-agl-bsp/conf/include/agl_h3ulcb-nogfx.inc
@@ -1,4 +1,4 @@
-require conf/include/agl_ulcb-nogfx.inc
+require conf/include/agl_rcar-nogfx.inc
SOC_FAMILY = "r8a7795"
BOARD_NAME = "h3ulcb"
diff --git a/meta-agl-bsp/conf/include/agl_h3ulcb.inc b/meta-agl-bsp/conf/include/agl_h3ulcb.inc
index 00c2a70a3..eb3836abb 100644
--- a/meta-agl-bsp/conf/include/agl_h3ulcb.inc
+++ b/meta-agl-bsp/conf/include/agl_h3ulcb.inc
@@ -1,4 +1,4 @@
-require conf/include/agl_ulcb.inc
+require conf/include/agl_rcar.inc
SOC_FAMILY = "r8a7795"
BOARD_NAME = "h3ulcb"
diff --git a/meta-agl-bsp/conf/include/agl_m3-salvator-x-nogfx.inc b/meta-agl-bsp/conf/include/agl_m3-salvator-x-nogfx.inc
new file mode 100644
index 000000000..7f1248065
--- /dev/null
+++ b/meta-agl-bsp/conf/include/agl_m3-salvator-x-nogfx.inc
@@ -0,0 +1,10 @@
+require conf/include/agl_rcar-nogfx.inc
+SOC_FAMILY = "r8a7796"
+BOARD_NAME = "m3-salvator-x"
+
+DTB_SUFFIX = "r8a7796-salvator-xs"
+
+# Mask graphic Pkgs
+BBMASK += "gles-user-module|kernel-module-gles|wayland-kms|libgbm"
+# Mask MMP recipes
+BBMASK += "kernel-module-uvcs-drv|omx-user-module"
diff --git a/meta-agl-bsp/conf/include/agl_m3-salvator-x.inc b/meta-agl-bsp/conf/include/agl_m3-salvator-x.inc
new file mode 100644
index 000000000..5dcb5373d
--- /dev/null
+++ b/meta-agl-bsp/conf/include/agl_m3-salvator-x.inc
@@ -0,0 +1,9 @@
+require conf/include/agl_rcar.inc
+SOC_FAMILY = "r8a7796"
+BOARD_NAME = "m3-salvator-x"
+
+DTB_SUFFIX = "r8a7796-salvator-xs"
+
+IMAGE_INSTALL_append_rcar-gen3 = " \
+ kernel-module-vspmif \
+"
diff --git a/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc b/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc
index e045b3f66..5092c4bcb 100644
--- a/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc
+++ b/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc
@@ -1,4 +1,4 @@
-require conf/include/agl_ulcb-nogfx.inc
+require conf/include/agl_rcar-nogfx.inc
SOC_FAMILY = "r8a7796"
BOARD_NAME = "m3ulcb"
diff --git a/meta-agl-bsp/conf/include/agl_m3ulcb.inc b/meta-agl-bsp/conf/include/agl_m3ulcb.inc
index 71c0a0bcb..b845e8c3c 100644
--- a/meta-agl-bsp/conf/include/agl_m3ulcb.inc
+++ b/meta-agl-bsp/conf/include/agl_m3ulcb.inc
@@ -1,4 +1,4 @@
-require conf/include/agl_ulcb.inc
+require conf/include/agl_rcar.inc
SOC_FAMILY = "r8a7796"
BOARD_NAME = "m3ulcb"
diff --git a/meta-agl-bsp/conf/include/agl_ulcb-nogfx.inc b/meta-agl-bsp/conf/include/agl_rcar-nogfx.inc
index 380011896..380011896 100644
--- a/meta-agl-bsp/conf/include/agl_ulcb-nogfx.inc
+++ b/meta-agl-bsp/conf/include/agl_rcar-nogfx.inc
diff --git a/meta-agl-bsp/conf/include/agl_ulcb.inc b/meta-agl-bsp/conf/include/agl_rcar.inc
index d71a6941c..a21931a02 100644
--- a/meta-agl-bsp/conf/include/agl_ulcb.inc
+++ b/meta-agl-bsp/conf/include/agl_rcar.inc
@@ -1,11 +1,8 @@
-require conf/include/agl_ulcb-nogfx.inc
+require conf/include/agl_rcar-nogfx.inc
# Enable AGL virtualization features
MACHINE_FEATURES_append = " agl-egvirt"
-# for Wayland/Weston weston-laucher
-DISTRO_FEATURES_append = " pam"
-
# Enable Gfx Pkgs
MACHINE_FEATURES_append = " gsx"
MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2"