Refactor the h3ulcb machine templates

This splits the machine templates for the h3 into three:
- h3ulcb = plain h3ulcb with graphics driver package
- h3ulcb-nogfx = plain h3ulcb without graphics driver package
- h3ulcb-kf = h3ulcb with kingfisher baseboard and graphics driver package

This improves maintainability of the h3ulcb machine targets.

Bug-AGL: SPEC-3443

Change-Id: Ibca5e7615ca5bc467ec46d4564f42363a2a5466c
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/24912
Reviewed-by: Stéphane Desneux <stephane.desneux@iot.bzh>

9 files changed, 31 insertions, 10 deletions

diff --git a/templates/machine/h3ulcb-kf/50_bblayers.conf.inc b/templates/machine/h3ulcb-kf/50_bblayers.conf.inc
new file mode 100644
index 000000000..61d472ab1
--- /dev/null
+++ b/templates/machine/h3ulcb-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/h3ulcb-kf/50_local.conf.inc b/templates/machine/h3ulcb-kf/50_local.conf.inc
new file mode 100644
index 000000000..43e117372
--- /dev/null
+++ b/templates/machine/h3ulcb-kf/50_local.conf.inc
@@ -0,0 +1,7 @@
+MACHINE = "h3ulcb"
+#see meta-agl/meta-agl-bsp/conf/include/agl_h3ulcb.inc
+require conf/include/agl_h3ulcb.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/h3ulcb-kf/50_setup.sh b/templates/machine/h3ulcb-kf/50_setup.sh
new file mode 100644
index 000000000..abd2a33af
--- /dev/null
+++ b/templates/machine/h3ulcb-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/h3ulcb-kf/README_machine_h3ulcb-kf.md b/templates/machine/h3ulcb-kf/README_machine_h3ulcb-kf.md
new file mode 100644
index 000000000..663951e28
--- /dev/null
+++ b/templates/machine/h3ulcb-kf/README_machine_h3ulcb-kf.md
@@ -0,0 +1,9 @@
+---
+description: Machine h3ulcb-kf
+authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Ronan Le Martret <ronan.lemartret@iot.bzh>
+---
+	
+### Machine h3ulcb-kf
+	 
+Renesas RCar Gen3 H3ULCB board with Kingfisher baseboard
+
diff --git a/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc b/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc
index 61d472ab1..16397c2eb 100644
--- a/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc
+++ b/templates/machine/h3ulcb-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/h3ulcb-nogfx/50_local.conf.inc b/templates/machine/h3ulcb-nogfx/50_local.conf.inc
index 4403e6ea9..2f7cd6b35 100644
--- a/templates/machine/h3ulcb-nogfx/50_local.conf.inc
+++ b/templates/machine/h3ulcb-nogfx/50_local.conf.inc
@@ -1,7 +1,3 @@
 MACHINE = "h3ulcb"
 #see meta-agl/meta-agl-bsp/conf/include/agl_h3ulcb-nogfx.inc
 require conf/include/agl_h3ulcb-nogfx.inc
-
-# custom inclusion of cogent layer
-#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/h3ulcb/50_bblayers.conf.inc b/templates/machine/h3ulcb/50_bblayers.conf.inc
index 61d472ab1..16397c2eb 100644
--- a/templates/machine/h3ulcb/50_bblayers.conf.inc
+++ b/templates/machine/h3ulcb/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/h3ulcb/50_local.conf.inc b/templates/machine/h3ulcb/50_local.conf.inc
index 43e117372..4bb2a8219 100644
--- a/templates/machine/h3ulcb/50_local.conf.inc
+++ b/templates/machine/h3ulcb/50_local.conf.inc
@@ -2,6 +2,3 @@ MACHINE = "h3ulcb"
 #see meta-agl/meta-agl-bsp/conf/include/agl_h3ulcb.inc
 require conf/include/agl_h3ulcb.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/h3ulcb/README_machine_h3ulcb.md b/templates/machine/h3ulcb/README_machine_h3ulcb.md
index be3aa0f69..4abefdc06 100644
--- a/templates/machine/h3ulcb/README_machine_h3ulcb.md
+++ b/templates/machine/h3ulcb/README_machine_h3ulcb.md
@@ -5,5 +5,5 @@ authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Ronan Le Martret <ro
 	
 ### Machine h3ulcb
 	 
-*Description is missing - please complete file meta-agl/templates/machine/h3ulcb/README_machine_h3ulcb.md*
+This is the Renesas RCar Gen3 h3ulcb board.