summaryrefslogtreecommitdiffstats
path: root/meta-agl/templates/machine
diff options
context:
space:
mode:
Diffstat (limited to 'meta-agl/templates/machine')
-rw-r--r--meta-agl/templates/machine/bbe/50_bblayers.conf.inc1
-rw-r--r--meta-agl/templates/machine/bbe/README_machine_bbe.md13
-rw-r--r--meta-agl/templates/machine/beaglebone/50_bblayers.conf.inc5
-rw-r--r--meta-agl/templates/machine/dra7xx-evm/50_bblayers.conf.inc5
-rw-r--r--meta-agl/templates/machine/dragonboard-410c/50_bblayers.conf.inc2
-rw-r--r--meta-agl/templates/machine/ebisu/50_bblayers.conf.inc2
-rw-r--r--meta-agl/templates/machine/ebisu/50_local.conf.inc3
-rw-r--r--meta-agl/templates/machine/ebisu/50_setup.sh4
-rw-r--r--meta-agl/templates/machine/h3-salvator-x/50_bblayers.conf.inc2
-rw-r--r--meta-agl/templates/machine/h3-salvator-x/README_machine_h3-salvator-x.md10
-rw-r--r--meta-agl/templates/machine/h3ulcb-kf/50_bblayers.conf.inc4
-rw-r--r--meta-agl/templates/machine/h3ulcb-kf/50_local.conf.inc7
-rw-r--r--meta-agl/templates/machine/h3ulcb-kf/50_setup.sh10
-rw-r--r--meta-agl/templates/machine/h3ulcb-kf/README_machine_h3ulcb-kf.md12
-rw-r--r--meta-agl/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc3
-rw-r--r--meta-agl/templates/machine/h3ulcb-nogfx/50_local.conf.inc4
-rw-r--r--meta-agl/templates/machine/h3ulcb-nogfx/README_machine_h3ulcb-nogfx.md8
-rw-r--r--meta-agl/templates/machine/h3ulcb/50_bblayers.conf.inc3
-rw-r--r--meta-agl/templates/machine/h3ulcb/50_local.conf.inc3
-rw-r--r--meta-agl/templates/machine/h3ulcb/README_machine_h3ulcb.md8
-rw-r--r--meta-agl/templates/machine/imx8mqevk-viv/40_bblayers.conf.inc5
-rw-r--r--meta-agl/templates/machine/imx8mqevk-viv/50_local.conf.inc3
-rw-r--r--meta-agl/templates/machine/imx8mqevk-viv/50_setup.sh2
-rw-r--r--meta-agl/templates/machine/imx8mqevk-viv/README_machine_imx8mqevk-viv.md9
-rw-r--r--meta-agl/templates/machine/imx8mqevk/40_bblayers.conf.inc5
-rw-r--r--meta-agl/templates/machine/imx8mqevk/50_local.conf.inc3
-rw-r--r--meta-agl/templates/machine/imx8mqevk/50_setup.sh2
-rw-r--r--meta-agl/templates/machine/imx8mqevk/README_machine_imx8mqevk.md13
l---------meta-agl/templates/machine/intel-corei7-641
-rw-r--r--meta-agl/templates/machine/intel-corei7-64/50_bblayers.conf.inc1
-rw-r--r--meta-agl/templates/machine/intel-corei7-64/50_local.conf.inc3
-rw-r--r--meta-agl/templates/machine/intel-corei7-64/README_machine_intel-corei7-64.md9
-rw-r--r--meta-agl/templates/machine/m3-salvator-x/50_bblayers.conf.inc3
-rw-r--r--meta-agl/templates/machine/m3-salvator-x/50_local.conf.inc4
-rw-r--r--meta-agl/templates/machine/m3-salvator-x/50_setup.sh10
-rw-r--r--meta-agl/templates/machine/m3-salvator-x/README_machine_m3-salvator-x.md11
-rw-r--r--meta-agl/templates/machine/m3ulcb-kf/50_bblayers.conf.inc4
-rw-r--r--meta-agl/templates/machine/m3ulcb-kf/50_local.conf.inc6
-rw-r--r--meta-agl/templates/machine/m3ulcb-kf/50_setup.sh10
-rw-r--r--meta-agl/templates/machine/m3ulcb-kf/README_machine_m3ulcb-kf.md12
-rw-r--r--meta-agl/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc3
-rw-r--r--meta-agl/templates/machine/m3ulcb-nogfx/50_local.conf.inc3
-rw-r--r--meta-agl/templates/machine/m3ulcb-nogfx/README_machine_m3ulcb-nogfx.md8
-rw-r--r--meta-agl/templates/machine/m3ulcb/50_bblayers.conf.inc3
-rw-r--r--meta-agl/templates/machine/m3ulcb/50_local.conf.inc3
-rw-r--r--meta-agl/templates/machine/m3ulcb/README_machine_m3ulcb.md8
-rw-r--r--meta-agl/templates/machine/raspberrypi4/50_local.conf.inc10
47 files changed, 191 insertions, 72 deletions
diff --git a/meta-agl/templates/machine/bbe/50_bblayers.conf.inc b/meta-agl/templates/machine/bbe/50_bblayers.conf.inc
index 0b42c9bf..b2fffb9d 100644
--- a/meta-agl/templates/machine/bbe/50_bblayers.conf.inc
+++ b/meta-agl/templates/machine/bbe/50_bblayers.conf.inc
@@ -1,4 +1,5 @@
BBLAYERS =+ " \
+ ${METADIR}/bsp/meta-arm/meta-arm \
${METADIR}/bsp/meta-ti \
${METADIR}/bsp/meta-sancloud \
${METADIR}/bsp/meta-rtlwifi \
diff --git a/meta-agl/templates/machine/bbe/README_machine_bbe.md b/meta-agl/templates/machine/bbe/README_machine_bbe.md
index c32f23d4..3161a019 100644
--- a/meta-agl/templates/machine/bbe/README_machine_bbe.md
+++ b/meta-agl/templates/machine/bbe/README_machine_bbe.md
@@ -1,9 +1,12 @@
---
-description: Machine bbe
-authors: Paul Barker <paul.barker@sancloud.co.uk>
+description: SanCloud BeagleBone Enhanced (BBE)
+authors: SanCloud Ltd <yocto@sancloud.co.uk>
---
-### Machine bbe
-
-*Description is missing - please complete file meta-agl/templates/machine/bbe/README_machine_bbe.md*
+### SanCloud BeagleBone Enhanced (BBE)
+* [SanCloud website](https://www.sancloud.co.uk/)
+
+* [BeagleBone Enhanced Description](https://www.sancloud.co.uk/beaglebone-enhanced-bbe)
+
+* [Sancloud repositories on GitHub](https://github.com/SanCloudLtd)
diff --git a/meta-agl/templates/machine/beaglebone/50_bblayers.conf.inc b/meta-agl/templates/machine/beaglebone/50_bblayers.conf.inc
index f116ca28..6b932326 100644
--- a/meta-agl/templates/machine/beaglebone/50_bblayers.conf.inc
+++ b/meta-agl/templates/machine/beaglebone/50_bblayers.conf.inc
@@ -1 +1,4 @@
-BBLAYERS =+ "${METADIR}/bsp/meta-ti"
+BBLAYERS =+ "\
+ ${METADIR}/bsp/meta-arm/meta-arm \
+ ${METADIR}/bsp/meta-ti \
+ "
diff --git a/meta-agl/templates/machine/dra7xx-evm/50_bblayers.conf.inc b/meta-agl/templates/machine/dra7xx-evm/50_bblayers.conf.inc
index f116ca28..6b932326 100644
--- a/meta-agl/templates/machine/dra7xx-evm/50_bblayers.conf.inc
+++ b/meta-agl/templates/machine/dra7xx-evm/50_bblayers.conf.inc
@@ -1 +1,4 @@
-BBLAYERS =+ "${METADIR}/bsp/meta-ti"
+BBLAYERS =+ "\
+ ${METADIR}/bsp/meta-arm/meta-arm \
+ ${METADIR}/bsp/meta-ti \
+ "
diff --git a/meta-agl/templates/machine/dragonboard-410c/50_bblayers.conf.inc b/meta-agl/templates/machine/dragonboard-410c/50_bblayers.conf.inc
index 4a3cae0f..41fe3671 100644
--- a/meta-agl/templates/machine/dragonboard-410c/50_bblayers.conf.inc
+++ b/meta-agl/templates/machine/dragonboard-410c/50_bblayers.conf.inc
@@ -1,2 +1,2 @@
BBLAYERS =+ "${METADIR}/bsp/meta-qcom"
-BBMASK .= "|bsp/meta-qcom/openembedded-layer/recipes-navigation/gpsd"
+BBMASK += "bsp/meta-qcom/openembedded-layer/recipes-navigation/gpsd"
diff --git a/meta-agl/templates/machine/ebisu/50_bblayers.conf.inc b/meta-agl/templates/machine/ebisu/50_bblayers.conf.inc
index 7b0db440..16397c2e 100644
--- a/meta-agl/templates/machine/ebisu/50_bblayers.conf.inc
+++ b/meta-agl/templates/machine/ebisu/50_bblayers.conf.inc
@@ -1,3 +1,3 @@
BBLAYERS =+ "\
- ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \
+ ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
"
diff --git a/meta-agl/templates/machine/ebisu/50_local.conf.inc b/meta-agl/templates/machine/ebisu/50_local.conf.inc
index e780501a..c62dec4a 100644
--- a/meta-agl/templates/machine/ebisu/50_local.conf.inc
+++ b/meta-agl/templates/machine/ebisu/50_local.conf.inc
@@ -1,6 +1,3 @@
MACHINE = "ebisu"
#see meta-agl/meta-agl-bsp/conf/include/agl_ebisu.inc
require conf/include/agl_ebisu.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/meta-agl/templates/machine/ebisu/50_setup.sh b/meta-agl/templates/machine/ebisu/50_setup.sh
index 502c2275..188da6e5 100644
--- a/meta-agl/templates/machine/ebisu/50_setup.sh
+++ b/meta-agl/templates/machine/ebisu/50_setup.sh
@@ -1,7 +1,7 @@
# setup proprietary gfx drivers and multimedia packages
pushd $METADIR 2>/dev/null
-COPY_SCRIPT="$METADIR/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/docs/sample/copyscript/copy_proprietary_softwares.sh"
+COPY_SCRIPT="$METADIR/bsp/meta-renesas/meta-rcar-gen3/docs/sample/copyscript/copy_proprietary_softwares.sh"
EXTRACT_DIR=$METADIR/binary-tmp
#EBISU_BIN_PATH should contain the path where the .zip archive of E3 binaries is.
#CUSTOM_RENESAS_CONFIG_SCRIPT should contain the custom script needed for setup. If not filled, do not failed, just warn.
@@ -24,7 +24,7 @@ if [ -f $COPY_SCRIPT ]; then
unzip -q -o $PROPRIETARY_BIN -d $EXTRACT_DIR
done
- cd $METADIR/bsp/meta-renesas-rcar-gen3/
+ cd $METADIR/bsp/meta-renesas/
$COPY_SCRIPT $EXTRACT_DIR
cd ..
diff --git a/meta-agl/templates/machine/h3-salvator-x/50_bblayers.conf.inc b/meta-agl/templates/machine/h3-salvator-x/50_bblayers.conf.inc
index 7b0db440..16397c2e 100644
--- a/meta-agl/templates/machine/h3-salvator-x/50_bblayers.conf.inc
+++ b/meta-agl/templates/machine/h3-salvator-x/50_bblayers.conf.inc
@@ -1,3 +1,3 @@
BBLAYERS =+ "\
- ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \
+ ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
"
diff --git a/meta-agl/templates/machine/h3-salvator-x/README_machine_h3-salvator-x.md b/meta-agl/templates/machine/h3-salvator-x/README_machine_h3-salvator-x.md
index 2dcdcd42..9cd793f7 100644
--- a/meta-agl/templates/machine/h3-salvator-x/README_machine_h3-salvator-x.md
+++ b/meta-agl/templates/machine/h3-salvator-x/README_machine_h3-salvator-x.md
@@ -1,9 +1,11 @@
---
description: Machine h3-salvator-x
-authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Martin Kelly <mkelly@xevo.com>
+authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Martin Kelly <mkelly@xevo.com>, Ronan Le Martret <ronan.lemartret@iot.bzh> Duy Dang <duy.dang.yw@renesas.com>
---
-
+
### Machine h3-salvator-x
-
-*Description is missing - please complete file meta-agl/templates/machine/h3-salvator-x/README_machine_h3-salvator-x.md*
+salvator-x board with an h3 SoC.
+
+* [R-Car H3 and M3 Starter Kit website](https://www.renesas.com/br/en/solutions/automotive/adas/solution-kits/r-car-starter-kit.html)
+* [elinux H3 Salvator-X](https://elinux.org/R-Car/Boards/Salvator-X)
diff --git a/meta-agl/templates/machine/h3ulcb-kf/50_bblayers.conf.inc b/meta-agl/templates/machine/h3ulcb-kf/50_bblayers.conf.inc
new file mode 100644
index 00000000..61d472ab
--- /dev/null
+++ b/meta-agl/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/meta-agl/templates/machine/h3ulcb-kf/50_local.conf.inc b/meta-agl/templates/machine/h3ulcb-kf/50_local.conf.inc
new file mode 100644
index 00000000..43e11737
--- /dev/null
+++ b/meta-agl/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/meta-agl/templates/machine/h3ulcb-kf/50_setup.sh b/meta-agl/templates/machine/h3ulcb-kf/50_setup.sh
new file mode 100644
index 00000000..abd2a33a
--- /dev/null
+++ b/meta-agl/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/meta-agl/templates/machine/h3ulcb-kf/README_machine_h3ulcb-kf.md b/meta-agl/templates/machine/h3ulcb-kf/README_machine_h3ulcb-kf.md
new file mode 100644
index 00000000..cdef9afa
--- /dev/null
+++ b/meta-agl/templates/machine/h3ulcb-kf/README_machine_h3ulcb-kf.md
@@ -0,0 +1,12 @@
+---
+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.
+
+* [R-Car H3 and M3 Starter Kit website](https://www.renesas.com/br/en/solutions/automotive/adas/solution-kits/r-car-starter-kit.html)
+* [elinux H3 Starter Kit](https://elinux.org/R-Car/Boards/H3SK)
+* [R-Car/Boards/Kingfisher](https://elinux.org/R-Car/Boards/Kingfisher)
diff --git a/meta-agl/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc b/meta-agl/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc
index 5f410f0f..16397c2e 100644
--- a/meta-agl/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc
+++ b/meta-agl/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc
@@ -1,4 +1,3 @@
BBLAYERS =+ "\
- ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \
- ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \
+ ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
"
diff --git a/meta-agl/templates/machine/h3ulcb-nogfx/50_local.conf.inc b/meta-agl/templates/machine/h3ulcb-nogfx/50_local.conf.inc
index 4403e6ea..2f7cd6b3 100644
--- a/meta-agl/templates/machine/h3ulcb-nogfx/50_local.conf.inc
+++ b/meta-agl/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/meta-agl/templates/machine/h3ulcb-nogfx/README_machine_h3ulcb-nogfx.md b/meta-agl/templates/machine/h3ulcb-nogfx/README_machine_h3ulcb-nogfx.md
index da5d9b73..a1f3b9f6 100644
--- a/meta-agl/templates/machine/h3ulcb-nogfx/README_machine_h3ulcb-nogfx.md
+++ b/meta-agl/templates/machine/h3ulcb-nogfx/README_machine_h3ulcb-nogfx.md
@@ -2,8 +2,10 @@
description: Machine h3ulcb-nogfx
authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Kevin Hilman <khilman@baylibre.com>, Ronan Le Martret <ronan.lemartret@iot.bzh>, Yannick Gicquel <yannick.gicquel@iot.bzh>
---
-
+
### Machine h3ulcb-nogfx
-
-*Description is missing - please complete file meta-agl/templates/machine/m3ulcb-nogfx/README_machine_h3ulcb-nogfx.md*
+This is a "h3ulcb" machine without proprietary graphics driver support.
+
+* [R-Car H3 and M3 Starter Kit website](https://www.renesas.com/br/en/solutions/automotive/adas/solution-kits/r-car-starter-kit.html)
+* [elinux H3 Starter Kit](https://elinux.org/R-Car/Boards/H3SK)
diff --git a/meta-agl/templates/machine/h3ulcb/50_bblayers.conf.inc b/meta-agl/templates/machine/h3ulcb/50_bblayers.conf.inc
index 5f410f0f..16397c2e 100644
--- a/meta-agl/templates/machine/h3ulcb/50_bblayers.conf.inc
+++ b/meta-agl/templates/machine/h3ulcb/50_bblayers.conf.inc
@@ -1,4 +1,3 @@
BBLAYERS =+ "\
- ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \
- ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \
+ ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
"
diff --git a/meta-agl/templates/machine/h3ulcb/50_local.conf.inc b/meta-agl/templates/machine/h3ulcb/50_local.conf.inc
index 43e11737..4bb2a821 100644
--- a/meta-agl/templates/machine/h3ulcb/50_local.conf.inc
+++ b/meta-agl/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/meta-agl/templates/machine/h3ulcb/README_machine_h3ulcb.md b/meta-agl/templates/machine/h3ulcb/README_machine_h3ulcb.md
index be3aa0f6..fffad09b 100644
--- a/meta-agl/templates/machine/h3ulcb/README_machine_h3ulcb.md
+++ b/meta-agl/templates/machine/h3ulcb/README_machine_h3ulcb.md
@@ -2,8 +2,10 @@
description: Machine h3ulcb
authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Ronan Le Martret <ronan.lemartret@iot.bzh>
---
-
+
### Machine h3ulcb
-
-*Description is missing - please complete file meta-agl/templates/machine/h3ulcb/README_machine_h3ulcb.md*
+Renesas RCar Gen3 "h3ulcb" board.
+
+* [R-Car H3 and M3 Starter Kit website](https://www.renesas.com/br/en/solutions/automotive/adas/solution-kits/r-car-starter-kit.html)
+* [elinux H3 Starter Kit](https://elinux.org/R-Car/Boards/H3SK)
diff --git a/meta-agl/templates/machine/imx8mqevk-viv/40_bblayers.conf.inc b/meta-agl/templates/machine/imx8mqevk-viv/40_bblayers.conf.inc
new file mode 100644
index 00000000..edcb6a3a
--- /dev/null
+++ b/meta-agl/templates/machine/imx8mqevk-viv/40_bblayers.conf.inc
@@ -0,0 +1,5 @@
+# This must be parsed after qt5, etc. layers so that they are correctly
+# recognized by meta-freescale/dynamic-layers
+BBLAYERS =+ "\
+ ${METADIR}/bsp/meta-freescale \
+ "
diff --git a/meta-agl/templates/machine/imx8mqevk-viv/50_local.conf.inc b/meta-agl/templates/machine/imx8mqevk-viv/50_local.conf.inc
new file mode 100644
index 00000000..e9668c30
--- /dev/null
+++ b/meta-agl/templates/machine/imx8mqevk-viv/50_local.conf.inc
@@ -0,0 +1,3 @@
+MACHINE = "imx8mqevk"
+#see meta-agl/meta-agl-bsp/conf/include/agl_imx8mqevk-viv.inc
+require conf/include/agl_imx8mqevk-viv.inc
diff --git a/meta-agl/templates/machine/imx8mqevk-viv/50_setup.sh b/meta-agl/templates/machine/imx8mqevk-viv/50_setup.sh
new file mode 100644
index 00000000..eefd1eb7
--- /dev/null
+++ b/meta-agl/templates/machine/imx8mqevk-viv/50_setup.sh
@@ -0,0 +1,2 @@
+find_and_ack_eula $METADIR/bsp/meta-freescale EULA
+export EULA_FLAG_NAME="ACCEPT_FSL_EULA"
diff --git a/meta-agl/templates/machine/imx8mqevk-viv/README_machine_imx8mqevk-viv.md b/meta-agl/templates/machine/imx8mqevk-viv/README_machine_imx8mqevk-viv.md
new file mode 100644
index 00000000..be30e00f
--- /dev/null
+++ b/meta-agl/templates/machine/imx8mqevk-viv/README_machine_imx8mqevk-viv.md
@@ -0,0 +1,9 @@
+---
+description: i.MX8MQ EVK with Vivante GPU driver
+authors: Scott Murray <scott.murray@konsulko.com>
+---
+
+### Machine imx8mqevk-viv
+
+i.MX8MQ EVK and EVKB boards with Vivante GPU driver support.
+
diff --git a/meta-agl/templates/machine/imx8mqevk/40_bblayers.conf.inc b/meta-agl/templates/machine/imx8mqevk/40_bblayers.conf.inc
new file mode 100644
index 00000000..edcb6a3a
--- /dev/null
+++ b/meta-agl/templates/machine/imx8mqevk/40_bblayers.conf.inc
@@ -0,0 +1,5 @@
+# This must be parsed after qt5, etc. layers so that they are correctly
+# recognized by meta-freescale/dynamic-layers
+BBLAYERS =+ "\
+ ${METADIR}/bsp/meta-freescale \
+ "
diff --git a/meta-agl/templates/machine/imx8mqevk/50_local.conf.inc b/meta-agl/templates/machine/imx8mqevk/50_local.conf.inc
new file mode 100644
index 00000000..5f9b9594
--- /dev/null
+++ b/meta-agl/templates/machine/imx8mqevk/50_local.conf.inc
@@ -0,0 +1,3 @@
+MACHINE = "imx8mqevk"
+#see meta-agl/meta-agl-bsp/conf/include/agl_imx8mqevk.inc
+require conf/include/agl_imx8mqevk.inc
diff --git a/meta-agl/templates/machine/imx8mqevk/50_setup.sh b/meta-agl/templates/machine/imx8mqevk/50_setup.sh
new file mode 100644
index 00000000..eefd1eb7
--- /dev/null
+++ b/meta-agl/templates/machine/imx8mqevk/50_setup.sh
@@ -0,0 +1,2 @@
+find_and_ack_eula $METADIR/bsp/meta-freescale EULA
+export EULA_FLAG_NAME="ACCEPT_FSL_EULA"
diff --git a/meta-agl/templates/machine/imx8mqevk/README_machine_imx8mqevk.md b/meta-agl/templates/machine/imx8mqevk/README_machine_imx8mqevk.md
new file mode 100644
index 00000000..5d2bcbd3
--- /dev/null
+++ b/meta-agl/templates/machine/imx8mqevk/README_machine_imx8mqevk.md
@@ -0,0 +1,13 @@
+---
+description: i.MX8MQ EVK with etnaviv GPU driver
+authors: Scott Murray <scott.murray@konsulko.com>
+---
+
+### Machine imx8mqevk
+
+i.MX8MQ EVK and EVKB boards with etnaviv GPU driver support.
+Note that etnaviv on the GC7000L GPU in the i.MX8MQ is currently still
+a work in progress, the imx8mqevk-viv template using the NXP Vivante
+driver may be a better choice for those not interested in etnaviv
+debugging and development.
+
diff --git a/meta-agl/templates/machine/intel-corei7-64 b/meta-agl/templates/machine/intel-corei7-64
new file mode 120000
index 00000000..9d468439
--- /dev/null
+++ b/meta-agl/templates/machine/intel-corei7-64
@@ -0,0 +1 @@
+qemux86-64 \ No newline at end of file
diff --git a/meta-agl/templates/machine/intel-corei7-64/50_bblayers.conf.inc b/meta-agl/templates/machine/intel-corei7-64/50_bblayers.conf.inc
deleted file mode 100644
index 8fd7af53..00000000
--- a/meta-agl/templates/machine/intel-corei7-64/50_bblayers.conf.inc
+++ /dev/null
@@ -1 +0,0 @@
-BBLAYERS =+ "${METADIR}/bsp/meta-intel"
diff --git a/meta-agl/templates/machine/intel-corei7-64/50_local.conf.inc b/meta-agl/templates/machine/intel-corei7-64/50_local.conf.inc
deleted file mode 100644
index 48d26c56..00000000
--- a/meta-agl/templates/machine/intel-corei7-64/50_local.conf.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-MACHINE = "intel-corei7-64"
-#see meta-agl/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc
-require conf/include/agl_intel-corei7-64.inc
diff --git a/meta-agl/templates/machine/intel-corei7-64/README_machine_intel-corei7-64.md b/meta-agl/templates/machine/intel-corei7-64/README_machine_intel-corei7-64.md
deleted file mode 100644
index 5cab9e8f..00000000
--- a/meta-agl/templates/machine/intel-corei7-64/README_machine_intel-corei7-64.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-description: Machine intel-corei7-64
-authors: Dominig ar Foll (Intel Open Source) <dominig.arfoll@fridu.net>, Jan-Simon Moeller <jsmoeller@linuxfoundation.org>, Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Ronan Le Martret <ronan.lemartret@iot.bzh>, Stephane Desneux <stephane.desneux@iot.bzh>
----
-
-### Machine intel-corei7-64
-
-*Description is missing - please complete file meta-agl/templates/machine/intel-corei7-64/README_machine_intel-corei7-64.md*
-
diff --git a/meta-agl/templates/machine/m3-salvator-x/50_bblayers.conf.inc b/meta-agl/templates/machine/m3-salvator-x/50_bblayers.conf.inc
new file mode 100644
index 00000000..16397c2e
--- /dev/null
+++ b/meta-agl/templates/machine/m3-salvator-x/50_bblayers.conf.inc
@@ -0,0 +1,3 @@
+BBLAYERS =+ "\
+ ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
+ "
diff --git a/meta-agl/templates/machine/m3-salvator-x/50_local.conf.inc b/meta-agl/templates/machine/m3-salvator-x/50_local.conf.inc
new file mode 100644
index 00000000..82766fd5
--- /dev/null
+++ b/meta-agl/templates/machine/m3-salvator-x/50_local.conf.inc
@@ -0,0 +1,4 @@
+MACHINE = "salvator-x"
+#see meta-agl/meta-agl-bsp/conf/include/agl_m3-salvator-x.inc
+require conf/include/agl_m3-salvator-x.inc
+
diff --git a/meta-agl/templates/machine/m3-salvator-x/50_setup.sh b/meta-agl/templates/machine/m3-salvator-x/50_setup.sh
new file mode 100644
index 00000000..abd2a33a
--- /dev/null
+++ b/meta-agl/templates/machine/m3-salvator-x/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/meta-agl/templates/machine/m3-salvator-x/README_machine_m3-salvator-x.md b/meta-agl/templates/machine/m3-salvator-x/README_machine_m3-salvator-x.md
new file mode 100644
index 00000000..99c9dffb
--- /dev/null
+++ b/meta-agl/templates/machine/m3-salvator-x/README_machine_m3-salvator-x.md
@@ -0,0 +1,11 @@
+---
+description: Machine m3-salvator-x
+authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Ronan Le Martret <ronan.lemartret@iot.bzh> Duy Dang <duy.dang.yw@renesas.com>
+---
+
+### Machine m3-salvator-x
+
+salvator-x board with an m3 SoC.
+
+* [R-Car H3 and M3 Starter Kit website](https://www.renesas.com/br/en/solutions/automotive/adas/solution-kits/r-car-starter-kit.html)
+* [elinux H3 Salvator-X](https://elinux.org/R-Car/Boards/Salvator-X)
diff --git a/meta-agl/templates/machine/m3ulcb-kf/50_bblayers.conf.inc b/meta-agl/templates/machine/m3ulcb-kf/50_bblayers.conf.inc
new file mode 100644
index 00000000..61d472ab
--- /dev/null
+++ b/meta-agl/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/meta-agl/templates/machine/m3ulcb-kf/50_local.conf.inc b/meta-agl/templates/machine/m3ulcb-kf/50_local.conf.inc
new file mode 100644
index 00000000..e2fe41a8
--- /dev/null
+++ b/meta-agl/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/meta-agl/templates/machine/m3ulcb-kf/50_setup.sh b/meta-agl/templates/machine/m3ulcb-kf/50_setup.sh
new file mode 100644
index 00000000..abd2a33a
--- /dev/null
+++ b/meta-agl/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/meta-agl/templates/machine/m3ulcb-kf/README_machine_m3ulcb-kf.md b/meta-agl/templates/machine/m3ulcb-kf/README_machine_m3ulcb-kf.md
new file mode 100644
index 00000000..075c203f
--- /dev/null
+++ b/meta-agl/templates/machine/m3ulcb-kf/README_machine_m3ulcb-kf.md
@@ -0,0 +1,12 @@
+---
+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
+
+Renesas RCar Gen3 "m3ulcb" board with Kingfisher baseboard.
+
+* [R-Car H3 and M3 Starter Kit website](https://www.renesas.com/br/en/solutions/automotive/adas/solution-kits/r-car-starter-kit.html)
+* [elinux H3 Starter Kit](https://elinux.org/R-Car/Boards/H3SK)
+* [R-Car/Boards/Kingfisher](https://elinux.org/R-Car/Boards/Kingfisher)
diff --git a/meta-agl/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc b/meta-agl/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc
index 5f410f0f..16397c2e 100644
--- a/meta-agl/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc
+++ b/meta-agl/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc
@@ -1,4 +1,3 @@
BBLAYERS =+ "\
- ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \
- ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \
+ ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
"
diff --git a/meta-agl/templates/machine/m3ulcb-nogfx/50_local.conf.inc b/meta-agl/templates/machine/m3ulcb-nogfx/50_local.conf.inc
index 3fd5d6ee..521dedb4 100644
--- a/meta-agl/templates/machine/m3ulcb-nogfx/50_local.conf.inc
+++ b/meta-agl/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/meta-agl/templates/machine/m3ulcb-nogfx/README_machine_m3ulcb-nogfx.md b/meta-agl/templates/machine/m3ulcb-nogfx/README_machine_m3ulcb-nogfx.md
index 1e5140c2..5c87986d 100644
--- a/meta-agl/templates/machine/m3ulcb-nogfx/README_machine_m3ulcb-nogfx.md
+++ b/meta-agl/templates/machine/m3ulcb-nogfx/README_machine_m3ulcb-nogfx.md
@@ -2,8 +2,10 @@
description: Machine m3ulcb-nogfx
authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Kevin Hilman <khilman@baylibre.com>, Ronan Le Martret <ronan.lemartret@iot.bzh>, Yannick Gicquel <yannick.gicquel@iot.bzh>
---
-
+
### Machine m3ulcb-nogfx
-
-*Description is missing - please complete file meta-agl/templates/machine/m3ulcb-nogfx/README_machine_m3ulcb-nogfx.md*
+This is a "m3ulcb" machine without proprietary graphics driver support.
+
+* [R-Car H3 and M3 Starter Kit website](https://www.renesas.com/br/en/solutions/automotive/adas/solution-kits/r-car-starter-kit.html)
+* [elinux H3 Starter Kit](https://elinux.org/R-Car/Boards/H3SK)
diff --git a/meta-agl/templates/machine/m3ulcb/50_bblayers.conf.inc b/meta-agl/templates/machine/m3ulcb/50_bblayers.conf.inc
index 5f410f0f..16397c2e 100644
--- a/meta-agl/templates/machine/m3ulcb/50_bblayers.conf.inc
+++ b/meta-agl/templates/machine/m3ulcb/50_bblayers.conf.inc
@@ -1,4 +1,3 @@
BBLAYERS =+ "\
- ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \
- ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \
+ ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
"
diff --git a/meta-agl/templates/machine/m3ulcb/50_local.conf.inc b/meta-agl/templates/machine/m3ulcb/50_local.conf.inc
index e2fe41a8..c75bc531 100644
--- a/meta-agl/templates/machine/m3ulcb/50_local.conf.inc
+++ b/meta-agl/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/meta-agl/templates/machine/m3ulcb/README_machine_m3ulcb.md b/meta-agl/templates/machine/m3ulcb/README_machine_m3ulcb.md
index 3b5e0f45..07034a6d 100644
--- a/meta-agl/templates/machine/m3ulcb/README_machine_m3ulcb.md
+++ b/meta-agl/templates/machine/m3ulcb/README_machine_m3ulcb.md
@@ -2,8 +2,10 @@
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
-
-*Description is missing - please complete file meta-agl/templates/machine/m3ulcb/README_machine_m3ulcb.md*
+Renesas RCar Gen3 "m3ulcb" board.
+
+* [R-Car H3 and M3 Starter Kit website](https://www.renesas.com/br/en/solutions/automotive/adas/solution-kits/r-car-starter-kit.html)
+* [elinux H3 Starter Kit](https://elinux.org/R-Car/Boards/H3SK)
diff --git a/meta-agl/templates/machine/raspberrypi4/50_local.conf.inc b/meta-agl/templates/machine/raspberrypi4/50_local.conf.inc
index 4c14d14b..e5556f27 100644
--- a/meta-agl/templates/machine/raspberrypi4/50_local.conf.inc
+++ b/meta-agl/templates/machine/raspberrypi4/50_local.conf.inc
@@ -1,8 +1,4 @@
-MACHINE = "raspberrypi4"
-#see meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
-require conf/include/agl_raspberrypi3.inc
+MACHINE = "raspberrypi4-64"
-#use the "Image" format for 64-bit AGL image for Raspberry Pi 4
-KERNEL_IMAGETYPE = "Image"
-KERNEL_IMAGETYPE_UBOOT = "Image"
-KERNEL_IMAGETYPE_DIRECT = "Image"
+#see meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
+require conf/include/agl_raspberrypi4.inc