aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2020-06-30 19:13:19 +0200
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2020-07-07 18:22:48 +0000
commit0524237a83de69a0877ea4775ebdd061441ade29 (patch)
tree963836cde90ccc6f6db94ee24abda3cf7847c86b
parentcb5914968796d91c5b927b33f8eab29fb0bf76ce (diff)
Refactor the m3ulcb machine templates
This splits the machine templates for the m3 into three: - m3ulcb = plain m3ulcb with graphics driver package - m3ulcb-nogfx = plain m3ulcb without graphics driver package - m3ulcb-kf = m3ulcb with kingfisher baseboard and graphics driver package This improves maintainability of the m3ulcb machine targets. Bug-AGL: SPEC-3443 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Change-Id: Ib878833709ddc7f706fd15107bfb8dee4272d431 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/24913 Reviewed-by: Stéphane Desneux <stephane.desneux@iot.bzh>
-rw-r--r--templates/machine/m3ulcb-kf/50_bblayers.conf.inc4
-rw-r--r--templates/machine/m3ulcb-kf/50_local.conf.inc6
-rw-r--r--templates/machine/m3ulcb-kf/50_setup.sh10
-rw-r--r--templates/machine/m3ulcb-kf/README_machine_m3ulcb-kf.md9
-rw-r--r--templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc1
-rw-r--r--templates/machine/m3ulcb-nogfx/50_local.conf.inc3
-rw-r--r--templates/machine/m3ulcb-nogfx/README_machine_m3ulcb-nogfx.md3
-rw-r--r--templates/machine/m3ulcb/50_bblayers.conf.inc1
-rw-r--r--templates/machine/m3ulcb/50_local.conf.inc3
-rw-r--r--templates/machine/m3ulcb/README_machine_m3ulcb.md2
10 files changed, 31 insertions, 11 deletions
diff --git a/templates/machine/m3ulcb-kf/50_bblayers.conf.inc b/templates/machine/m3ulcb-kf/50_bblayers.conf.inc
new file mode 100644
index 000000000..61d472ab1
--- /dev/null
+++ b/templates/machine/m3ulcb-kf/50_bblayers.conf.inc
@@ -0,0 +1,4 @@
+BBLAYERS =+ "\
+ ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
+ ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \
+ "
diff --git a/templates/machine/m3ulcb-kf/50_local.conf.inc b/templates/machine/m3ulcb-kf/50_local.conf.inc
new file mode 100644
index 000000000..e2fe41a8a
--- /dev/null
+++ b/templates/machine/m3ulcb-kf/50_local.conf.inc
@@ -0,0 +1,6 @@
+MACHINE = "m3ulcb"
+#see meta-agl/meta-agl-bsp/conf/include/agl_m3ulcb.inc
+require conf/include/agl_m3ulcb.inc
+
+#see meta-agl/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc
+require conf/include/rcar-gen3-adas.inc
diff --git a/templates/machine/m3ulcb-kf/50_setup.sh b/templates/machine/m3ulcb-kf/50_setup.sh
new file mode 100644
index 000000000..abd2a33af
--- /dev/null
+++ b/templates/machine/m3ulcb-kf/50_setup.sh
@@ -0,0 +1,10 @@
+# setup proprietary gfx drivers and multimedia packages
+pushd $METADIR 2>/dev/null
+
+SETUP_MM_SCRIPT=$METADIR/meta-agl/meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh
+if [ -f $SETUP_MM_SCRIPT ]; then
+ . $SETUP_MM_SCRIPT
+ copy_mm_packages
+fi
+
+popd 2>/dev/null
diff --git a/templates/machine/m3ulcb-kf/README_machine_m3ulcb-kf.md b/templates/machine/m3ulcb-kf/README_machine_m3ulcb-kf.md
new file mode 100644
index 000000000..89a1f2fc5
--- /dev/null
+++ b/templates/machine/m3ulcb-kf/README_machine_m3ulcb-kf.md
@@ -0,0 +1,9 @@
+---
+description: Machine m3ulcb
+authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Ronan Le Martret <ronan.lemartret@iot.bzh>, Yannick Gicquel <yannick.gicquel@iot.bzh>
+---
+
+### Machine m3ulcb
+
+M3ULCB with Kingfisher baseboard
+
diff --git a/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc b/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc
index 61d472ab1..16397c2eb 100644
--- a/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc
+++ b/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc
@@ -1,4 +1,3 @@
BBLAYERS =+ "\
${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
- ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \
"
diff --git a/templates/machine/m3ulcb-nogfx/50_local.conf.inc b/templates/machine/m3ulcb-nogfx/50_local.conf.inc
index 3fd5d6eec..521dedb46 100644
--- a/templates/machine/m3ulcb-nogfx/50_local.conf.inc
+++ b/templates/machine/m3ulcb-nogfx/50_local.conf.inc
@@ -1,6 +1,3 @@
MACHINE = "m3ulcb"
#see meta-agl/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc
require conf/include/agl_m3ulcb-nogfx.inc
-
-#see meta-agl/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc
-require conf/include/rcar-gen3-adas.inc
diff --git a/templates/machine/m3ulcb-nogfx/README_machine_m3ulcb-nogfx.md b/templates/machine/m3ulcb-nogfx/README_machine_m3ulcb-nogfx.md
index 1e5140c23..20c97be22 100644
--- a/templates/machine/m3ulcb-nogfx/README_machine_m3ulcb-nogfx.md
+++ b/templates/machine/m3ulcb-nogfx/README_machine_m3ulcb-nogfx.md
@@ -5,5 +5,4 @@ authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Kevin Hilman <khilma
### Machine m3ulcb-nogfx
-*Description is missing - please complete file meta-agl/templates/machine/m3ulcb-nogfx/README_machine_m3ulcb-nogfx.md*
-
+Renesas RCar Gen3 m3ulcb w/o graphic driver blobs
diff --git a/templates/machine/m3ulcb/50_bblayers.conf.inc b/templates/machine/m3ulcb/50_bblayers.conf.inc
index 61d472ab1..16397c2eb 100644
--- a/templates/machine/m3ulcb/50_bblayers.conf.inc
+++ b/templates/machine/m3ulcb/50_bblayers.conf.inc
@@ -1,4 +1,3 @@
BBLAYERS =+ "\
${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
- ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \
"
diff --git a/templates/machine/m3ulcb/50_local.conf.inc b/templates/machine/m3ulcb/50_local.conf.inc
index e2fe41a8a..c75bc5311 100644
--- a/templates/machine/m3ulcb/50_local.conf.inc
+++ b/templates/machine/m3ulcb/50_local.conf.inc
@@ -1,6 +1,3 @@
MACHINE = "m3ulcb"
#see meta-agl/meta-agl-bsp/conf/include/agl_m3ulcb.inc
require conf/include/agl_m3ulcb.inc
-
-#see meta-agl/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc
-require conf/include/rcar-gen3-adas.inc
diff --git a/templates/machine/m3ulcb/README_machine_m3ulcb.md b/templates/machine/m3ulcb/README_machine_m3ulcb.md
index 3b5e0f451..bacb5dcbf 100644
--- a/templates/machine/m3ulcb/README_machine_m3ulcb.md
+++ b/templates/machine/m3ulcb/README_machine_m3ulcb.md
@@ -5,5 +5,5 @@ authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Ronan Le Martret <ro
### Machine m3ulcb
-*Description is missing - please complete file meta-agl/templates/machine/m3ulcb/README_machine_m3ulcb.md*
+Renesas RCar Gen3 m3ulcb