summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/base/00_local.conf.agl.inc2
-rw-r--r--templates/base/01_setup_pkg_revision.sh68
-rw-r--r--templates/base/99_local.conf.inc33
-rw-r--r--templates/base/bblayers.conf.sample57
-rw-r--r--templates/base/conf-notes.txt17
-rw-r--r--templates/base/local.conf.sample237
-rw-r--r--templates/feature/agl-all-features/README_feature_agl-all-features.md16
-rw-r--r--templates/feature/agl-all-features/included.dep2
-rw-r--r--templates/feature/agl-app-framework/50_bblayers.conf.inc4
-rw-r--r--templates/feature/agl-app-framework/50_local.conf.inc2
-rw-r--r--templates/feature/agl-appfw-smack/50_bblayers.conf.inc6
-rw-r--r--templates/feature/agl-appfw-smack/50_local.conf.inc2
-rw-r--r--templates/feature/agl-archiver/50_local.conf.inc2
-rw-r--r--templates/feature/agl-archiver/README_feature_agl-archiver.md9
-rw-r--r--templates/feature/agl-buildstats/50_local.conf.inc2
-rw-r--r--templates/feature/agl-buildstats/README_feature_agl-buildstats.md9
-rw-r--r--templates/feature/agl-ci-change-features-nogfx/README_feature_agl-ci-change-features-nogfx.md19
-rw-r--r--templates/feature/agl-ci-change-features-nogfx/included.dep2
-rw-r--r--templates/feature/agl-ci-change-features/README_feature_agl-ci-change-features.md20
-rw-r--r--templates/feature/agl-ci-change-features/included.dep2
-rw-r--r--templates/feature/agl-ci-snapshot-features-nogfx/README_feature_agl-ci-snapshot-features-nogfx.md20
-rw-r--r--templates/feature/agl-ci-snapshot-features-nogfx/included.dep2
-rw-r--r--templates/feature/agl-ci-snapshot-features/README_feature_agl-ci-snapshot-features.md21
-rw-r--r--templates/feature/agl-ci-snapshot-features/included.dep2
-rw-r--r--templates/feature/agl-ci/99_local.conf.inc35
-rw-r--r--templates/feature/agl-ci/README_feature_agl-ci.md9
-rw-r--r--templates/feature/agl-ci/included.dep1
-rw-r--r--templates/feature/agl-create-spdx/50_local.conf.inc2
-rw-r--r--templates/feature/agl-create-spdx/README_feature_agl-create-spdx.md7
-rw-r--r--templates/feature/agl-devel/README_feature_agl-devel.md42
-rw-r--r--templates/feature/agl-devel/agl-devel.md40
-rw-r--r--templates/feature/agl-devel/included.dep1
-rw-r--r--templates/feature/agl-fossdriver/50_bblayers.conf.inc1
-rw-r--r--templates/feature/agl-fossdriver/50_local.conf.inc1
-rw-r--r--templates/feature/agl-fossdriver/README_feature_agl-fossdriver.md13
-rw-r--r--templates/feature/agl-isafw/50_bblayers.conf.inc1
-rw-r--r--templates/feature/agl-isafw/50_local.conf.inc1
-rw-r--r--templates/feature/agl-localdev/80_bblayers.conf.inc3
-rw-r--r--templates/feature/agl-localdev/80_local.conf.inc2
-rw-r--r--templates/feature/agl-localdev/README_feature_agl-localdev.md9
-rw-r--r--templates/feature/agl-netboot/50_bblayers.conf.inc8
-rw-r--r--templates/feature/agl-netboot/README_feature_agl-netboot.md9
-rw-r--r--templates/feature/agl-package-management/50_local.conf.inc2
-rw-r--r--templates/feature/agl-package-management/README_feature_agl-package-management.md8
-rw-r--r--templates/feature/agl-pipewire/50_bblayers.conf.inc7
-rw-r--r--templates/feature/agl-pipewire/50_local.conf.inc2
-rw-r--r--templates/feature/agl-pipewire/README_feature_agl-pipewire.md9
-rw-r--r--templates/feature/agl-ptest/90_local.conf.inc9
-rw-r--r--templates/feature/agl-ptest/README_feature_agl-ptest.md9
-rw-r--r--templates/feature/agl-refhw-h3/50_bblayers.conf.inc3
-rw-r--r--templates/feature/agl-refhw-h3/50_local.conf.inc2
-rw-r--r--templates/feature/agl-refhw-h3/README_feature_agl-refhw-h3.md8
-rw-r--r--templates/feature/agl-selinux/50_bblayers.conf.inc8
-rw-r--r--templates/feature/agl-selinux/50_local.conf.inc2
-rw-r--r--templates/feature/agl-selinux/README_feature_agl-selinux.md9
-rw-r--r--templates/feature/agl-sota/50_bblayers.conf.inc8
-rw-r--r--templates/feature/agl-sota/50_local.conf.inc2
-rw-r--r--templates/feature/agl-virt-guest-xen/50_local.conf.inc3
-rw-r--r--templates/feature/agl-virt-xen/50_local.conf.inc3
-rw-r--r--templates/feature/agl-virt-xen/included.dep1
-rw-r--r--templates/feature/agl-virt/50_bblayers.conf.inc5
-rw-r--r--templates/feature/agl-virt/50_local.conf.inc3
-rw-r--r--templates/feature/agl-weston-remoting/50_local.conf.inc1
-rw-r--r--templates/feature/agl-weston-remoting/README_feature_agl-weston-remoting.md9
-rw-r--r--templates/feature/agl-weston-remoting/included.dep1
-rw-r--r--templates/machine/am62xx-evm/50_bblayers.conf.inc5
-rw-r--r--templates/machine/am62xx-evm/50_local.conf.inc3
-rw-r--r--templates/machine/aws-ec2-arm64/50_bblayers.conf.inc8
-rw-r--r--templates/machine/aws-ec2-arm64/50_local.conf.inc21
-rw-r--r--templates/machine/aws-ec2-x86-64/50_bblayers.conf.inc8
-rw-r--r--templates/machine/aws-ec2-x86-64/50_local.conf.inc21
-rw-r--r--templates/machine/bbe/50_bblayers.conf.inc7
-rw-r--r--templates/machine/bbe/50_local.conf.inc2
-rw-r--r--templates/machine/bbe/README_machine_bbe.md12
-rw-r--r--templates/machine/beaglebone-ai64/50_bblayers.conf.inc5
-rw-r--r--templates/machine/beaglebone-ai64/50_local.conf.inc3
-rw-r--r--templates/machine/beaglebone-ai64/README_machine_beaglebone-ai64.md9
-rw-r--r--templates/machine/beaglebone/50_bblayers.conf.inc6
-rw-r--r--templates/machine/beaglebone/README_machine_beaglebone.md9
-rw-r--r--templates/machine/beagleplay/50_bblayers.conf.inc5
-rw-r--r--templates/machine/beagleplay/50_local.conf.inc3
-rw-r--r--templates/machine/beagleplay/README_machine_beagleplay.md9
-rw-r--r--templates/machine/cubox-i/40_bblayers.conf.inc (renamed from templates/machine/imx6qsabreauto/40_bblayers.conf.inc)5
-rw-r--r--templates/machine/cubox-i/50_local.conf.inc4
-rw-r--r--templates/machine/cubox-i/50_setup.sh2
-rw-r--r--templates/machine/cubox-i/README_machine_cubox-i.md9
-rw-r--r--templates/machine/cyclone5/50_bblayers.conf.inc1
-rw-r--r--templates/machine/cyclone5/50_local.conf.inc3
-rw-r--r--templates/machine/dra7xx-evm/50_bblayers.conf.inc1
-rw-r--r--templates/machine/dra7xx-evm/50_local.conf.inc3
-rw-r--r--templates/machine/dra7xx-evm/test/hwtest.enable1
-rw-r--r--templates/machine/dra7xx-evm/test/hwtest.short.enable1
-rw-r--r--templates/machine/dra7xx-evm/test/hwtest.short.environment11
-rw-r--r--templates/machine/dra7xx-evm/test/testjob_short.yaml51
-rw-r--r--templates/machine/dragonboard-410c/50_bblayers.conf.inc1
-rw-r--r--templates/machine/dragonboard-410c/50_local.conf.inc3
-rw-r--r--templates/machine/dragonboard-410c/50_setup.sh1
-rw-r--r--templates/machine/ebisu/50_bblayers.conf.inc4
-rw-r--r--templates/machine/ebisu/50_local.conf.inc3
-rw-r--r--templates/machine/ebisu/50_setup.sh45
-rw-r--r--templates/machine/ebisu/README_machine_ebisu.md44
-rw-r--r--templates/machine/generic-arm64/50_bblayers.conf.inc4
-rw-r--r--templates/machine/generic-arm64/50_local.conf.inc2
-rw-r--r--templates/machine/generic-arm64/README_machine_generic-arm64.md10
-rw-r--r--templates/machine/h3-salvator-x/50_bblayers.conf.inc4
-rw-r--r--templates/machine/h3-salvator-x/50_local.conf.inc4
-rw-r--r--templates/machine/h3-salvator-x/50_setup.sh10
-rw-r--r--templates/machine/h3-salvator-x/README_machine_h3-salvator-x.md11
-rw-r--r--templates/machine/h3ulcb-kf/50_bblayers.conf.inc5
-rw-r--r--templates/machine/h3ulcb-kf/50_local.conf.inc7
-rw-r--r--templates/machine/h3ulcb-kf/50_setup.sh10
-rw-r--r--templates/machine/h3ulcb-kf/README_machine_h3ulcb-kf.md12
-rw-r--r--templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc4
-rw-r--r--templates/machine/h3ulcb-nogfx/50_local.conf.inc3
-rw-r--r--templates/machine/h3ulcb-nogfx/README_machine_h3ulcb-nogfx.md11
-rw-r--r--templates/machine/h3ulcb/50_bblayers.conf.inc3
-rw-r--r--templates/machine/h3ulcb/README_machine_h3ulcb.md11
-rw-r--r--templates/machine/imx6qdlsabreauto/40_bblayers.conf.inc5
-rw-r--r--templates/machine/imx6qdlsabreauto/50_local.conf.inc4
-rw-r--r--templates/machine/imx6qdlsabreauto/50_setup.sh2
-rw-r--r--templates/machine/imx6qdlsabreauto/README_machine_imx6qdlsabreauto.md9
-rw-r--r--templates/machine/imx6qsabreauto/50_local.conf.inc4
-rw-r--r--templates/machine/imx6qsabreauto/50_setup.sh2
-rw-r--r--templates/machine/imx6qsabrelite/50_bblayers.conf.inc4
-rw-r--r--templates/machine/imx6qsabrelite/50_local.conf.inc2
-rw-r--r--templates/machine/imx6qsabrelite/50_setup.sh2
-rw-r--r--templates/machine/imx8mq-evk-viv/40_bblayers.conf.inc5
-rw-r--r--templates/machine/imx8mq-evk-viv/50_local.conf.inc3
-rw-r--r--templates/machine/imx8mq-evk-viv/50_setup.sh2
-rw-r--r--templates/machine/imx8mq-evk-viv/README_machine_imx8mq-evk-viv.md9
-rw-r--r--templates/machine/imx8mq-evk/40_bblayers.conf.inc5
-rw-r--r--templates/machine/imx8mq-evk/50_local.conf.inc3
-rw-r--r--templates/machine/imx8mq-evk/50_setup.sh2
-rw-r--r--templates/machine/imx8mq-evk/README_machine_imx8mq-evk.md13
l---------templates/machine/intel-corei7-641
-rw-r--r--templates/machine/intel-corei7-64/50_bblayers.conf.inc1
-rw-r--r--templates/machine/intel-corei7-64/50_local.conf.inc3
-rw-r--r--templates/machine/j721e-evm/50_bblayers.conf.inc5
-rw-r--r--templates/machine/j721e-evm/50_local.conf.inc3
-rw-r--r--templates/machine/j721e-evm/README_machine_j721e-evm.md9
-rw-r--r--templates/machine/joule/50_bblayers.conf.inc1
-rw-r--r--templates/machine/joule/50_local.conf.inc3
-rw-r--r--templates/machine/m3-salvator-x/50_bblayers.conf.inc4
-rw-r--r--templates/machine/m3-salvator-x/50_local.conf.inc4
-rw-r--r--templates/machine/m3-salvator-x/50_setup.sh10
-rw-r--r--templates/machine/m3-salvator-x/README_machine_m3-salvator-x.md11
-rw-r--r--templates/machine/m3ulcb-kf/50_bblayers.conf.inc5
-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.md12
-rw-r--r--templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc3
-rw-r--r--templates/machine/m3ulcb-nogfx/README_machine_m3ulcb-nogfx.md11
-rw-r--r--templates/machine/m3ulcb-nogfx/test/hwtest.short.environment9
-rw-r--r--templates/machine/m3ulcb-nogfx/test/testjob_short.yaml48
-rw-r--r--templates/machine/m3ulcb/50_bblayers.conf.inc3
-rw-r--r--templates/machine/m3ulcb/README_machine_m3ulcb.md11
-rw-r--r--templates/machine/nitrogen6x/50_bblayers.conf.inc5
-rw-r--r--templates/machine/nitrogen6x/50_local.conf.inc2
-rw-r--r--templates/machine/nitrogen6x/50_setup.sh2
-rw-r--r--templates/machine/porter-nogfx/50_bblayers.conf.inc5
-rw-r--r--templates/machine/porter-nogfx/50_local.conf.inc3
-rw-r--r--templates/machine/porter-nogfx/test/hwtest.enable1
-rw-r--r--templates/machine/porter-nogfx/test/hwtest.short.enable1
-rw-r--r--templates/machine/porter-nogfx/test/hwtest.short.environment11
-rw-r--r--templates/machine/porter-nogfx/test/testjob_short.yaml49
-rw-r--r--templates/machine/porter/50_bblayers.conf.inc5
-rw-r--r--templates/machine/porter/50_local.conf.inc3
-rw-r--r--templates/machine/porter/50_setup.sh14
-rw-r--r--templates/machine/qemuarm/50_local.conf.inc3
-rw-r--r--templates/machine/qemuarm/README_machine_qemuarm.md9
-rw-r--r--templates/machine/qemuarm64/50_local.conf.inc3
-rw-r--r--templates/machine/qemuarm64/README_machine_qemuarm64.md9
-rw-r--r--templates/machine/qemuriscv64/50_local.conf.inc3
-rw-r--r--templates/machine/qemuriscv64/README_machine_qemuriscv64.md9
-rw-r--r--templates/machine/qemux86-64/README_machine_qemux86-64.md9
-rw-r--r--templates/machine/qemux86/50_local.conf.inc3
-rw-r--r--templates/machine/raspberrypi2/50_bblayers.conf.inc1
-rw-r--r--templates/machine/raspberrypi2/50_local.conf.inc3
l---------templates/machine/raspberrypi3-64/50_bblayers.conf.inc1
-rw-r--r--templates/machine/raspberrypi3-64/50_local.conf.inc3
-rw-r--r--templates/machine/raspberrypi3-64/test/hwtest.short.environment10
-rw-r--r--templates/machine/raspberrypi3-64/test/testjob_short.yaml49
-rw-r--r--templates/machine/raspberrypi3/50_bblayers.conf.inc1
-rw-r--r--templates/machine/raspberrypi3/50_local.conf.inc3
-rw-r--r--templates/machine/raspberrypi3/test/hwtest.enable1
-rw-r--r--templates/machine/raspberrypi3/test/hwtest.short.enable1
-rw-r--r--templates/machine/raspberrypi3/test/hwtest.short.environment10
-rw-r--r--templates/machine/raspberrypi3/test/testjob_short.yaml49
-rw-r--r--templates/machine/raspberrypi4/50_bblayers.conf.inc1
-rw-r--r--templates/machine/raspberrypi4/50_local.conf.inc4
-rw-r--r--templates/machine/raspberrypi5/50_bblayers.conf.inc1
-rw-r--r--templates/machine/raspberrypi5/50_local.conf.inc4
-rw-r--r--templates/machine/s4sk/50_bblayers.conf.inc7
-rw-r--r--templates/machine/s4sk/50_local.conf.inc4
-rw-r--r--templates/machine/s4sk/README_machine_s4sk.md11
-rw-r--r--templates/machine/unmatched/50_bblayers.conf.inc6
-rw-r--r--templates/machine/unmatched/50_local.conf.inc4
-rw-r--r--templates/machine/virtio-aarch64/50_bblayers.conf.inc6
-rw-r--r--templates/machine/virtio-aarch64/50_local.conf.inc3
-rw-r--r--templates/machine/virtio-aarch64/README_machine_virtio-aarch64.md10
-rw-r--r--templates/machine/wandboard/50_bblayers.conf.inc4
-rw-r--r--templates/machine/wandboard/50_local.conf.inc2
202 files changed, 1109 insertions, 783 deletions
diff --git a/templates/base/00_local.conf.agl.inc b/templates/base/00_local.conf.agl.inc
index 1cfd90557..d55cbef4b 100644
--- a/templates/base/00_local.conf.agl.inc
+++ b/templates/base/00_local.conf.agl.inc
@@ -4,5 +4,5 @@
# Set DISTRO for AGL
DISTRO = "poky-agl"
-#see meta-agl/meta-agl/conf/include/base-agl.inc
+#see meta-agl/meta-agl-profile-core/conf/include/base-agl.inc
require conf/include/base-agl.inc
diff --git a/templates/base/01_setup_pkg_revision.sh b/templates/base/01_setup_pkg_revision.sh
new file mode 100644
index 000000000..a9e4ceb8c
--- /dev/null
+++ b/templates/base/01_setup_pkg_revision.sh
@@ -0,0 +1,68 @@
+# use a function to be neutral with other fragments
+function 01_setup_pkg_revision() {
+ # BASH_SOURCE can't be used as this fragment is concatenated in a larger script
+ local THIS=meta-agl/templates/base/01_setup_pkg_revision.sh
+
+ # RPMREVISION and LOCALCONF must be set previously in the setup script
+ [[ -z "$RPMREVISION" || -z "$LOCALCONF" ]] && return 0
+
+ echo "INFO: using RPM revision schema $RPMREVISION"
+
+ cat <<EOF >> $LOCALCONF
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+# fragment {
+# generated by $THIS "$RPMREVISION"
+#
+
+EOF
+
+ case "$RPMREVISION" in
+ prservice*)
+ [[ $RPMREVISION =~ ^prservice(:([^ \t\n]+))?$ ]] && {
+ echo "PRSERV_HOST ?= \"${BASH_REMATCH[2]:-localhost:0}\"" >> $LOCALCONF
+ } || {
+ echo "ERROR ($THIS): invalid address specified for PR Service"
+ return 1
+ }
+ ;;
+ timestamp)
+ AGL_PR=$(date --utc '+%Y%m%d.%H%M%S')
+ cat <<'EOF' >> $LOCALCONF
+# to re-generate AGL_PR the same way as aglsetup does, run:
+# echo "AGL_PR ?= \"$(date --utc '+%Y%m%d.%H%M%S')\""
+EOF
+ echo "AGL_PR ?= \"${AGL_PR}\"" >> $LOCALCONF;
+ cat <<'EOF' >> $LOCALCONF
+PKGR = "${PR}${EXTENDPRAUTO}.${AGL_PR}"
+PKGV = "${@ '${PV}'.replace('AUTOINC','${AGL_PR}')}"
+BB_BASEHASH_IGNORE_VARS:append = " PKGR PKGV"
+EOF
+ ;;
+ value:*)
+ echo "AGL_PR ?= \"${RPMREVISION#value:}\"" >> $LOCALCONF;
+ cat <<'EOF' >> $LOCALCONF
+PKGR = "${PR}${EXTENDPRAUTO}.${AGL_PR}"
+PKGV = "${@ '${PV}'.replace('AUTOINC','${AGL_PR}')}"
+BB_BASEHASH_IGNORE_VARS:append = " PKGR PKGV"
+EOF
+ ;;
+ none)
+ # do nothing
+ ;;
+ *)
+ echo "ERROR ($THIS): unknown package revision method '$REVISION'"
+ return 1
+ ;;
+ esac
+
+ cat <<'EOF' >> $LOCALCONF
+
+#
+# }
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+EOF
+
+}
+
+01_setup_pkg_revision
diff --git a/templates/base/99_local.conf.inc b/templates/base/99_local.conf.inc
new file mode 100644
index 000000000..be5dd9321
--- /dev/null
+++ b/templates/base/99_local.conf.inc
@@ -0,0 +1,33 @@
+########################
+# AGL DISTRO VARIABLES #
+########################
+
+# ARM 32bit 'medium' compiler (armv7thf instead of armv7ve)
+# (only use for CPUs <= cortex-a9 / w/o virt extension - e.g. cortex-a8)
+# AGL_FEATURES:append = " agl-medium-arm-compiler"
+
+
+######################
+# AGL USER VARIABLES #
+######################
+
+# Add additional IMAGE_FSTYPES here on-top of the default ext4.xz and tar.xz
+#AGL_EXTRA_IMAGE_FSTYPES = ""
+
+# Additional free disk space created in the image in Kbytes.
+#IMAGE_ROOTFS_EXTRA_SPACE="524288"
+
+# meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init.bbappend
+# AGL's compositor is started instead of weston like so
+# AGL_DEFAULT_WESTONSTART ?= "/usr/bin/agl-compositor --config ${sysconfdir}/xdg/weston/weston.ini"
+# you can redefine it using this variable to go back to weston,
+# but be careful that this needs further changes to work !
+# Especially the AGL demo apps will not work as-is.
+#AGL_DEFAULT_WESTONSTART = "/usr/bin/weston"
+
+# meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland_%.bbappend
+# This defines the QT integration. We default to xdg-shell
+# AGL_DEFAULT_WM_SHELL ?= "xdg-shell"
+# you can redefine it using this variable to e.g. use ivi-shell
+# but be careful that this needs further changes to work !
+#AGL_DEFAULT_WM_SHELL = ""
diff --git a/templates/base/bblayers.conf.sample b/templates/base/bblayers.conf.sample
deleted file mode 100644
index 478523b0d..000000000
--- a/templates/base/bblayers.conf.sample
+++ /dev/null
@@ -1,57 +0,0 @@
-# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
-# changes incompatibly
-LCONF_VERSION = "6"
-
-BBPATH = "${TOPDIR}"
-BBFILES ?= ""
-
-# Convenience variables usable in various configuration fragments
-#----------------------------------
-BCONFDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)))}"
-METADIR := "${@os.path.abspath('##OEROOT##/..')}"
-
-# These are the core OE + YP Layers
-#----------------------------------
-YOCTO_LAYERS = " \
- ${METADIR}/poky/meta \
- ${METADIR}/poky/meta-poky \
- "
-# this is added for the boards where necessary, not globally
-# ${METADIR}/poky/meta-yocto-bsp \
-#
-# These are the AGL CORE Layers that make up the basis
-# - they create a minimal bootable filesystem
-# with some automotive tools/libraries
-#-----------------------------------------------------
-AGL_CORE_LAYERS = " \
- ${METADIR}/meta-agl/meta-ivi-common \
- ${METADIR}/meta-agl/meta-agl \
- ${METADIR}/meta-agl/meta-agl-distro \
- ${METADIR}/meta-agl/meta-agl-bsp \
- "
-
-# These are the direct dependencies of the AGL CORE Layers
-#---------------------------------------------------------
-AGL_CORE_DEPENDENCY_LAYERS = " \
- ${METADIR}/meta-openembedded/meta-oe \
- ${METADIR}/meta-openembedded/meta-multimedia \
- ${METADIR}/meta-openembedded/meta-efl \
- ${METADIR}/meta-openembedded/meta-networking \
- ${METADIR}/meta-openembedded/meta-python \
- "
-
-####################
-# Combine the layers
-BBLAYERS ?= " \
- ${AGL_CORE_DEPENDENCY_LAYERS} \
- ${AGL_CORE_LAYERS} \
- ${YOCTO_LAYERS} \
- "
-
-BBLAYERS_NON_REMOVABLE ?= " \
- ${METADIR}/poky/meta \
- ${METADIR}/poky/meta-poky \
- ${METADIR}//meta-agl/meta-agl \
- "
-
-
diff --git a/templates/base/conf-notes.txt b/templates/base/conf-notes.txt
deleted file mode 100644
index 1279e2979..000000000
--- a/templates/base/conf-notes.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Common targets are:
- - meta-agl: (core system)
- agl-image-minimal
- agl-image-minimal-qa
-
- agl-image-ivi
- agl-image-ivi-qa
- agl-image-ivi-crosssdk
-
- agl-image-weston
-
- - meta-agl-demo: (demo with UI)
- agl-demo-platform (* default demo target)
- agl-demo-platform-qa
- agl-demo-platform-crosssdk
-
- agl-demo-platform-html5
diff --git a/templates/base/local.conf.sample b/templates/base/local.conf.sample
deleted file mode 100644
index 365b6eb20..000000000
--- a/templates/base/local.conf.sample
+++ /dev/null
@@ -1,237 +0,0 @@
-#
-# This file is your local configuration file and is where all local user settings
-# are placed. The comments in this file give some guide to the options a new user
-# to the system might want to change but pretty much any configuration option can
-# be set in this file. More adventurous users can look at local.conf.extended
-# which contains other examples of configuration which can be placed in this file
-# but new users likely won't need any of them initially.
-#
-# Lines starting with the '#' character are commented out and in some cases the
-# default values are provided as comments to show people example syntax. Enabling
-# the option is a question of removing the # character and making any change to the
-# variable as required.
-
-#
-# Machine Selection
-#
-# You need to select a specific machine to target the build with. There are a selection
-# of emulated machines available which can boot and run in the QEMU emulator:
-#
-#MACHINE ?= "qemuarm"
-#MACHINE ?= "qemuarm64"
-#MACHINE ?= "qemumips"
-#MACHINE ?= "qemumips64"
-#MACHINE ?= "qemuppc"
-#MACHINE ?= "qemux86"
-#MACHINE ?= "qemux86-64"
-#
-# There are also the following hardware board target machines included for
-# demonstration purposes:
-#
-#MACHINE ?= "beaglebone"
-#MACHINE ?= "genericx86"
-#MACHINE ?= "genericx86-64"
-#MACHINE ?= "mpc8315e-rdb"
-#MACHINE ?= "edgerouter"
-#
-# This sets the default machine to be qemux86 if no other machine is selected:
-MACHINE ??= "qemux86"
-
-#
-# Where to place downloads
-#
-# During a first build the system will download many different source code tarballs
-# from various upstream projects. This can take a while, particularly if your network
-# connection is slow. These are all stored in DL_DIR. When wiping and rebuilding you
-# can preserve this directory to speed up this part of subsequent builds. This directory
-# is safe to share between multiple builds on the same machine too.
-#
-# The default is a downloads directory under TOPDIR which is the build directory.
-#
-#DL_DIR ?= "${TOPDIR}/downloads"
-
-#
-# Where to place shared-state files
-#
-# BitBake has the capability to accelerate builds based on previously built output.
-# This is done using "shared state" files which can be thought of as cache objects
-# and this option determines where those files are placed.
-#
-# You can wipe out TMPDIR leaving this directory intact and the build would regenerate
-# from these files if no changes were made to the configuration. If changes were made
-# to the configuration, only shared state files where the state was still valid would
-# be used (done using checksums).
-#
-# The default is a sstate-cache directory under TOPDIR.
-#
-#SSTATE_DIR ?= "${TOPDIR}/sstate-cache"
-
-#
-# Where to place the build output
-#
-# This option specifies where the bulk of the building work should be done and
-# where BitBake should place its temporary files and output. Keep in mind that
-# this includes the extraction and compilation of many applications and the toolchain
-# which can use Gigabytes of hard disk space.
-#
-# The default is a tmp directory under TOPDIR.
-#
-#TMPDIR = "${TOPDIR}/tmp"
-
-#
-# Default policy config
-#
-# The distribution setting controls which policy settings are used as defaults.
-# The default value is fine for general Yocto project use, at least initially.
-# Ultimately when creating custom policy, people will likely end up subclassing
-# these defaults.
-#
-DISTRO ?= "poky"
-# As an example of a subclass there is a "bleeding" edge policy configuration
-# where many versions are set to the absolute latest code from the upstream
-# source control systems. This is just mentioned here as an example, its not
-# useful to most new users.
-# DISTRO ?= "poky-bleeding"
-
-#
-# Package Management configuration
-#
-# This variable lists which packaging formats to enable. Multiple package backends
-# can be enabled at once and the first item listed in the variable will be used
-# to generate the root filesystems.
-# Options are:
-# - 'package_deb' for debian style deb files
-# - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager)
-# - 'package_rpm' for rpm style packages
-# E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk"
-# We default to rpm:
-PACKAGE_CLASSES ?= "package_rpm"
-
-#
-# SDK target architecture
-#
-# This variable specifies the architecture to build SDK items for and means
-# you can build the SDK packages for architectures other than the machine you are
-# running the build on (i.e. building i686 packages on an x86_64 host).
-# Supported values are i686 and x86_64
-#SDKMACHINE ?= "i686"
-
-#
-# Extra image configuration defaults
-#
-# The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated
-# images. Some of these options are added to certain image types automatically. The
-# variable can contain the following options:
-# "dbg-pkgs" - add -dbg packages for all installed packages
-# (adds symbol information for debugging/profiling)
-# "dev-pkgs" - add -dev packages for all installed packages
-# (useful if you want to develop against libs in the image)
-# "ptest-pkgs" - add -ptest packages for all ptest-enabled packages
-# (useful if you want to run the package test suites)
-# "tools-sdk" - add development tools (gcc, make, pkgconfig etc.)
-# "tools-debug" - add debugging tools (gdb, strace)
-# "eclipse-debug" - add Eclipse remote debugging support
-# "tools-profile" - add profiling tools (oprofile, lttng, valgrind)
-# "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.)
-# "debug-tweaks" - make an image suitable for development
-# e.g. ssh root access has a blank password
-# There are other application targets that can be used here too, see
-# meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details.
-# We default to enabling the debugging tweaks.
-EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
-
-#
-# Additional image features
-#
-# The following is a list of additional classes to use when building images which
-# enable extra features. Some available options which can be included in this variable
-# are:
-# - 'buildstats' collect build statistics
-# - 'image-mklibs' to reduce shared library files size for an image
-# - 'image-prelink' in order to prelink the filesystem image
-# - 'image-swab' to perform host system intrusion detection
-# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink
-# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
-USER_CLASSES ?= "buildstats image-mklibs image-prelink"
-
-#
-# Runtime testing of images
-#
-# The build system can test booting virtual machine images under qemu (an emulator)
-# after any root filesystems are created and run tests against those images. To
-# enable this uncomment this line. See classes/testimage(-auto).bbclass for
-# further details.
-#TEST_IMAGE = "1"
-#
-# Interactive shell configuration
-#
-# Under certain circumstances the system may need input from you and to do this it
-# can launch an interactive shell. It needs to do this since the build is
-# multithreaded and needs to be able to handle the case where more than one parallel
-# process may require the user's attention. The default is iterate over the available
-# terminal types to find one that works.
-#
-# Examples of the occasions this may happen are when resolving patches which cannot
-# be applied, to use the devshell or the kernel menuconfig
-#
-# Supported values are auto, gnome, xfce, rxvt, screen, konsole (KDE 3.x only), none
-# Note: currently, Konsole support only works for KDE 3.x due to the way
-# newer Konsole versions behave
-#OE_TERMINAL = "auto"
-# By default disable interactive patch resolution (tasks will just fail instead):
-PATCHRESOLVE = "noop"
-
-#
-# Disk Space Monitoring during the build
-#
-# Monitor the disk space during the build. If there is less that 1GB of space or less
-# than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully
-# shutdown the build. If there is less that 100MB or 1K inodes, perform a hard abort
-# of the build. The reason for this is that running completely out of space can corrupt
-# files and damages the build in ways which may not be easily recoverable.
-# It's necesary to monitor /tmp, if there is no space left the build will fail
-# with very exotic errors.
-BB_DISKMON_DIRS = "\
- STOPTASKS,${TMPDIR},1G,100K \
- STOPTASKS,${DL_DIR},1G,100K \
- STOPTASKS,${SSTATE_DIR},1G,100K \
- STOPTASKS,/tmp,100M,100K \
- ABORT,${TMPDIR},100M,1K \
- ABORT,${DL_DIR},100M,1K \
- ABORT,${SSTATE_DIR},100M,1K \
- ABORT,/tmp,10M,1K"
-
-#
-# Shared-state files from other locations
-#
-# As mentioned above, shared state files are prebuilt cache data objects which can
-# used to accelerate build time. This variable can be used to configure the system
-# to search other mirror locations for these objects before it builds the data itself.
-#
-# This can be a filesystem directory, or a remote url such as http or ftp. These
-# would contain the sstate-cache results from previous builds (possibly from other
-# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the
-# cache locations to check for the shared objects.
-# NOTE: if the mirror uses the same structure as SSTATE_DIR, you need to add PATH
-# at the end as shown in the examples below. This will be substituted with the
-# correct path within the directory structure.
-#SSTATE_MIRRORS ?= "\
-#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \
-#file://.* file:///some/local/dir/sstate/PATH"
-
-
-#
-# Qemu configuration
-#
-# By default qemu will build with a builtin VNC server where graphical output can be
-# seen. The two lines below enable the SDL backend too. By default libsdl-native will
-# be built, if you want to use your host's libSDL instead of the minimal libsdl built
-# by libsdl-native then uncomment the ASSUME_PROVIDED line below.
-PACKAGECONFIG_append_pn-qemu-native = " sdl"
-PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl"
-#ASSUME_PROVIDED += "libsdl-native"
-
-# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to
-# track the version of this file when it was generated. This can safely be ignored if
-# this doesn't mean anything to you.
-CONF_VERSION = "1"
diff --git a/templates/feature/agl-all-features/README_feature_agl-all-features.md b/templates/feature/agl-all-features/README_feature_agl-all-features.md
new file mode 100644
index 000000000..9dab654df
--- /dev/null
+++ b/templates/feature/agl-all-features/README_feature_agl-all-features.md
@@ -0,0 +1,16 @@
+---
+description: Feature agl-all-features
+authors: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>, Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Phong Tran <tranmanphong@gmail.com>, Ronan Le Martret <ronan.lemartret@iot.bzh>
+---
+
+### Feature agl-all-features
+
+*Description is missing - please complete file meta-agl/templates/feature/agl-all-features/README_feature_agl-all-features.md*
+
+#### Dependent features pulled by agl-all-features
+
+The following features are pulled:
+
+* agl-demo
+* agl-netboot
+
diff --git a/templates/feature/agl-all-features/included.dep b/templates/feature/agl-all-features/included.dep
index 1ed6763e7..80717ded0 100644
--- a/templates/feature/agl-all-features/included.dep
+++ b/templates/feature/agl-all-features/included.dep
@@ -1 +1 @@
-agl-demo agl-netboot agl-sota
+agl-demo agl-netboot
diff --git a/templates/feature/agl-app-framework/50_bblayers.conf.inc b/templates/feature/agl-app-framework/50_bblayers.conf.inc
new file mode 100644
index 000000000..e6eacd9d8
--- /dev/null
+++ b/templates/feature/agl-app-framework/50_bblayers.conf.inc
@@ -0,0 +1,4 @@
+
+BBLAYERS =+ " \
+ ${METADIR}/meta-agl/meta-app-framework \
+ "
diff --git a/templates/feature/agl-app-framework/50_local.conf.inc b/templates/feature/agl-app-framework/50_local.conf.inc
new file mode 100644
index 000000000..ce541a7b0
--- /dev/null
+++ b/templates/feature/agl-app-framework/50_local.conf.inc
@@ -0,0 +1,2 @@
+#see meta-agl/meta-app-framework/conf/include/agl-app-framework.inc
+require conf/include/agl-app-framework.inc
diff --git a/templates/feature/agl-appfw-smack/50_bblayers.conf.inc b/templates/feature/agl-appfw-smack/50_bblayers.conf.inc
deleted file mode 100644
index 344c25070..000000000
--- a/templates/feature/agl-appfw-smack/50_bblayers.conf.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-BBLAYERS =+ " \
- ${METADIR}/meta-intel-iot-security/meta-security-smack \
- ${METADIR}/meta-intel-iot-security/meta-security-framework \
- ${METADIR}/meta-agl/meta-app-framework \
- "
-
diff --git a/templates/feature/agl-appfw-smack/50_local.conf.inc b/templates/feature/agl-appfw-smack/50_local.conf.inc
deleted file mode 100644
index 0a11f07c2..000000000
--- a/templates/feature/agl-appfw-smack/50_local.conf.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-#see meta-agl/meta-app-framework/conf/include/agl-appfw-smack.inc
-require conf/include/agl-appfw-smack.inc
diff --git a/templates/feature/agl-archiver/50_local.conf.inc b/templates/feature/agl-archiver/50_local.conf.inc
index 946c262df..6ff284cdb 100644
--- a/templates/feature/agl-archiver/50_local.conf.inc
+++ b/templates/feature/agl-archiver/50_local.conf.inc
@@ -1,2 +1,4 @@
INHERIT += "archiver"
ARCHIVER_MODE[src] = "original"
+COPYLEFT_LICENSE_INCLUDE = "*"
+COPYLEFT_LICENSE_EXCLUDE += "CLOSED Proprietary Custom Firmware-* Freescale-* NXP-* TI TI-*"
diff --git a/templates/feature/agl-archiver/README_feature_agl-archiver.md b/templates/feature/agl-archiver/README_feature_agl-archiver.md
new file mode 100644
index 000000000..bcd11b320
--- /dev/null
+++ b/templates/feature/agl-archiver/README_feature_agl-archiver.md
@@ -0,0 +1,9 @@
+---
+description: Feature agl-archiver
+authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Stéphane Desneux <stephane.desneux@iot.bzh>
+---
+
+### Feature agl-archiver
+
+*Description is missing - please complete file meta-agl/templates/feature/agl-archiver/README_feature_agl-archiver.md*
+
diff --git a/templates/feature/agl-buildstats/50_local.conf.inc b/templates/feature/agl-buildstats/50_local.conf.inc
new file mode 100644
index 000000000..34110d35d
--- /dev/null
+++ b/templates/feature/agl-buildstats/50_local.conf.inc
@@ -0,0 +1,2 @@
+INHERIT += "buildstats"
+INHERIT += "buildstats-summary"
diff --git a/templates/feature/agl-buildstats/README_feature_agl-buildstats.md b/templates/feature/agl-buildstats/README_feature_agl-buildstats.md
new file mode 100644
index 000000000..d10bd7e31
--- /dev/null
+++ b/templates/feature/agl-buildstats/README_feature_agl-buildstats.md
@@ -0,0 +1,9 @@
+---
+description: Feature agl-buildstats
+authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
+---
+
+### Feature agl-buildstats
+
+*Description is missing - please complete file meta-agl/templates/feature/agl-buildstats/README_feature_agl-buildstats.md*
+
diff --git a/templates/feature/agl-ci-change-features-nogfx/README_feature_agl-ci-change-features-nogfx.md b/templates/feature/agl-ci-change-features-nogfx/README_feature_agl-ci-change-features-nogfx.md
new file mode 100644
index 000000000..6889d0840
--- /dev/null
+++ b/templates/feature/agl-ci-change-features-nogfx/README_feature_agl-ci-change-features-nogfx.md
@@ -0,0 +1,19 @@
+---
+description: Feature agl-ci-change-features-nogfx
+authors: George Kiagiadakis <george.kiagiadakis@collabora.com>, Jan-Simon Möller <jsmoeller@linuxfoundation.org>
+---
+
+### Feature agl-ci-change-features-nogfx
+
+*Description is missing - please complete file meta-agl/templates/feature/agl-ci-change-features-nogfx/README_feature_agl-ci-change-features-nogfx.md*
+
+#### Dependent features pulled by agl-ci-change-features-nogfx
+
+The following features are pulled:
+
+* agl-devel
+* agl-netboot
+* agl-pipewire
+* agl-buildstats
+* agl-ptest
+
diff --git a/templates/feature/agl-ci-change-features-nogfx/included.dep b/templates/feature/agl-ci-change-features-nogfx/included.dep
index 49f5dd12d..27e9852f7 100644
--- a/templates/feature/agl-ci-change-features-nogfx/included.dep
+++ b/templates/feature/agl-ci-change-features-nogfx/included.dep
@@ -1 +1 @@
-agl-devel agl-netboot agl-appfw-smack \ No newline at end of file
+agl-demo agl-devel agl-netboot agl-pipewire agl-buildstats agl-ptest
diff --git a/templates/feature/agl-ci-change-features/README_feature_agl-ci-change-features.md b/templates/feature/agl-ci-change-features/README_feature_agl-ci-change-features.md
new file mode 100644
index 000000000..d60499bc3
--- /dev/null
+++ b/templates/feature/agl-ci-change-features/README_feature_agl-ci-change-features.md
@@ -0,0 +1,20 @@
+---
+description: Feature agl-ci-change-features
+authors: George Kiagiadakis <george.kiagiadakis@collabora.com>, Jan-Simon Moeller <jsmoeller@linuxfoundation.org>, Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Phong Tran <tranmanphong@gmail.com>
+---
+
+### Feature agl-ci-change-features
+
+*Description is missing - please complete file meta-agl/templates/feature/agl-ci-change-features/README_feature_agl-ci-change-features.md*
+
+#### Dependent features pulled by agl-ci-change-features
+
+The following features are pulled:
+
+* agl-demo
+* agl-devel
+* agl-netboot
+* agl-pipewire
+* agl-buildstats
+* agl-ptest
+
diff --git a/templates/feature/agl-ci-change-features/included.dep b/templates/feature/agl-ci-change-features/included.dep
index 3f111d36c..27e9852f7 100644
--- a/templates/feature/agl-ci-change-features/included.dep
+++ b/templates/feature/agl-ci-change-features/included.dep
@@ -1 +1 @@
-agl-demo agl-devel agl-netboot agl-appfw-smack \ No newline at end of file
+agl-demo agl-devel agl-netboot agl-pipewire agl-buildstats agl-ptest
diff --git a/templates/feature/agl-ci-snapshot-features-nogfx/README_feature_agl-ci-snapshot-features-nogfx.md b/templates/feature/agl-ci-snapshot-features-nogfx/README_feature_agl-ci-snapshot-features-nogfx.md
new file mode 100644
index 000000000..0289143f0
--- /dev/null
+++ b/templates/feature/agl-ci-snapshot-features-nogfx/README_feature_agl-ci-snapshot-features-nogfx.md
@@ -0,0 +1,20 @@
+---
+description: Feature agl-ci-snapshot-features-nogfx
+authors: George Kiagiadakis <george.kiagiadakis@collabora.com>, Jan-Simon Möller <jsmoeller@linuxfoundation.org>
+---
+
+### Feature agl-ci-snapshot-features-nogfx
+
+*Description is missing - please complete file meta-agl/templates/feature/agl-ci-snapshot-features-nogfx/README_feature_agl-ci-snapshot-features-nogfx.md*
+
+#### Dependent features pulled by agl-ci-snapshot-features-nogfx
+
+The following features are pulled:
+
+* agl-devel
+* agl-netboot
+* agl-archiver
+* agl-pipewire
+* agl-buildstats
+* agl-ptest
+
diff --git a/templates/feature/agl-ci-snapshot-features-nogfx/included.dep b/templates/feature/agl-ci-snapshot-features-nogfx/included.dep
index 0a88d5ef9..01ef6c813 100644
--- a/templates/feature/agl-ci-snapshot-features-nogfx/included.dep
+++ b/templates/feature/agl-ci-snapshot-features-nogfx/included.dep
@@ -1 +1 @@
-agl-devel agl-netboot agl-appfw-smack agl-isafw agl-archiver \ No newline at end of file
+agl-demo agl-devel agl-netboot agl-archiver agl-pipewire agl-buildstats agl-ptest
diff --git a/templates/feature/agl-ci-snapshot-features/README_feature_agl-ci-snapshot-features.md b/templates/feature/agl-ci-snapshot-features/README_feature_agl-ci-snapshot-features.md
new file mode 100644
index 000000000..42dec5707
--- /dev/null
+++ b/templates/feature/agl-ci-snapshot-features/README_feature_agl-ci-snapshot-features.md
@@ -0,0 +1,21 @@
+---
+description: Feature agl-ci-snapshot-features
+authors: George Kiagiadakis <george.kiagiadakis@collabora.com>, Jan-Simon Moeller <jsmoeller@linuxfoundation.org>, Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Phong Tran <tranmanphong@gmail.com>
+---
+
+### Feature agl-ci-snapshot-features
+
+*Description is missing - please complete file meta-agl/templates/feature/agl-ci-snapshot-features/README_feature_agl-ci-snapshot-features.md*
+
+#### Dependent features pulled by agl-ci-snapshot-features
+
+The following features are pulled:
+
+* agl-demo
+* agl-devel
+* agl-netboot
+* agl-archiver
+* agl-pipewire
+* agl-buildstats
+* agl-ptest
+
diff --git a/templates/feature/agl-ci-snapshot-features/included.dep b/templates/feature/agl-ci-snapshot-features/included.dep
index 481ed89a5..01ef6c813 100644
--- a/templates/feature/agl-ci-snapshot-features/included.dep
+++ b/templates/feature/agl-ci-snapshot-features/included.dep
@@ -1 +1 @@
-agl-demo agl-devel agl-netboot agl-appfw-smack agl-isafw agl-archiver \ No newline at end of file
+agl-demo agl-devel agl-netboot agl-archiver agl-pipewire agl-buildstats agl-ptest
diff --git a/templates/feature/agl-ci/99_local.conf.inc b/templates/feature/agl-ci/99_local.conf.inc
new file mode 100644
index 000000000..c12cd1717
--- /dev/null
+++ b/templates/feature/agl-ci/99_local.conf.inc
@@ -0,0 +1,35 @@
+AGL_FEATURES:append = " AGLCI"
+# opencv seems to have a parallel make bug
+# ...contrib/modules/xfeatures2d/test/test_features2d.cpp:51:10: fatal error: features2d/test/test_detectors_regression.impl.hpp: No such file or directory
+PARALLEL_MAKE:pn-opencv = "-j 1"
+
+AGL_HOST_PREMIRROR ?= "http://download.automotivelinux.org"
+AGL_HOST_SSTATE_MIRROR ?= "http://download.automotivelinux.org"
+
+PREMIRRORS = " \
+git://.*/.* ${AGL_HOST_PREMIRROR}/AGL/mirror/ \n \
+ftp://.*/.* ${AGL_HOST_PREMIRROR}/AGL/mirror/ \n \
+http://.*/.* ${AGL_HOST_PREMIRROR}/AGL/mirror/ \n \
+https://.*/.* ${AGL_HOST_PREMIRROR}/AGL/mirror/ \n \
+"
+
+SSTATE_MIRRORS = " file://.* ${AGL_HOST_SSTATE_MIRROR}/sstate-mirror/master/${DEFAULTTUNE}/PATH;downloadfilename=PATH \n "
+
+#INHERIT += "packagefeed-stability"
+INHERIT += "buildhistory"
+INHERIT += "buildstats"
+INHERIT += "buildstats-summary"
+
+# setup for PRSERV and HASHSERV
+#AGL_HOST_PRSERV ?= "10.30.72.18"
+#AGL_HOST_HASHSERV ?= "10.30.72.18"
+
+#BB_HASHSERVE = "${AGL_HOST_HASHSERV}:8383"
+#BB_SIGNATURE_HANDLER = "OEEquivHash"
+
+#PRSERV_HOST = "${AGL_HOST_PRSERV}:8181"
+
+IMAGE_INSTALL:append = " curl"
+
+# remote .rootfs suffix
+IMAGE_NAME_SUFFIX = ""
diff --git a/templates/feature/agl-ci/README_feature_agl-ci.md b/templates/feature/agl-ci/README_feature_agl-ci.md
new file mode 100644
index 000000000..3d983cfd3
--- /dev/null
+++ b/templates/feature/agl-ci/README_feature_agl-ci.md
@@ -0,0 +1,9 @@
+---
+description: Feature agl-ci
+authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
+---
+
+### Feature agl-ci
+
+*Description is missing - please complete file meta-agl/templates/feature/agl-ci/README_feature_agl-ci.md*
+
diff --git a/templates/feature/agl-ci/included.dep b/templates/feature/agl-ci/included.dep
new file mode 100644
index 000000000..21543697b
--- /dev/null
+++ b/templates/feature/agl-ci/included.dep
@@ -0,0 +1 @@
+agl-create-spdx
diff --git a/templates/feature/agl-create-spdx/50_local.conf.inc b/templates/feature/agl-create-spdx/50_local.conf.inc
new file mode 100644
index 000000000..2dd5314f3
--- /dev/null
+++ b/templates/feature/agl-create-spdx/50_local.conf.inc
@@ -0,0 +1,2 @@
+#see meta-agl/meta-agl/conf/include/agl-devel.inc
+require conf/include/agl-create-spdx.inc
diff --git a/templates/feature/agl-create-spdx/README_feature_agl-create-spdx.md b/templates/feature/agl-create-spdx/README_feature_agl-create-spdx.md
new file mode 100644
index 000000000..332a9dbd5
--- /dev/null
+++ b/templates/feature/agl-create-spdx/README_feature_agl-create-spdx.md
@@ -0,0 +1,7 @@
+---
+description: Feature agl-create-spdx
+authors: Jan-Simon Moeller <jsmoeller@linuxfoundation.rg>
+---
+
+### Feature agl-create-spdx
+Activation of the create-spdx class in oe-core.
diff --git a/templates/feature/agl-devel/README_feature_agl-devel.md b/templates/feature/agl-devel/README_feature_agl-devel.md
new file mode 100644
index 000000000..588bb3cdc
--- /dev/null
+++ b/templates/feature/agl-devel/README_feature_agl-devel.md
@@ -0,0 +1,42 @@
+---
+description: Feature agl-devel
+authors: José Bollo <jose.bollo@iot.bzh>, Ronan Le Martret <ronan.lemartret@iot.bzh>, Stephane Desneux <stephane.desneux@iot.bzh>, Yannick Gicquel <yannick.gicquel@iot.bzh>
+---
+
+### Feature agl-devel
+
+Activation of the agl-devel features turns on
+features needed for developping and debugging
+agl distribution.
+
+This includes:
+
+* adding to images some useful packages
+* adding to images the package group 'packagegroup-agl-devel'
+* definition of a contionnal the tag 'agl-devel'
+ for conditionnal building
+
+ * definition of the distro feature 'agl-devel'
+ * adds packages for development in SDK
+
+### How to use agl-devel in conditionnal builds
+
+The following example shows how to activate C/C++ code
+specific to agl-devel:
+
+```yocto
+CPPFLAGS:append:agl-devel = " -DAGL_DEVEL"
+```
+
+Using this, any code enclosed in
+
+```yocto
+#ifdef AGL_DEVEL
+...my code specific to agl-devel...
+#endif
+```
+
+will normaly be effective only if agl-devel is set on.
+
+At this time, it is recommended to use AGL_DEVEL as tag
+within C/C++ code.
diff --git a/templates/feature/agl-devel/agl-devel.md b/templates/feature/agl-devel/agl-devel.md
deleted file mode 100644
index 85a2b9177..000000000
--- a/templates/feature/agl-devel/agl-devel.md
+++ /dev/null
@@ -1,40 +0,0 @@
-The features of agl-devel
-=========================
-
-Activation of the agl-devel features turns on
-features needed for developping and debugging
-agl distribution.
-
-This includes:
-
- - adding to images some useful packages
-
- - adding to images the package group 'packagegroup-agl-devel'
-
- - definition of a contionnal the tag 'agl-devel'
- for conditionnal building
-
- - definition of the distro feature 'agl-devel'
-
- - adds packages for development in SDK
-
-
-How to use agl-devel in conditionnal builds ?
----------------------------------------------
-
-The following example shows how to activate C/C++ code
-specific to agl-devel:
-
- CPPFLAGS_append_agl-devel = " -DAGL_DEVEL"
-
-Using this, any code enclosed in
-
- #ifdef AGL_DEVEL
- ...my code specific to agl-devel...
- #endif
-
-will normaly be effective only if agl-devel is set on.
-
-At this time, it is recommended to use AGL_DEVEL as tag
-within C/C++ code.
-
diff --git a/templates/feature/agl-devel/included.dep b/templates/feature/agl-devel/included.dep
new file mode 100644
index 000000000..115ecf19a
--- /dev/null
+++ b/templates/feature/agl-devel/included.dep
@@ -0,0 +1 @@
+agl-package-management
diff --git a/templates/feature/agl-fossdriver/50_bblayers.conf.inc b/templates/feature/agl-fossdriver/50_bblayers.conf.inc
new file mode 100644
index 000000000..eea04c4e8
--- /dev/null
+++ b/templates/feature/agl-fossdriver/50_bblayers.conf.inc
@@ -0,0 +1 @@
+BBLAYERS =+ "${METADIR}/external/meta-spdxscanner"
diff --git a/templates/feature/agl-fossdriver/50_local.conf.inc b/templates/feature/agl-fossdriver/50_local.conf.inc
new file mode 100644
index 000000000..9dea9a0da
--- /dev/null
+++ b/templates/feature/agl-fossdriver/50_local.conf.inc
@@ -0,0 +1 @@
+INHERIT += "fossdriver-host" \ No newline at end of file
diff --git a/templates/feature/agl-fossdriver/README_feature_agl-fossdriver.md b/templates/feature/agl-fossdriver/README_feature_agl-fossdriver.md
new file mode 100644
index 000000000..5a9284366
--- /dev/null
+++ b/templates/feature/agl-fossdriver/README_feature_agl-fossdriver.md
@@ -0,0 +1,13 @@
+---
+description: Feature agl-fossdriver
+authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Stéphane Desneux <stephane.desneux@iot.bzh>
+---
+
+### Feature agl-fossdriver
+
+Integration with meta-spdxscanner.
+
+This needs fossdriver setup and a fossology instance before it can work.
+
+*Full description is missing - please complete file meta-agl/templates/feature/agl-fossdriver/README_feature_agl-fossdriver.md*
+
diff --git a/templates/feature/agl-isafw/50_bblayers.conf.inc b/templates/feature/agl-isafw/50_bblayers.conf.inc
deleted file mode 100644
index a0c626f9e..000000000
--- a/templates/feature/agl-isafw/50_bblayers.conf.inc
+++ /dev/null
@@ -1 +0,0 @@
-BBLAYERS =+ "${METADIR}/meta-security-isafw"
diff --git a/templates/feature/agl-isafw/50_local.conf.inc b/templates/feature/agl-isafw/50_local.conf.inc
deleted file mode 100644
index c1c13e1f5..000000000
--- a/templates/feature/agl-isafw/50_local.conf.inc
+++ /dev/null
@@ -1 +0,0 @@
-INHERIT += "isafw"
diff --git a/templates/feature/agl-localdev/80_bblayers.conf.inc b/templates/feature/agl-localdev/80_bblayers.conf.inc
new file mode 100644
index 000000000..d9bb9d070
--- /dev/null
+++ b/templates/feature/agl-localdev/80_bblayers.conf.inc
@@ -0,0 +1,3 @@
+# Local derivations during development, just add a layer in the folder meta-localdev
+BBLAYERS =+ "${@'${METADIR}/meta-localdev' if os.path.exists('${METADIR}/meta-localdev') else ''}"
+
diff --git a/templates/feature/agl-localdev/80_local.conf.inc b/templates/feature/agl-localdev/80_local.conf.inc
new file mode 100644
index 000000000..6c9213512
--- /dev/null
+++ b/templates/feature/agl-localdev/80_local.conf.inc
@@ -0,0 +1,2 @@
+# (weak) include userspecific local.dev.inc
+include local.dev.inc
diff --git a/templates/feature/agl-localdev/README_feature_agl-localdev.md b/templates/feature/agl-localdev/README_feature_agl-localdev.md
new file mode 100644
index 000000000..111ae4ec0
--- /dev/null
+++ b/templates/feature/agl-localdev/README_feature_agl-localdev.md
@@ -0,0 +1,9 @@
+---
+description: enable local layer for development purposes
+authors: Stéphane Desneux <stephane.desneux@iot.bzh>
+---
+
+### Feature agl-localdev
+
+Adds a local layer named "meta-localdev" in meta directory and a local.dev.inc conf file if present.
+
diff --git a/templates/feature/agl-netboot/50_bblayers.conf.inc b/templates/feature/agl-netboot/50_bblayers.conf.inc
index 3d2ed6460..94e784a1a 100644
--- a/templates/feature/agl-netboot/50_bblayers.conf.inc
+++ b/templates/feature/agl-netboot/50_bblayers.conf.inc
@@ -1 +1,7 @@
-BBLAYERS =+ "${METADIR}/meta-agl/meta-netboot"
+BBLAYERS =+ " ${METADIR}/meta-agl/meta-netboot \
+ "
+
+# Indirection to avoid duplicate inclusions of the same folder into BBLAYERS
+# the evaluation is in the bblayers.conf.sample in meta-agl/meta-agl-core/conf/templates/base
+AGL_META_PYTHON = "${METADIR}/external/meta-openembedded/meta-python"
+AGL_META_NETWORKING = "${METADIR}/external/meta-openembedded/meta-networking"
diff --git a/templates/feature/agl-netboot/README_feature_agl-netboot.md b/templates/feature/agl-netboot/README_feature_agl-netboot.md
new file mode 100644
index 000000000..171f852b6
--- /dev/null
+++ b/templates/feature/agl-netboot/README_feature_agl-netboot.md
@@ -0,0 +1,9 @@
+---
+description: Feature agl-netboot
+authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Ronan Le Martret <ronan.lemartret@iot.bzh>, Stephane Desneux <stephane.desneux@iot.bzh>
+---
+
+### Feature agl-netboot
+
+*Description is missing - please complete file meta-agl/templates/feature/agl-netboot/README_feature_agl-netboot.md*
+
diff --git a/templates/feature/agl-package-management/50_local.conf.inc b/templates/feature/agl-package-management/50_local.conf.inc
new file mode 100644
index 000000000..641a327c9
--- /dev/null
+++ b/templates/feature/agl-package-management/50_local.conf.inc
@@ -0,0 +1,2 @@
+#see meta-agl/meta-agl/conf/include/agl-package-management.inc
+require conf/include/agl-package-management.inc
diff --git a/templates/feature/agl-package-management/README_feature_agl-package-management.md b/templates/feature/agl-package-management/README_feature_agl-package-management.md
new file mode 100644
index 000000000..37562dd00
--- /dev/null
+++ b/templates/feature/agl-package-management/README_feature_agl-package-management.md
@@ -0,0 +1,8 @@
+---
+description: Feature agl-package-management
+authors: Scott Murray <scott.murray@konsulko.com>, Jan-Simon Möller <jsmoeller@linuxfoundation.org>
+---
+
+### Feature agl-package-management
+
+Adds package management to images.
diff --git a/templates/feature/agl-pipewire/50_bblayers.conf.inc b/templates/feature/agl-pipewire/50_bblayers.conf.inc
new file mode 100644
index 000000000..e05cd4090
--- /dev/null
+++ b/templates/feature/agl-pipewire/50_bblayers.conf.inc
@@ -0,0 +1,7 @@
+
+BBLAYERS =+ " \
+ ${METADIR}/meta-agl/meta-pipewire \
+ "
+
+# we ship our own pipewire
+BBMASK += "meta-openembedded/meta-oe/recipes-multimedia/pipewire/"
diff --git a/templates/feature/agl-pipewire/50_local.conf.inc b/templates/feature/agl-pipewire/50_local.conf.inc
new file mode 100644
index 000000000..33838b088
--- /dev/null
+++ b/templates/feature/agl-pipewire/50_local.conf.inc
@@ -0,0 +1,2 @@
+#see meta-agl-devel/meta-pipewire/conf/include/agl-pipewire.inc
+require conf/include/agl-pipewire.inc
diff --git a/templates/feature/agl-pipewire/README_feature_agl-pipewire.md b/templates/feature/agl-pipewire/README_feature_agl-pipewire.md
new file mode 100644
index 000000000..55e1931c3
--- /dev/null
+++ b/templates/feature/agl-pipewire/README_feature_agl-pipewire.md
@@ -0,0 +1,9 @@
+---
+description: Feature agl-pipewire
+authors: George Kiagiadakis <george.kiagiadakis@collabora.com>
+---
+
+### Feature agl-pipewire
+
+*Description is missing - please complete file meta-agl-devel/templates/feature/agl-pipewire/README_feature_agl-pipewire.md*
+
diff --git a/templates/feature/agl-ptest/90_local.conf.inc b/templates/feature/agl-ptest/90_local.conf.inc
new file mode 100644
index 000000000..dcaf72ab3
--- /dev/null
+++ b/templates/feature/agl-ptest/90_local.conf.inc
@@ -0,0 +1,9 @@
+
+# Enabling ptest in image ...
+
+OVERRIDES:append = ":agl-ptest"
+DISTRO_FEATURES:append = " ptest"
+EXTRA_IMAGE_FEATURES:append = " ptest-pkgs"
+IMAGE_INSTALL:append = " lua-ptest xmlsec1-ptest libxml2-ptest"
+
+# / ptest
diff --git a/templates/feature/agl-ptest/README_feature_agl-ptest.md b/templates/feature/agl-ptest/README_feature_agl-ptest.md
new file mode 100644
index 000000000..89ba4936b
--- /dev/null
+++ b/templates/feature/agl-ptest/README_feature_agl-ptest.md
@@ -0,0 +1,9 @@
+---
+description: Feature agl-ptest
+authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Romain Forlot <romain.forlot@iot.bzh>
+---
+
+### Feature agl-ptest
+
+*Description is missing - please complete file meta-agl/templates/feature/agl-ptest/README_feature_agl-ptest.md*
+
diff --git a/templates/feature/agl-refhw-h3/50_bblayers.conf.inc b/templates/feature/agl-refhw-h3/50_bblayers.conf.inc
new file mode 100644
index 000000000..7aee6eac5
--- /dev/null
+++ b/templates/feature/agl-refhw-h3/50_bblayers.conf.inc
@@ -0,0 +1,3 @@
+BBLAYERS =+ "\
+ ${METADIR}/bsp/meta-agl-refhw/meta-agl-refhw-gen3 \
+ "
diff --git a/templates/feature/agl-refhw-h3/50_local.conf.inc b/templates/feature/agl-refhw-h3/50_local.conf.inc
new file mode 100644
index 000000000..dc39dd52a
--- /dev/null
+++ b/templates/feature/agl-refhw-h3/50_local.conf.inc
@@ -0,0 +1,2 @@
+#see meta-agl/meta-agl-bsp/conf/include/agl_refhw-h3.inc
+require conf/include/agl_refhw-h3.inc
diff --git a/templates/feature/agl-refhw-h3/README_feature_agl-refhw-h3.md b/templates/feature/agl-refhw-h3/README_feature_agl-refhw-h3.md
new file mode 100644
index 000000000..57720bef1
--- /dev/null
+++ b/templates/feature/agl-refhw-h3/README_feature_agl-refhw-h3.md
@@ -0,0 +1,8 @@
+---
+description: AGL H3-based reference hardware support
+authors: Scott Murray <scott.murray@konsulko.com>
+---
+
+### Feature agl-refhw-h3
+
+Enable support for AGL H3-based reference hardware. Should only be used with "h3ulcb" or "h3ulcb-nogfx" machine types.
diff --git a/templates/feature/agl-selinux/50_bblayers.conf.inc b/templates/feature/agl-selinux/50_bblayers.conf.inc
new file mode 100644
index 000000000..392b70099
--- /dev/null
+++ b/templates/feature/agl-selinux/50_bblayers.conf.inc
@@ -0,0 +1,8 @@
+AGL_META_PYTHON = "${METADIR}/external/meta-openembedded/meta-python"
+
+# Needed to satisfy uutils-coreutils DEPENDS when using SELinux
+AGL_META_CLANG = "${METADIR}/external/meta-clang"
+
+BBLAYERS =+ " \
+ ${METADIR}/external/meta-selinux \
+ "
diff --git a/templates/feature/agl-selinux/50_local.conf.inc b/templates/feature/agl-selinux/50_local.conf.inc
new file mode 100644
index 000000000..4aaac2d14
--- /dev/null
+++ b/templates/feature/agl-selinux/50_local.conf.inc
@@ -0,0 +1,2 @@
+#see meta-agl/meta-agl/conf/include/agl-selinux.inc
+require conf/include/agl-selinux.inc
diff --git a/templates/feature/agl-selinux/README_feature_agl-selinux.md b/templates/feature/agl-selinux/README_feature_agl-selinux.md
new file mode 100644
index 000000000..c48ce06b0
--- /dev/null
+++ b/templates/feature/agl-selinux/README_feature_agl-selinux.md
@@ -0,0 +1,9 @@
+---
+description: Feature agl-selinux
+authors: Scott Murray <scott.murray@konsulko.com>
+---
+
+### Feature agl-selinux
+
+Enables building with SELinux enabled, with the default mode
+being permissive.
diff --git a/templates/feature/agl-sota/50_bblayers.conf.inc b/templates/feature/agl-sota/50_bblayers.conf.inc
deleted file mode 100644
index bdcf07605..000000000
--- a/templates/feature/agl-sota/50_bblayers.conf.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-BBLAYERS =+ " \
- ${METADIR}/meta-updater \
- ${METADIR}/meta-openembedded/meta-filesystems \
- ${METADIR}/meta-openembedded/meta-python \
- ${METADIR}/meta-openembedded/meta-ruby \
- ${METADIR}/meta-rust \
- "
-
diff --git a/templates/feature/agl-sota/50_local.conf.inc b/templates/feature/agl-sota/50_local.conf.inc
deleted file mode 100644
index 42ff6bc1c..000000000
--- a/templates/feature/agl-sota/50_local.conf.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-#see meta-updater/conf/distro/sota.conf.inc
-require conf/distro/sota.conf.inc
diff --git a/templates/feature/agl-virt-guest-xen/50_local.conf.inc b/templates/feature/agl-virt-guest-xen/50_local.conf.inc
new file mode 100644
index 000000000..07950559e
--- /dev/null
+++ b/templates/feature/agl-virt-guest-xen/50_local.conf.inc
@@ -0,0 +1,3 @@
+# Set Xen flag
+
+AGL_XEN_GUEST_WANTED = "1"
diff --git a/templates/feature/agl-virt-xen/50_local.conf.inc b/templates/feature/agl-virt-xen/50_local.conf.inc
new file mode 100644
index 000000000..48f4b2b7d
--- /dev/null
+++ b/templates/feature/agl-virt-xen/50_local.conf.inc
@@ -0,0 +1,3 @@
+# Set Xen flag
+
+AGL_XEN_WANTED = "1"
diff --git a/templates/feature/agl-virt-xen/included.dep b/templates/feature/agl-virt-xen/included.dep
new file mode 100644
index 000000000..e4acef2bf
--- /dev/null
+++ b/templates/feature/agl-virt-xen/included.dep
@@ -0,0 +1 @@
+agl-virt
diff --git a/templates/feature/agl-virt/50_bblayers.conf.inc b/templates/feature/agl-virt/50_bblayers.conf.inc
new file mode 100644
index 000000000..65dc19580
--- /dev/null
+++ b/templates/feature/agl-virt/50_bblayers.conf.inc
@@ -0,0 +1,5 @@
+AGL_META_PYTHON = "${METADIR}/external/meta-openembedded/meta-python"
+AGL_META_NETWORKING = "${METADIR}/external/meta-openembedded/meta-networking"
+AGL_META_FILESYSTEMS = "${METADIR}/external/meta-openembedded/meta-filesystems"
+AGL_META_VIRTUALIZATION = "${METADIR}/external/meta-virtualization"
+
diff --git a/templates/feature/agl-virt/50_local.conf.inc b/templates/feature/agl-virt/50_local.conf.inc
new file mode 100644
index 000000000..8a7e44a71
--- /dev/null
+++ b/templates/feature/agl-virt/50_local.conf.inc
@@ -0,0 +1,3 @@
+# meta-virtualization needs the "virtualization in DISTRO_FEATURES
+
+DISTRO_FEATURES:append = " virtualization"
diff --git a/templates/feature/agl-weston-remoting/50_local.conf.inc b/templates/feature/agl-weston-remoting/50_local.conf.inc
new file mode 100644
index 000000000..63e0a984a
--- /dev/null
+++ b/templates/feature/agl-weston-remoting/50_local.conf.inc
@@ -0,0 +1 @@
+DISTRO_FEATURES:append = " weston-remoting"
diff --git a/templates/feature/agl-weston-remoting/README_feature_agl-weston-remoting.md b/templates/feature/agl-weston-remoting/README_feature_agl-weston-remoting.md
new file mode 100644
index 000000000..03b05d496
--- /dev/null
+++ b/templates/feature/agl-weston-remoting/README_feature_agl-weston-remoting.md
@@ -0,0 +1,9 @@
+---
+description: Feature agl-weston-remoting
+authors: Scott Murray <scott.murray@konsulko.com>
+---
+
+### Feature agl-weston-remoting
+
+Enables secondary remote display configuration using Weston's remoting feaure.
+
diff --git a/templates/feature/agl-weston-remoting/included.dep b/templates/feature/agl-weston-remoting/included.dep
new file mode 100644
index 000000000..82639da07
--- /dev/null
+++ b/templates/feature/agl-weston-remoting/included.dep
@@ -0,0 +1 @@
+agl-demo
diff --git a/templates/machine/am62xx-evm/50_bblayers.conf.inc b/templates/machine/am62xx-evm/50_bblayers.conf.inc
new file mode 100644
index 000000000..6ef08c43e
--- /dev/null
+++ b/templates/machine/am62xx-evm/50_bblayers.conf.inc
@@ -0,0 +1,5 @@
+BBLAYERS =+ "\
+ ${METADIR}/bsp/meta-arm/meta-arm \
+ ${METADIR}/bsp/meta-arm/meta-arm-toolchain \
+ ${METADIR}/bsp/meta-ti/meta-ti-bsp \
+ "
diff --git a/templates/machine/am62xx-evm/50_local.conf.inc b/templates/machine/am62xx-evm/50_local.conf.inc
new file mode 100644
index 000000000..782d11a76
--- /dev/null
+++ b/templates/machine/am62xx-evm/50_local.conf.inc
@@ -0,0 +1,3 @@
+MACHINE = "am62xx-evm"
+#see meta-agl/meta-agl-bsp/conf/include/agl_am62xx-evm.inc
+require conf/include/agl_am62xx-evm.inc
diff --git a/templates/machine/aws-ec2-arm64/50_bblayers.conf.inc b/templates/machine/aws-ec2-arm64/50_bblayers.conf.inc
new file mode 100644
index 000000000..4e619cde0
--- /dev/null
+++ b/templates/machine/aws-ec2-arm64/50_bblayers.conf.inc
@@ -0,0 +1,8 @@
+AGL_META_PYTHON = "${METADIR}/external/meta-openembedded/meta-python"
+AGL_META_MULTIMEDIA = "${METADIR}/external/meta-openembedded/meta-multimedia"
+AGL_META_NETWORKING = "${METADIR}/external/meta-openembedded/meta-networking"
+AGL_META_VIRTUALIZATION = "${METADIR}/external/meta-virtualization"
+
+BBLAYERS =+ "\
+ ${METADIR}/bsp/meta-aws \
+ "
diff --git a/templates/machine/aws-ec2-arm64/50_local.conf.inc b/templates/machine/aws-ec2-arm64/50_local.conf.inc
new file mode 100644
index 000000000..ca20e0bf2
--- /dev/null
+++ b/templates/machine/aws-ec2-arm64/50_local.conf.inc
@@ -0,0 +1,21 @@
+MACHINE = "aws-ec2-arm64"
+
+VIRTUAL-RUNTIME_initscripts = "systemd-compat-units"
+IMAGE_INSTALL:append = " cloud-init"
+DISTRO_FEATURES:append = " virtualization"
+
+
+# can we shuffle this out so CI still works
+INHERIT += "extrausers"
+# Hardening: Locking the root password. Creating the user without password for ssh key-based login only
+EXTRA_USERS_PARAMS = "usermod -L root; useradd -p '*' user"
+
+EXTRA_IMAGE_FEATURES:append = " ssh-server-openssh"
+
+# Forcing removal of debug-tweakes as that leads to reversing some sshd_config hardening done in our bbappend when do_rootfs runs
+EXTRA_IMAGE_FEATURES:remove = "debug-tweaks"
+
+AGL_DEFAULT_IMAGE_FSTYPES := "wic.vhd"
+
+# workaround bug in cloud-init leading to empty cloud-init-systemd package
+PACKAGES:pn-cloud-init:forcevariable = "cloud-init-src cloud-init-dbg cloud-init-staticdev cloud-init-dev cloud-init-doc cloud-init-locale cloud-init-systemd cloud-init"
diff --git a/templates/machine/aws-ec2-x86-64/50_bblayers.conf.inc b/templates/machine/aws-ec2-x86-64/50_bblayers.conf.inc
new file mode 100644
index 000000000..4e619cde0
--- /dev/null
+++ b/templates/machine/aws-ec2-x86-64/50_bblayers.conf.inc
@@ -0,0 +1,8 @@
+AGL_META_PYTHON = "${METADIR}/external/meta-openembedded/meta-python"
+AGL_META_MULTIMEDIA = "${METADIR}/external/meta-openembedded/meta-multimedia"
+AGL_META_NETWORKING = "${METADIR}/external/meta-openembedded/meta-networking"
+AGL_META_VIRTUALIZATION = "${METADIR}/external/meta-virtualization"
+
+BBLAYERS =+ "\
+ ${METADIR}/bsp/meta-aws \
+ "
diff --git a/templates/machine/aws-ec2-x86-64/50_local.conf.inc b/templates/machine/aws-ec2-x86-64/50_local.conf.inc
new file mode 100644
index 000000000..58b4b087d
--- /dev/null
+++ b/templates/machine/aws-ec2-x86-64/50_local.conf.inc
@@ -0,0 +1,21 @@
+MACHINE = "aws-ec2-x86-64"
+
+VIRTUAL-RUNTIME_initscripts = "systemd-compat-units"
+IMAGE_INSTALL:append = " cloud-init"
+DISTRO_FEATURES:append = " virtualization"
+
+
+# can we shuffle this out so CI still works
+INHERIT += "extrausers"
+# Hardening: Locking the root password. Creating the user without password for ssh key-based login only
+EXTRA_USERS_PARAMS = "usermod -L root; useradd -p '*' user"
+
+EXTRA_IMAGE_FEATURES:append = " ssh-server-openssh"
+
+# Forcing removal of debug-tweakes as that leads to reversing some sshd_config hardening done in our bbappend when do_rootfs runs
+EXTRA_IMAGE_FEATURES:remove = "debug-tweaks"
+
+AGL_DEFAULT_IMAGE_FSTYPES := "wic.vhd"
+
+# workaround bug in cloud-init leading to empty cloud-init-systemd package
+PACKAGES:pn-cloud-init:forcevariable = "cloud-init-src cloud-init-dbg cloud-init-staticdev cloud-init-dev cloud-init-doc cloud-init-locale cloud-init-systemd cloud-init"
diff --git a/templates/machine/bbe/50_bblayers.conf.inc b/templates/machine/bbe/50_bblayers.conf.inc
new file mode 100644
index 000000000..c94c1db8f
--- /dev/null
+++ b/templates/machine/bbe/50_bblayers.conf.inc
@@ -0,0 +1,7 @@
+BBLAYERS =+ " \
+ ${METADIR}/bsp/meta-arm/meta-arm \
+ ${METADIR}/bsp/meta-arm/meta-arm-toolchain \
+ ${METADIR}/bsp/meta-ti/meta-ti-bsp \
+ ${METADIR}/bsp/meta-sancloud \
+ ${METADIR}/bsp/meta-rtlwifi \
+ "
diff --git a/templates/machine/bbe/50_local.conf.inc b/templates/machine/bbe/50_local.conf.inc
new file mode 100644
index 000000000..7f378e5cb
--- /dev/null
+++ b/templates/machine/bbe/50_local.conf.inc
@@ -0,0 +1,2 @@
+MACHINE = "bbe"
+require conf/include/agl_bbe.inc
diff --git a/templates/machine/bbe/README_machine_bbe.md b/templates/machine/bbe/README_machine_bbe.md
new file mode 100644
index 000000000..3161a0195
--- /dev/null
+++ b/templates/machine/bbe/README_machine_bbe.md
@@ -0,0 +1,12 @@
+---
+description: SanCloud BeagleBone Enhanced (BBE)
+authors: SanCloud Ltd <yocto@sancloud.co.uk>
+---
+
+### 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/templates/machine/beaglebone-ai64/50_bblayers.conf.inc b/templates/machine/beaglebone-ai64/50_bblayers.conf.inc
new file mode 100644
index 000000000..6ef08c43e
--- /dev/null
+++ b/templates/machine/beaglebone-ai64/50_bblayers.conf.inc
@@ -0,0 +1,5 @@
+BBLAYERS =+ "\
+ ${METADIR}/bsp/meta-arm/meta-arm \
+ ${METADIR}/bsp/meta-arm/meta-arm-toolchain \
+ ${METADIR}/bsp/meta-ti/meta-ti-bsp \
+ "
diff --git a/templates/machine/beaglebone-ai64/50_local.conf.inc b/templates/machine/beaglebone-ai64/50_local.conf.inc
new file mode 100644
index 000000000..80d4aac97
--- /dev/null
+++ b/templates/machine/beaglebone-ai64/50_local.conf.inc
@@ -0,0 +1,3 @@
+MACHINE = "beaglebone-ai64"
+#see meta-agl/meta-agl-bsp/conf/include/agl_beaglebone-ai64.inc
+require conf/include/agl_beaglebone-ai64.inc
diff --git a/templates/machine/beaglebone-ai64/README_machine_beaglebone-ai64.md b/templates/machine/beaglebone-ai64/README_machine_beaglebone-ai64.md
new file mode 100644
index 000000000..7edf758a5
--- /dev/null
+++ b/templates/machine/beaglebone-ai64/README_machine_beaglebone-ai64.md
@@ -0,0 +1,9 @@
+---
+description: Machine beaglebone-ai64
+authors: Denys Dmytriyenko <denys@konsulko.com>
+---
+
+### Machine beaglebone-ai64
+
+BeagleBoard.org BeagleBone AI-64 (uses Texas Instruments J721e/TDA4VM SoC).
+
diff --git a/templates/machine/beaglebone/50_bblayers.conf.inc b/templates/machine/beaglebone/50_bblayers.conf.inc
index c62a1bbb3..6ef08c43e 100644
--- a/templates/machine/beaglebone/50_bblayers.conf.inc
+++ b/templates/machine/beaglebone/50_bblayers.conf.inc
@@ -1 +1,5 @@
-BBLAYERS =+ "${METADIR}/meta-ti"
+BBLAYERS =+ "\
+ ${METADIR}/bsp/meta-arm/meta-arm \
+ ${METADIR}/bsp/meta-arm/meta-arm-toolchain \
+ ${METADIR}/bsp/meta-ti/meta-ti-bsp \
+ "
diff --git a/templates/machine/beaglebone/README_machine_beaglebone.md b/templates/machine/beaglebone/README_machine_beaglebone.md
new file mode 100644
index 000000000..06fbcee2f
--- /dev/null
+++ b/templates/machine/beaglebone/README_machine_beaglebone.md
@@ -0,0 +1,9 @@
+---
+description: Machine beaglebone
+authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
+---
+
+### Machine beaglebone
+
+*Description is missing - please complete file meta-agl/templates/machine/beaglebone/README_machine_beaglebone.md*
+
diff --git a/templates/machine/beagleplay/50_bblayers.conf.inc b/templates/machine/beagleplay/50_bblayers.conf.inc
new file mode 100644
index 000000000..6ef08c43e
--- /dev/null
+++ b/templates/machine/beagleplay/50_bblayers.conf.inc
@@ -0,0 +1,5 @@
+BBLAYERS =+ "\
+ ${METADIR}/bsp/meta-arm/meta-arm \
+ ${METADIR}/bsp/meta-arm/meta-arm-toolchain \
+ ${METADIR}/bsp/meta-ti/meta-ti-bsp \
+ "
diff --git a/templates/machine/beagleplay/50_local.conf.inc b/templates/machine/beagleplay/50_local.conf.inc
new file mode 100644
index 000000000..334f81819
--- /dev/null
+++ b/templates/machine/beagleplay/50_local.conf.inc
@@ -0,0 +1,3 @@
+MACHINE = "beagleplay"
+#see meta-agl/meta-agl-bsp/conf/include/agl_beagleplay.inc
+require conf/include/agl_beagleplay.inc
diff --git a/templates/machine/beagleplay/README_machine_beagleplay.md b/templates/machine/beagleplay/README_machine_beagleplay.md
new file mode 100644
index 000000000..d4528fba2
--- /dev/null
+++ b/templates/machine/beagleplay/README_machine_beagleplay.md
@@ -0,0 +1,9 @@
+---
+description: Machine beagleplay
+authors: Denys Dmytriyenko <denys@konsulko.com>
+---
+
+### Machine beagleplay
+
+BeagleBoard.org BeaglePlay (uses Texas Instruments AM625x SoC).
+
diff --git a/templates/machine/imx6qsabreauto/40_bblayers.conf.inc b/templates/machine/cubox-i/40_bblayers.conf.inc
index f09144959..a4323be1a 100644
--- a/templates/machine/imx6qsabreauto/40_bblayers.conf.inc
+++ b/templates/machine/cubox-i/40_bblayers.conf.inc
@@ -1,7 +1,6 @@
# This must be parsed after qt5, etc. layers so that they are correctly
# recognized by meta-freescale/dynamic-layers
BBLAYERS =+ "\
- ${METADIR}/meta-freescale \
- ${METADIR}/meta-freescale-3rdparty \
- ${METADIR}/meta-freescale-distro \
+ ${METADIR}/bsp/meta-freescale \
+ ${METADIR}/bsp/meta-freescale-3rdparty \
"
diff --git a/templates/machine/cubox-i/50_local.conf.inc b/templates/machine/cubox-i/50_local.conf.inc
new file mode 100644
index 000000000..b0835bf6e
--- /dev/null
+++ b/templates/machine/cubox-i/50_local.conf.inc
@@ -0,0 +1,4 @@
+MACHINE = "cubox-i"
+#see meta-agl/meta-agl-bsp/conf/include/agl_cubox-i.inc
+require conf/include/agl_cubox-i.inc
+
diff --git a/templates/machine/cubox-i/50_setup.sh b/templates/machine/cubox-i/50_setup.sh
new file mode 100644
index 000000000..eefd1eb7f
--- /dev/null
+++ b/templates/machine/cubox-i/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/templates/machine/cubox-i/README_machine_cubox-i.md b/templates/machine/cubox-i/README_machine_cubox-i.md
new file mode 100644
index 000000000..2d264d5d8
--- /dev/null
+++ b/templates/machine/cubox-i/README_machine_cubox-i.md
@@ -0,0 +1,9 @@
+---
+description: Machine cubox-i
+authors: Scott Murray <scott.murray@konsulko.com>
+---
+
+### Machine cubox-i
+
+*Description is missing - please complete file meta-agl/templates/machine/cubox-i/README_machine_cubox-i.md*
+
diff --git a/templates/machine/cyclone5/50_bblayers.conf.inc b/templates/machine/cyclone5/50_bblayers.conf.inc
deleted file mode 100644
index fe60a267f..000000000
--- a/templates/machine/cyclone5/50_bblayers.conf.inc
+++ /dev/null
@@ -1 +0,0 @@
-BBLAYERS =+ "${METADIR}/meta-altera"
diff --git a/templates/machine/cyclone5/50_local.conf.inc b/templates/machine/cyclone5/50_local.conf.inc
deleted file mode 100644
index a4761ef4c..000000000
--- a/templates/machine/cyclone5/50_local.conf.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-MACHINE = "cyclone5"
-#see meta-agl/meta-agl-bsp/conf/include/agl_cyclone5.inc
-require conf/include/agl_cyclone5.inc
diff --git a/templates/machine/dra7xx-evm/50_bblayers.conf.inc b/templates/machine/dra7xx-evm/50_bblayers.conf.inc
deleted file mode 100644
index c62a1bbb3..000000000
--- a/templates/machine/dra7xx-evm/50_bblayers.conf.inc
+++ /dev/null
@@ -1 +0,0 @@
-BBLAYERS =+ "${METADIR}/meta-ti"
diff --git a/templates/machine/dra7xx-evm/50_local.conf.inc b/templates/machine/dra7xx-evm/50_local.conf.inc
deleted file mode 100644
index e43a4f294..000000000
--- a/templates/machine/dra7xx-evm/50_local.conf.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-MACHINE = "dra7xx-evm"
-#see meta-agl/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc
-require conf/include/agl_dra7xx-evm.inc
diff --git a/templates/machine/dra7xx-evm/test/hwtest.enable b/templates/machine/dra7xx-evm/test/hwtest.enable
deleted file mode 100644
index d00491fd7..000000000
--- a/templates/machine/dra7xx-evm/test/hwtest.enable
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/templates/machine/dra7xx-evm/test/hwtest.short.enable b/templates/machine/dra7xx-evm/test/hwtest.short.enable
deleted file mode 100644
index d00491fd7..000000000
--- a/templates/machine/dra7xx-evm/test/hwtest.short.enable
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/templates/machine/dra7xx-evm/test/hwtest.short.environment b/templates/machine/dra7xx-evm/test/hwtest.short.environment
deleted file mode 100644
index 2db9ab26e..000000000
--- a/templates/machine/dra7xx-evm/test/hwtest.short.environment
+++ /dev/null
@@ -1,11 +0,0 @@
-DEVICE_TYPE=ti-vayu-uboot
-DEVICE_NAME=dra7xx-evm
-DEVICE_DTB=zImage-dra7-evm-lcd-lg.dtb
-DEVICE_KERNEL=zImage
-DEVICE_INITRAMFS=initramfs-netboot-image-dra7xx-evm.ext4.gz
-DEVICE_NBDROOT=agl-demo-platform-dra7xx-evm.ext4.xz
-DEVICE_NBDROOT_COMPRESSION=xz
-DEVICE_BOOT_METHOD=u-boot
-DEVICE_BOOT_TYPE=bootz
-#DEVICE_URL_PREFIX=https://download.automotivelinux.org/AGL
-# \ No newline at end of file
diff --git a/templates/machine/dra7xx-evm/test/testjob_short.yaml b/templates/machine/dra7xx-evm/test/testjob_short.yaml
deleted file mode 100644
index 304cc8a6b..000000000
--- a/templates/machine/dra7xx-evm/test/testjob_short.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-# Your first LAVA JOB definition for a vayu board
-device_type: @REPLACE_DEVICE_TYPE@
-job_name: AGL-short-smoke
-
-protocols:
- lava-xnbd:
- port: auto
-
-timeouts:
- job:
- minutes: 30
- action:
- minutes: 15
- connection:
- minutes: 5
- bootloader-commands:
- minutes: 4
-priority: medium
-visibility: public
-
-# ACTION_BLOCK
-actions:
-- deploy:
- timeout:
- minutes: 15
- to: nbd
- dtb:
- url: '@REPLACE_URL_PREFIX@/@REPLACE_DTB@'
- kernel:
- url: '@REPLACE_URL_PREFIX@/@REPLACE_KERNEL@'
- initrd:
- url: '@REPLACE_URL_PREFIX@/@REPLACE_INITRAMFS@'
- allow_modify: false
- nbdroot:
- url: '@REPLACE_URL_PREFIX@/@REPLACE_NBDROOT@'
- compression: @REPLACE_NBDROOT_COMPRESSION@
- os: debian
- failure_retry: 2
-
-# BOOT_BLOCK
-- boot:
- method: @REPLACE_BOOT_METHOD@
- commands: nbd
- type: @REPLACE_BOOT_TYPE@
- prompts: ["root@@REPLACE_MACHINE@:~"]
- auto_login:
- login_prompt: "login:"
- username: root
- failure_retry: 2
-
-
diff --git a/templates/machine/dragonboard-410c/50_bblayers.conf.inc b/templates/machine/dragonboard-410c/50_bblayers.conf.inc
deleted file mode 100644
index 01ffb7f17..000000000
--- a/templates/machine/dragonboard-410c/50_bblayers.conf.inc
+++ /dev/null
@@ -1 +0,0 @@
-BBLAYERS =+ "${METADIR}/meta-qcom"
diff --git a/templates/machine/dragonboard-410c/50_local.conf.inc b/templates/machine/dragonboard-410c/50_local.conf.inc
deleted file mode 100644
index f717fd8ee..000000000
--- a/templates/machine/dragonboard-410c/50_local.conf.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-MACHINE = "dragonboard-410c"
-#see meta-agl/meta-agl-bsp/conf/include/agl_dragonboard-410c.inc
-require conf/include/agl_dragonboard-410c.inc
diff --git a/templates/machine/dragonboard-410c/50_setup.sh b/templates/machine/dragonboard-410c/50_setup.sh
deleted file mode 100644
index 7be1dad32..000000000
--- a/templates/machine/dragonboard-410c/50_setup.sh
+++ /dev/null
@@ -1 +0,0 @@
-find_and_ack_eula $METADIR/meta-qcom
diff --git a/templates/machine/ebisu/50_bblayers.conf.inc b/templates/machine/ebisu/50_bblayers.conf.inc
new file mode 100644
index 000000000..e06bd413d
--- /dev/null
+++ b/templates/machine/ebisu/50_bblayers.conf.inc
@@ -0,0 +1,4 @@
+BBLAYERS =+ "\
+ ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
+ ${METADIR}/external/poky/meta-yocto-bsp \
+ "
diff --git a/templates/machine/ebisu/50_local.conf.inc b/templates/machine/ebisu/50_local.conf.inc
new file mode 100644
index 000000000..c62dec4ae
--- /dev/null
+++ b/templates/machine/ebisu/50_local.conf.inc
@@ -0,0 +1,3 @@
+MACHINE = "ebisu"
+#see meta-agl/meta-agl-bsp/conf/include/agl_ebisu.inc
+require conf/include/agl_ebisu.inc
diff --git a/templates/machine/ebisu/50_setup.sh b/templates/machine/ebisu/50_setup.sh
new file mode 100644
index 000000000..188da6e5e
--- /dev/null
+++ b/templates/machine/ebisu/50_setup.sh
@@ -0,0 +1,45 @@
+# setup proprietary gfx drivers and multimedia packages
+pushd $METADIR 2>/dev/null
+
+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.
+
+# Check the ebisu binaries path
+if [[ ! -d $EBISU_BIN_PATH ]] || [[ $EBISU_BIN_PATH == "" ]]; then
+ echo "ERROR: E3 Binary path not valid."
+ echo "HELP: Export the path where the E3 Binaries ZIP file is into 'EBISU_BIN_PATH' then launch the setup again."
+ echo "HELP: Example: '$ export EBISU_BIN_PATH=`pwd`/ebisu_binaries'"
+ exit 1
+else
+ [ -z "$(ls -A $EBISU_BIN_PATH)" ] && echo "ERROR: $EBISU_BIN_PATH is empty. Add the E3 Binaries ZIP file inside and try again." && exit 1
+fi
+
+if [ -f $COPY_SCRIPT ]; then
+ # Extract the ZIP into the tmp directory
+ mkdir -p $EXTRACT_DIR
+ for PROPRIETARY_BIN in `ls -1 $EBISU_BIN_PATH/*.zip`
+ do
+ unzip -q -o $PROPRIETARY_BIN -d $EXTRACT_DIR
+ done
+
+ cd $METADIR/bsp/meta-renesas/
+ $COPY_SCRIPT $EXTRACT_DIR
+ cd ..
+
+ # Clean temp dir
+ rm -r $EXTRACT_DIR
+else
+ echo "ERROR: Script to copy Renesas proprietary drivers for $MACHINE not found. No additionnal setup to do."
+ exit 1
+fi
+
+if [[ ! -z $CUSTOM_RENESAS_CONFIG_SCRIPT ]] && [[ -f $CUSTOM_RENESAS_CONFIG_SCRIPT ]]; then
+ echo "Launching Renesas custom setup script ($CUSTOM_RENESAS_CONFIG_SCRIPT)..."
+ $CUSTOM_RENESAS_CONFIG_SCRIPT
+else
+ echo "WARNING: Renesas custom setup script for $MACHINE not found."
+fi
+
+popd 2>/dev/null
diff --git a/templates/machine/ebisu/README_machine_ebisu.md b/templates/machine/ebisu/README_machine_ebisu.md
new file mode 100644
index 000000000..eb5666ecc
--- /dev/null
+++ b/templates/machine/ebisu/README_machine_ebisu.md
@@ -0,0 +1,44 @@
+---
+description: machine ebisu
+author: <undefined>
+---
+## Machine 'ebisu'
+
+### Prepare the build
+
+Before building the AGL distribution for Renesas 'ebisu' board, it is necessary to prepare the environnement. See [AGL Doc - Initializing Your Build Environment](https://docs.automotivelinux.org/docs/en/master/getting_started/reference/getting-started/image-workflow-initialize-build-environment.html) before going to the next step.
+
+The 'ebisu' board need some specifics binaries in order to build. These binaries contain Graphics support, specific drivers... They are only delivered by Renesas.
+Before setting up the build with `meta-agl/scripts/aglsetup.sh`, the environment variable `EBISU_BIN_PATH` need to be set. This variable specify the path to a folder which contains all ebisu's binaries zip files.
+
+Moreover, it's possible to launch a custom bash script during the setup. This optional step will be called at the end of the `aglsetup.sh` sequence. This can be used to add a specific configuration to the official setup or add a hotfix.
+
+Example:
+```bash
+$ cd $AGL_TOP
+$ export EBISU_BIN_PATH=/home/user/Downloads/ebisu_binaries
+$ export CUSTOM_RENESAS_CONFIG_SCRIPT=/path/to/my/Renesas_custom_setup_ebisu.sh #optional
+$ source meta-agl/scripts/aglsetup.sh -m ebisu agl-demo -f
+```
+
+### Launch the build
+
+When your environnment is ready, you can launch the AGL build with `bitbake` :
+
+```bash
+$ cd $AGL_TOP
+$ bitbake agl-demo-platform
+```
+
+### Debugging the board
+
+To debug the ebisu board, the PC should be connected to the CN25 USB serial port.
+And the serial communication's protocol of the terminal software on the PC should be set as follows:
+
+Parameter | Value
+--- | ---
+Transfer rate | 115200 bps
+Data length | 8 bits
+Parity | Not in use
+Stop bit | 1 bit
+Flow control | Not provided
diff --git a/templates/machine/generic-arm64/50_bblayers.conf.inc b/templates/machine/generic-arm64/50_bblayers.conf.inc
new file mode 100644
index 000000000..05e60f69b
--- /dev/null
+++ b/templates/machine/generic-arm64/50_bblayers.conf.inc
@@ -0,0 +1,4 @@
+BBLAYERS =+ "\
+ ${METADIR}/bsp/meta-arm/meta-arm \
+ ${METADIR}/bsp/meta-arm/meta-arm-toolchain \
+ "
diff --git a/templates/machine/generic-arm64/50_local.conf.inc b/templates/machine/generic-arm64/50_local.conf.inc
new file mode 100644
index 000000000..3918af8dd
--- /dev/null
+++ b/templates/machine/generic-arm64/50_local.conf.inc
@@ -0,0 +1,2 @@
+MACHINE = "generic-arm64"
+
diff --git a/templates/machine/generic-arm64/README_machine_generic-arm64.md b/templates/machine/generic-arm64/README_machine_generic-arm64.md
new file mode 100644
index 000000000..22dcb1fec
--- /dev/null
+++ b/templates/machine/generic-arm64/README_machine_generic-arm64.md
@@ -0,0 +1,10 @@
+---
+description: Machine generic-arm64
+authors: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
+---
+
+### Machine generic-arm64
+
+This is a standard aarch64 (ARM 64bit) machine for use with 'SystemReady'
+(aka UEFI) systems.
+
diff --git a/templates/machine/h3-salvator-x/50_bblayers.conf.inc b/templates/machine/h3-salvator-x/50_bblayers.conf.inc
new file mode 100644
index 000000000..e06bd413d
--- /dev/null
+++ b/templates/machine/h3-salvator-x/50_bblayers.conf.inc
@@ -0,0 +1,4 @@
+BBLAYERS =+ "\
+ ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
+ ${METADIR}/external/poky/meta-yocto-bsp \
+ "
diff --git a/templates/machine/h3-salvator-x/50_local.conf.inc b/templates/machine/h3-salvator-x/50_local.conf.inc
new file mode 100644
index 000000000..05cca9743
--- /dev/null
+++ b/templates/machine/h3-salvator-x/50_local.conf.inc
@@ -0,0 +1,4 @@
+MACHINE = "salvator-x"
+#see meta-agl/meta-agl-bsp/conf/include/agl_h3-salvator-x.inc
+require conf/include/agl_h3-salvator-x.inc
+
diff --git a/templates/machine/h3-salvator-x/50_setup.sh b/templates/machine/h3-salvator-x/50_setup.sh
new file mode 100644
index 000000000..abd2a33af
--- /dev/null
+++ b/templates/machine/h3-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/templates/machine/h3-salvator-x/README_machine_h3-salvator-x.md b/templates/machine/h3-salvator-x/README_machine_h3-salvator-x.md
new file mode 100644
index 000000000..9cd793f7a
--- /dev/null
+++ b/templates/machine/h3-salvator-x/README_machine_h3-salvator-x.md
@@ -0,0 +1,11 @@
+---
+description: Machine h3-salvator-x
+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
+
+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/templates/machine/h3ulcb-kf/50_bblayers.conf.inc b/templates/machine/h3ulcb-kf/50_bblayers.conf.inc
new file mode 100644
index 000000000..25e36b019
--- /dev/null
+++ b/templates/machine/h3ulcb-kf/50_bblayers.conf.inc
@@ -0,0 +1,5 @@
+BBLAYERS =+ "\
+ ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
+ ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \
+ ${METADIR}/external/poky/meta-yocto-bsp \
+ "
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..cdef9afa8
--- /dev/null
+++ b/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/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc b/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc
new file mode 100644
index 000000000..e06bd413d
--- /dev/null
+++ b/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc
@@ -0,0 +1,4 @@
+BBLAYERS =+ "\
+ ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
+ ${METADIR}/external/poky/meta-yocto-bsp \
+ "
diff --git a/templates/machine/h3ulcb-nogfx/50_local.conf.inc b/templates/machine/h3ulcb-nogfx/50_local.conf.inc
new file mode 100644
index 000000000..2f7cd6b35
--- /dev/null
+++ b/templates/machine/h3ulcb-nogfx/50_local.conf.inc
@@ -0,0 +1,3 @@
+MACHINE = "h3ulcb"
+#see meta-agl/meta-agl-bsp/conf/include/agl_h3ulcb-nogfx.inc
+require conf/include/agl_h3ulcb-nogfx.inc
diff --git a/templates/machine/h3ulcb-nogfx/README_machine_h3ulcb-nogfx.md b/templates/machine/h3ulcb-nogfx/README_machine_h3ulcb-nogfx.md
new file mode 100644
index 000000000..a1f3b9f61
--- /dev/null
+++ b/templates/machine/h3ulcb-nogfx/README_machine_h3ulcb-nogfx.md
@@ -0,0 +1,11 @@
+---
+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
+
+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/templates/machine/h3ulcb/50_bblayers.conf.inc b/templates/machine/h3ulcb/50_bblayers.conf.inc
index b58989c6f..e06bd413d 100644
--- a/templates/machine/h3ulcb/50_bblayers.conf.inc
+++ b/templates/machine/h3ulcb/50_bblayers.conf.inc
@@ -1,3 +1,4 @@
BBLAYERS =+ "\
- ${METADIR}/meta-renesas-rcar-gen3/meta-rcar-gen3 \
+ ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
+ ${METADIR}/external/poky/meta-yocto-bsp \
"
diff --git a/templates/machine/h3ulcb/README_machine_h3ulcb.md b/templates/machine/h3ulcb/README_machine_h3ulcb.md
new file mode 100644
index 000000000..fffad09b2
--- /dev/null
+++ b/templates/machine/h3ulcb/README_machine_h3ulcb.md
@@ -0,0 +1,11 @@
+---
+description: Machine h3ulcb
+authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Ronan Le Martret <ronan.lemartret@iot.bzh>
+---
+
+### Machine h3ulcb
+
+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/templates/machine/imx6qdlsabreauto/40_bblayers.conf.inc b/templates/machine/imx6qdlsabreauto/40_bblayers.conf.inc
new file mode 100644
index 000000000..edcb6a3a2
--- /dev/null
+++ b/templates/machine/imx6qdlsabreauto/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/templates/machine/imx6qdlsabreauto/50_local.conf.inc b/templates/machine/imx6qdlsabreauto/50_local.conf.inc
new file mode 100644
index 000000000..58e3c7d02
--- /dev/null
+++ b/templates/machine/imx6qdlsabreauto/50_local.conf.inc
@@ -0,0 +1,4 @@
+MACHINE = "imx6qdlsabreauto"
+#see meta-agl/meta-agl-bsp/conf/include/agl_imx6qsabreauto.inc
+require conf/include/agl_imx6qdlsabreauto.inc
+
diff --git a/templates/machine/imx6qdlsabreauto/50_setup.sh b/templates/machine/imx6qdlsabreauto/50_setup.sh
new file mode 100644
index 000000000..eefd1eb7f
--- /dev/null
+++ b/templates/machine/imx6qdlsabreauto/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/templates/machine/imx6qdlsabreauto/README_machine_imx6qdlsabreauto.md b/templates/machine/imx6qdlsabreauto/README_machine_imx6qdlsabreauto.md
new file mode 100644
index 000000000..6b354e9fa
--- /dev/null
+++ b/templates/machine/imx6qdlsabreauto/README_machine_imx6qdlsabreauto.md
@@ -0,0 +1,9 @@
+---
+description: Machine imx6qdlsabreauto
+authors: Bechir Mghirbi <bechir.mghirbi@grammer.com>, Jan-Simon Möller <jsmoeller@linuxfoundation.org>
+---
+
+### Machine imx6qdlsabreauto
+
+*Description is missing - please complete file meta-agl/templates/machine/imx6qdlsabreauto/README_machine_imx6qdlsabreauto.md*
+
diff --git a/templates/machine/imx6qsabreauto/50_local.conf.inc b/templates/machine/imx6qsabreauto/50_local.conf.inc
deleted file mode 100644
index cbfda6a86..000000000
--- a/templates/machine/imx6qsabreauto/50_local.conf.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-MACHINE = "imx6qsabreauto"
-#see meta-agl/meta-agl-bsp/conf/include/agl_imx6qsabreauto.inc
-require conf/include/agl_imx6qsabreauto.inc
-
diff --git a/templates/machine/imx6qsabreauto/50_setup.sh b/templates/machine/imx6qsabreauto/50_setup.sh
deleted file mode 100644
index bb22790dc..000000000
--- a/templates/machine/imx6qsabreauto/50_setup.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-find_and_ack_eula $METADIR/meta-freescale EULA
-export EULA_FLAG_NAME="ACCEPT_FSL_EULA"
diff --git a/templates/machine/imx6qsabrelite/50_bblayers.conf.inc b/templates/machine/imx6qsabrelite/50_bblayers.conf.inc
deleted file mode 100644
index 0198eb464..000000000
--- a/templates/machine/imx6qsabrelite/50_bblayers.conf.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-BBLAYERS =+ "\
- ${METADIR}/meta-fsl-arm \
- ${METADIR}/meta-fsl-arm-extra \
- "
diff --git a/templates/machine/imx6qsabrelite/50_local.conf.inc b/templates/machine/imx6qsabrelite/50_local.conf.inc
deleted file mode 100644
index 83754d860..000000000
--- a/templates/machine/imx6qsabrelite/50_local.conf.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-MACHINE = "imx6qsabrelite"
-
diff --git a/templates/machine/imx6qsabrelite/50_setup.sh b/templates/machine/imx6qsabrelite/50_setup.sh
deleted file mode 100644
index ea340a763..000000000
--- a/templates/machine/imx6qsabrelite/50_setup.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-find_and_ack_eula $METADIR/meta-fsl-arm EULA
-export EULA_FLAG_NAME="ACCEPT_FSL_EULA"
diff --git a/templates/machine/imx8mq-evk-viv/40_bblayers.conf.inc b/templates/machine/imx8mq-evk-viv/40_bblayers.conf.inc
new file mode 100644
index 000000000..edcb6a3a2
--- /dev/null
+++ b/templates/machine/imx8mq-evk-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/templates/machine/imx8mq-evk-viv/50_local.conf.inc b/templates/machine/imx8mq-evk-viv/50_local.conf.inc
new file mode 100644
index 000000000..7504c1120
--- /dev/null
+++ b/templates/machine/imx8mq-evk-viv/50_local.conf.inc
@@ -0,0 +1,3 @@
+MACHINE = "imx8mq-evk"
+#see meta-agl/meta-agl-bsp/conf/include/agl_imx8mq-evk-viv.inc
+require conf/include/agl_imx8mq-evk-viv.inc
diff --git a/templates/machine/imx8mq-evk-viv/50_setup.sh b/templates/machine/imx8mq-evk-viv/50_setup.sh
new file mode 100644
index 000000000..eefd1eb7f
--- /dev/null
+++ b/templates/machine/imx8mq-evk-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/templates/machine/imx8mq-evk-viv/README_machine_imx8mq-evk-viv.md b/templates/machine/imx8mq-evk-viv/README_machine_imx8mq-evk-viv.md
new file mode 100644
index 000000000..be30e00fe
--- /dev/null
+++ b/templates/machine/imx8mq-evk-viv/README_machine_imx8mq-evk-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/templates/machine/imx8mq-evk/40_bblayers.conf.inc b/templates/machine/imx8mq-evk/40_bblayers.conf.inc
new file mode 100644
index 000000000..edcb6a3a2
--- /dev/null
+++ b/templates/machine/imx8mq-evk/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/templates/machine/imx8mq-evk/50_local.conf.inc b/templates/machine/imx8mq-evk/50_local.conf.inc
new file mode 100644
index 000000000..8a178e28b
--- /dev/null
+++ b/templates/machine/imx8mq-evk/50_local.conf.inc
@@ -0,0 +1,3 @@
+MACHINE = "imx8mq-evk"
+#see meta-agl/meta-agl-bsp/conf/include/agl_imx8mq-evk.inc
+require conf/include/agl_imx8mq-evk.inc
diff --git a/templates/machine/imx8mq-evk/50_setup.sh b/templates/machine/imx8mq-evk/50_setup.sh
new file mode 100644
index 000000000..eefd1eb7f
--- /dev/null
+++ b/templates/machine/imx8mq-evk/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/templates/machine/imx8mq-evk/README_machine_imx8mq-evk.md b/templates/machine/imx8mq-evk/README_machine_imx8mq-evk.md
new file mode 100644
index 000000000..ea9ddacce
--- /dev/null
+++ b/templates/machine/imx8mq-evk/README_machine_imx8mq-evk.md
@@ -0,0 +1,13 @@
+---
+description: i.MX8MQ EVK with etnaviv GPU driver
+authors: Scott Murray <scott.murray@konsulko.com>
+---
+
+### Machine imx8mq-evk
+
+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 imx8mq-evk-viv template using the NXP Vivante
+driver may be a better choice for those not interested in etnaviv
+debugging and development.
+
diff --git a/templates/machine/intel-corei7-64 b/templates/machine/intel-corei7-64
new file mode 120000
index 000000000..9d4684394
--- /dev/null
+++ b/templates/machine/intel-corei7-64
@@ -0,0 +1 @@
+qemux86-64 \ No newline at end of file
diff --git a/templates/machine/intel-corei7-64/50_bblayers.conf.inc b/templates/machine/intel-corei7-64/50_bblayers.conf.inc
deleted file mode 100644
index d50ccc922..000000000
--- a/templates/machine/intel-corei7-64/50_bblayers.conf.inc
+++ /dev/null
@@ -1 +0,0 @@
-BBLAYERS =+ "${METADIR}/meta-intel"
diff --git a/templates/machine/intel-corei7-64/50_local.conf.inc b/templates/machine/intel-corei7-64/50_local.conf.inc
deleted file mode 100644
index 48d26c567..000000000
--- a/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/templates/machine/j721e-evm/50_bblayers.conf.inc b/templates/machine/j721e-evm/50_bblayers.conf.inc
new file mode 100644
index 000000000..6ef08c43e
--- /dev/null
+++ b/templates/machine/j721e-evm/50_bblayers.conf.inc
@@ -0,0 +1,5 @@
+BBLAYERS =+ "\
+ ${METADIR}/bsp/meta-arm/meta-arm \
+ ${METADIR}/bsp/meta-arm/meta-arm-toolchain \
+ ${METADIR}/bsp/meta-ti/meta-ti-bsp \
+ "
diff --git a/templates/machine/j721e-evm/50_local.conf.inc b/templates/machine/j721e-evm/50_local.conf.inc
new file mode 100644
index 000000000..917ca73a7
--- /dev/null
+++ b/templates/machine/j721e-evm/50_local.conf.inc
@@ -0,0 +1,3 @@
+MACHINE = "j721e-evm"
+#see meta-agl/meta-agl-bsp/conf/include/agl_j721e-evm.inc
+require conf/include/agl_j721e-evm.inc
diff --git a/templates/machine/j721e-evm/README_machine_j721e-evm.md b/templates/machine/j721e-evm/README_machine_j721e-evm.md
new file mode 100644
index 000000000..c6f7320d6
--- /dev/null
+++ b/templates/machine/j721e-evm/README_machine_j721e-evm.md
@@ -0,0 +1,9 @@
+---
+description: Machine j721e-evm
+authors: Scott Murray <scott.murray@konsulko.com>
+---
+
+### Machine j721e-evm
+
+Texas Instruments J721e EVM (formerly J7 EVM).
+
diff --git a/templates/machine/joule/50_bblayers.conf.inc b/templates/machine/joule/50_bblayers.conf.inc
deleted file mode 100644
index d50ccc922..000000000
--- a/templates/machine/joule/50_bblayers.conf.inc
+++ /dev/null
@@ -1 +0,0 @@
-BBLAYERS =+ "${METADIR}/meta-intel"
diff --git a/templates/machine/joule/50_local.conf.inc b/templates/machine/joule/50_local.conf.inc
deleted file mode 100644
index 04b7e6f20..000000000
--- a/templates/machine/joule/50_local.conf.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-MACHINE = "intel-corei7-64"
-#see meta-agl/meta-agl-bsp/conf/include/agl_joule.inc
-require conf/include/agl_joule.inc
diff --git a/templates/machine/m3-salvator-x/50_bblayers.conf.inc b/templates/machine/m3-salvator-x/50_bblayers.conf.inc
new file mode 100644
index 000000000..e06bd413d
--- /dev/null
+++ b/templates/machine/m3-salvator-x/50_bblayers.conf.inc
@@ -0,0 +1,4 @@
+BBLAYERS =+ "\
+ ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
+ ${METADIR}/external/poky/meta-yocto-bsp \
+ "
diff --git a/templates/machine/m3-salvator-x/50_local.conf.inc b/templates/machine/m3-salvator-x/50_local.conf.inc
new file mode 100644
index 000000000..82766fd5e
--- /dev/null
+++ b/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/templates/machine/m3-salvator-x/50_setup.sh b/templates/machine/m3-salvator-x/50_setup.sh
new file mode 100644
index 000000000..abd2a33af
--- /dev/null
+++ b/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/templates/machine/m3-salvator-x/README_machine_m3-salvator-x.md b/templates/machine/m3-salvator-x/README_machine_m3-salvator-x.md
new file mode 100644
index 000000000..99c9dffbf
--- /dev/null
+++ b/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/templates/machine/m3ulcb-kf/50_bblayers.conf.inc b/templates/machine/m3ulcb-kf/50_bblayers.conf.inc
new file mode 100644
index 000000000..25e36b019
--- /dev/null
+++ b/templates/machine/m3ulcb-kf/50_bblayers.conf.inc
@@ -0,0 +1,5 @@
+BBLAYERS =+ "\
+ ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
+ ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \
+ ${METADIR}/external/poky/meta-yocto-bsp \
+ "
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..075c203f4
--- /dev/null
+++ b/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/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc b/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc
index b58989c6f..e06bd413d 100644
--- a/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc
+++ b/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc
@@ -1,3 +1,4 @@
BBLAYERS =+ "\
- ${METADIR}/meta-renesas-rcar-gen3/meta-rcar-gen3 \
+ ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
+ ${METADIR}/external/poky/meta-yocto-bsp \
"
diff --git a/templates/machine/m3ulcb-nogfx/README_machine_m3ulcb-nogfx.md b/templates/machine/m3ulcb-nogfx/README_machine_m3ulcb-nogfx.md
new file mode 100644
index 000000000..5c87986df
--- /dev/null
+++ b/templates/machine/m3ulcb-nogfx/README_machine_m3ulcb-nogfx.md
@@ -0,0 +1,11 @@
+---
+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
+
+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/templates/machine/m3ulcb-nogfx/test/hwtest.short.environment b/templates/machine/m3ulcb-nogfx/test/hwtest.short.environment
deleted file mode 100644
index 758ca7e6f..000000000
--- a/templates/machine/m3ulcb-nogfx/test/hwtest.short.environment
+++ /dev/null
@@ -1,9 +0,0 @@
-DEVICE_TYPE=r8a7796-m3ulcb
-DEVICE_NAME=m3ulcb-nogfx
-DEVICE_DTB=Image-r8a7796-m3ulcb.dtb
-DEVICE_KERNEL=Image
-DEVICE_INITRAMFS=initramfs-netboot-image-m3ulcb.ext4.gz
-DEVICE_NBDROOT=agl-demo-platform-m3ulcb.ext4.xz
-DEVICE_NBDROOT_COMPRESSION=xz
-DEVICE_BOOT_METHOD=u-boot
-DEVICE_BOOT_TYPE=booti
diff --git a/templates/machine/m3ulcb-nogfx/test/testjob_short.yaml b/templates/machine/m3ulcb-nogfx/test/testjob_short.yaml
deleted file mode 100644
index d14b7704f..000000000
--- a/templates/machine/m3ulcb-nogfx/test/testjob_short.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-device_type: @REPLACE_DEVICE_TYPE@
-job_name: AGL-short-smoke
-
-protocols:
- lava-xnbd:
- port: auto
-
-timeouts:
- job:
- minutes: 30
- action:
- minutes: 15
- connection:
- minutes: 5
- bootloader-commands:
- minutes: 4
-priority: medium
-visibility: public
-
-# ACTION_BLOCK
-actions:
-- deploy:
- timeout:
- minutes: 15
- to: nbd
- dtb:
- url: '@REPLACE_URL_PREFIX@/@REPLACE_DTB@'
- kernel:
- url: '@REPLACE_URL_PREFIX@/@REPLACE_KERNEL@'
- initrd:
- url: '@REPLACE_URL_PREFIX@/@REPLACE_INITRAMFS@'
- allow_modify: false
- nbdroot:
- url: '@REPLACE_URL_PREFIX@/@REPLACE_NBDROOT@'
- compression: @REPLACE_NBDROOT_COMPRESSION@
- os: debian
- failure_retry: 2
-
-# BOOT_BLOCK
-- boot:
- method: @REPLACE_BOOT_METHOD@
- commands: nbd
- type: @REPLACE_BOOT_TYPE@
- prompts: ["root@@REPLACE_MACHINE@:~"]
- auto_login:
- login_prompt: "login:"
- username: root
-
diff --git a/templates/machine/m3ulcb/50_bblayers.conf.inc b/templates/machine/m3ulcb/50_bblayers.conf.inc
index b58989c6f..e06bd413d 100644
--- a/templates/machine/m3ulcb/50_bblayers.conf.inc
+++ b/templates/machine/m3ulcb/50_bblayers.conf.inc
@@ -1,3 +1,4 @@
BBLAYERS =+ "\
- ${METADIR}/meta-renesas-rcar-gen3/meta-rcar-gen3 \
+ ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
+ ${METADIR}/external/poky/meta-yocto-bsp \
"
diff --git a/templates/machine/m3ulcb/README_machine_m3ulcb.md b/templates/machine/m3ulcb/README_machine_m3ulcb.md
new file mode 100644
index 000000000..07034a6db
--- /dev/null
+++ b/templates/machine/m3ulcb/README_machine_m3ulcb.md
@@ -0,0 +1,11 @@
+---
+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.
+
+* [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/templates/machine/nitrogen6x/50_bblayers.conf.inc b/templates/machine/nitrogen6x/50_bblayers.conf.inc
deleted file mode 100644
index 2852303b4..000000000
--- a/templates/machine/nitrogen6x/50_bblayers.conf.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-BBLAYERS =+ "\
- ${METADIR}/meta-fsl-arm \
- ${METADIR}/meta-fsl-arm-extra \
- ${METADIR}/meta-boundary \
- "
diff --git a/templates/machine/nitrogen6x/50_local.conf.inc b/templates/machine/nitrogen6x/50_local.conf.inc
deleted file mode 100644
index fec3a7f6d..000000000
--- a/templates/machine/nitrogen6x/50_local.conf.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-MACHINE = "nitrogen6x"
-
diff --git a/templates/machine/nitrogen6x/50_setup.sh b/templates/machine/nitrogen6x/50_setup.sh
deleted file mode 100644
index ea340a763..000000000
--- a/templates/machine/nitrogen6x/50_setup.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-find_and_ack_eula $METADIR/meta-fsl-arm EULA
-export EULA_FLAG_NAME="ACCEPT_FSL_EULA"
diff --git a/templates/machine/porter-nogfx/50_bblayers.conf.inc b/templates/machine/porter-nogfx/50_bblayers.conf.inc
deleted file mode 100644
index ba0e17ef3..000000000
--- a/templates/machine/porter-nogfx/50_bblayers.conf.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-BBLAYERS =+ "\
- ${METADIR}/meta-renesas \
- ${METADIR}/meta-renesas/meta-rcar-gen2 \
- "
-
diff --git a/templates/machine/porter-nogfx/50_local.conf.inc b/templates/machine/porter-nogfx/50_local.conf.inc
deleted file mode 100644
index 87ec427e3..000000000
--- a/templates/machine/porter-nogfx/50_local.conf.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-MACHINE = "porter"
-#see meta-agl/meta-agl-bsp/conf/include/agl_porter-nogfx.inc
-require conf/include/agl_porter-nogfx.inc
diff --git a/templates/machine/porter-nogfx/test/hwtest.enable b/templates/machine/porter-nogfx/test/hwtest.enable
deleted file mode 100644
index d00491fd7..000000000
--- a/templates/machine/porter-nogfx/test/hwtest.enable
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/templates/machine/porter-nogfx/test/hwtest.short.enable b/templates/machine/porter-nogfx/test/hwtest.short.enable
deleted file mode 100644
index d00491fd7..000000000
--- a/templates/machine/porter-nogfx/test/hwtest.short.enable
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/templates/machine/porter-nogfx/test/hwtest.short.environment b/templates/machine/porter-nogfx/test/hwtest.short.environment
deleted file mode 100644
index 6cb0b9a0b..000000000
--- a/templates/machine/porter-nogfx/test/hwtest.short.environment
+++ /dev/null
@@ -1,11 +0,0 @@
-DEVICE_TYPE=renesas-porter-uboot
-DEVICE_NAME=porter
-DEVICE_DTB=uImage-r8a7791-porter.dtb
-DEVICE_KERNEL=uImage
-DEVICE_INITRAMFS=initramfs-netboot-image-porter.ext4.gz.u-boot
-DEVICE_NBDROOT=core-image-minimal-porter.ext4.xz
-DEVICE_NBDROOT_COMPRESSION=xz
-DEVICE_BOOT_METHOD=u-boot
-DEVICE_BOOT_TYPE=bootm
-#DEVICE_URL_PREFIX=https://download.automotivelinux.org/AGL
-# \ No newline at end of file
diff --git a/templates/machine/porter-nogfx/test/testjob_short.yaml b/templates/machine/porter-nogfx/test/testjob_short.yaml
deleted file mode 100644
index 2ff1ac995..000000000
--- a/templates/machine/porter-nogfx/test/testjob_short.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-# Your first LAVA JOB definition for a porter board
-device_type: @REPLACE_DEVICE_TYPE@
-job_name: AGL-short-smoke
-
-protocols:
- lava-xnbd:
- port: auto
-
-timeouts:
- job:
- minutes: 30
- action:
- minutes: 15
- connection:
- minutes: 5
- bootloader-commands:
- minutes: 4
-priority: medium
-visibility: public
-
-# ACTION_BLOCK
-actions:
-- deploy:
- timeout:
- minutes: 15
- to: nbd
- dtb:
- url: '@REPLACE_URL_PREFIX@/@REPLACE_DTB@'
- kernel:
- url: '@REPLACE_URL_PREFIX@/@REPLACE_KERNEL@'
- initrd:
- url: '@REPLACE_URL_PREFIX@/@REPLACE_INITRAMFS@'
- allow_modify: false
- nbdroot:
- url: '@REPLACE_URL_PREFIX@/@REPLACE_NBDROOT@'
- compression: @REPLACE_NBDROOT_COMPRESSION@
- os: debian
- failure_retry: 2
-
-# BOOT_BLOCK
-- boot:
- method: @REPLACE_BOOT_METHOD@
- commands: nbd
- type: @REPLACE_BOOT_TYPE@
- prompts: ["root@@REPLACE_MACHINE@:~"]
- auto_login:
- login_prompt: "login:"
- username: root
-
diff --git a/templates/machine/porter/50_bblayers.conf.inc b/templates/machine/porter/50_bblayers.conf.inc
deleted file mode 100644
index ba0e17ef3..000000000
--- a/templates/machine/porter/50_bblayers.conf.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-BBLAYERS =+ "\
- ${METADIR}/meta-renesas \
- ${METADIR}/meta-renesas/meta-rcar-gen2 \
- "
-
diff --git a/templates/machine/porter/50_local.conf.inc b/templates/machine/porter/50_local.conf.inc
deleted file mode 100644
index f2794b0d0..000000000
--- a/templates/machine/porter/50_local.conf.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-MACHINE = "porter"
-#see meta-agl/meta-agl-bsp/conf/include/agl_porter.inc
-require conf/include/agl_porter.inc
diff --git a/templates/machine/porter/50_setup.sh b/templates/machine/porter/50_setup.sh
deleted file mode 100644
index f51d4f4f5..000000000
--- a/templates/machine/porter/50_setup.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-# setup proprietary gfx drivers and multimedia packages
-pushd $METADIR 2>/dev/null
-
-SETUP_MM_SCRIPT=$METADIR/meta-renesas/meta-rcar-gen2/scripts/setup_mm_packages.sh
-if [ -f $SETUP_MM_SCRIPT ]; then
- . $SETUP_MM_SCRIPT $MACHINE
- copy_mm_packages $MACHINE
- if [ $? -ne 0 ]; then
- echo "Copying gfx drivers and multimedia packages for '$MACHINE' failed."
- exit 1
- fi
-fi
-
-popd 2>/dev/null
diff --git a/templates/machine/qemuarm/50_local.conf.inc b/templates/machine/qemuarm/50_local.conf.inc
new file mode 100644
index 000000000..84204fb8c
--- /dev/null
+++ b/templates/machine/qemuarm/50_local.conf.inc
@@ -0,0 +1,3 @@
+MACHINE = "qemuarm"
+#see meta-agl/meta-agl-bsp/conf/include/agl_qemux86-64.inc
+require conf/include/agl_qemuarm.inc
diff --git a/templates/machine/qemuarm/README_machine_qemuarm.md b/templates/machine/qemuarm/README_machine_qemuarm.md
new file mode 100644
index 000000000..42e5a5cdd
--- /dev/null
+++ b/templates/machine/qemuarm/README_machine_qemuarm.md
@@ -0,0 +1,9 @@
+---
+description: Machine qemuarm
+authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
+---
+
+### Machine qemuarm
+
+*Description is missing - please complete file meta-agl/templates/machine/qemuarm/README_machine_qemuarm.md*
+
diff --git a/templates/machine/qemuarm64/50_local.conf.inc b/templates/machine/qemuarm64/50_local.conf.inc
new file mode 100644
index 000000000..65605b530
--- /dev/null
+++ b/templates/machine/qemuarm64/50_local.conf.inc
@@ -0,0 +1,3 @@
+MACHINE = "qemuarm64"
+#see meta-agl/meta-agl-bsp/conf/include/agl_qemux86-64.inc
+require conf/include/agl_qemuarm64.inc
diff --git a/templates/machine/qemuarm64/README_machine_qemuarm64.md b/templates/machine/qemuarm64/README_machine_qemuarm64.md
new file mode 100644
index 000000000..6fc8c69b1
--- /dev/null
+++ b/templates/machine/qemuarm64/README_machine_qemuarm64.md
@@ -0,0 +1,9 @@
+---
+description: Machine qemuarm64
+authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
+---
+
+### Machine qemuarm64
+
+*Description is missing - please complete file meta-agl/templates/machine/qemuarm64/README_machine_qemuarm64.md*
+
diff --git a/templates/machine/qemuriscv64/50_local.conf.inc b/templates/machine/qemuriscv64/50_local.conf.inc
new file mode 100644
index 000000000..5eba64f0d
--- /dev/null
+++ b/templates/machine/qemuriscv64/50_local.conf.inc
@@ -0,0 +1,3 @@
+MACHINE = "qemuriscv64"
+#see meta-agl/meta-agl-bsp/conf/include/agl_qemux86-64.inc
+require conf/include/agl_qemuriscv64.inc
diff --git a/templates/machine/qemuriscv64/README_machine_qemuriscv64.md b/templates/machine/qemuriscv64/README_machine_qemuriscv64.md
new file mode 100644
index 000000000..00eb1d300
--- /dev/null
+++ b/templates/machine/qemuriscv64/README_machine_qemuriscv64.md
@@ -0,0 +1,9 @@
+---
+description: Machine qemuriscv64
+authors: Alistair Francis <alistair.francis@wdc.com>
+---
+
+### Machine qemuarm64
+
+The 64-bit RISC-V QEMU virt machine.
+
diff --git a/templates/machine/qemux86-64/README_machine_qemux86-64.md b/templates/machine/qemux86-64/README_machine_qemux86-64.md
new file mode 100644
index 000000000..88b6375ba
--- /dev/null
+++ b/templates/machine/qemux86-64/README_machine_qemux86-64.md
@@ -0,0 +1,9 @@
+---
+description: Machine qemux86-64
+authors: Anton Gerasimov <anton@advancedtelematic.com>, Kevin Hilman <khilman@baylibre.com>, Ronan Le Martret <ronan.lemartret@iot.bzh>, Stephane Desneux <stephane.desneux@iot.bzh>
+---
+
+### Machine qemux86-64
+
+*Description is missing - please complete file meta-agl/templates/machine/qemux86-64/README_machine_qemux86-64.md*
+
diff --git a/templates/machine/qemux86/50_local.conf.inc b/templates/machine/qemux86/50_local.conf.inc
deleted file mode 100644
index b500b3c60..000000000
--- a/templates/machine/qemux86/50_local.conf.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-MACHINE = "qemux86"
-#see meta-agl/meta-agl-bsp/conf/include/agl_qemux86.inc
-require conf/include/agl_qemux86.inc
diff --git a/templates/machine/raspberrypi2/50_bblayers.conf.inc b/templates/machine/raspberrypi2/50_bblayers.conf.inc
deleted file mode 100644
index 1250b359f..000000000
--- a/templates/machine/raspberrypi2/50_bblayers.conf.inc
+++ /dev/null
@@ -1 +0,0 @@
-BBLAYERS =+ "${METADIR}/meta-raspberrypi"
diff --git a/templates/machine/raspberrypi2/50_local.conf.inc b/templates/machine/raspberrypi2/50_local.conf.inc
deleted file mode 100644
index 5d314eeb4..000000000
--- a/templates/machine/raspberrypi2/50_local.conf.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-MACHINE = "raspberrypi2"
-#see meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi2.inc
-require conf/include/agl_raspberrypi2.inc
diff --git a/templates/machine/raspberrypi3-64/50_bblayers.conf.inc b/templates/machine/raspberrypi3-64/50_bblayers.conf.inc
deleted file mode 120000
index 653316c5c..000000000
--- a/templates/machine/raspberrypi3-64/50_bblayers.conf.inc
+++ /dev/null
@@ -1 +0,0 @@
-../raspberrypi3/50_bblayers.conf.inc \ No newline at end of file
diff --git a/templates/machine/raspberrypi3-64/50_local.conf.inc b/templates/machine/raspberrypi3-64/50_local.conf.inc
deleted file mode 100644
index 74d952ed9..000000000
--- a/templates/machine/raspberrypi3-64/50_local.conf.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-MACHINE = "raspberrypi3-64"
-#see meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi3-64.inc
-require conf/include/agl_raspberrypi3-64.inc
diff --git a/templates/machine/raspberrypi3-64/test/hwtest.short.environment b/templates/machine/raspberrypi3-64/test/hwtest.short.environment
deleted file mode 100644
index 9e2dcbd0f..000000000
--- a/templates/machine/raspberrypi3-64/test/hwtest.short.environment
+++ /dev/null
@@ -1,10 +0,0 @@
-DEVICE_TYPE=bcm2837-rpi-3-b
-DEVICE_NAME=raspberrypi3-64
-DEVICE_DTB=Image-bcm2837-rpi-3-b.dtb
-DEVICE_KERNEL=Image
-DEVICE_INITRAMFS=initramfs-netboot-image-raspberrypi3-64.ext4.gz.u-boot
-DEVICE_NBDROOT=agl-demo-platform-raspberrypi3-64.ext4.xz
-DEVICE_NBDROOT_COMPRESSION=xz
-DEVICE_BOOT_METHOD=u-boot
-DEVICE_BOOT_TYPE=booti
-#DEVICE_URL_PREFIX=https://download.automotivelinux.org/AGL
diff --git a/templates/machine/raspberrypi3-64/test/testjob_short.yaml b/templates/machine/raspberrypi3-64/test/testjob_short.yaml
deleted file mode 100644
index 2ff1ac995..000000000
--- a/templates/machine/raspberrypi3-64/test/testjob_short.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-# Your first LAVA JOB definition for a porter board
-device_type: @REPLACE_DEVICE_TYPE@
-job_name: AGL-short-smoke
-
-protocols:
- lava-xnbd:
- port: auto
-
-timeouts:
- job:
- minutes: 30
- action:
- minutes: 15
- connection:
- minutes: 5
- bootloader-commands:
- minutes: 4
-priority: medium
-visibility: public
-
-# ACTION_BLOCK
-actions:
-- deploy:
- timeout:
- minutes: 15
- to: nbd
- dtb:
- url: '@REPLACE_URL_PREFIX@/@REPLACE_DTB@'
- kernel:
- url: '@REPLACE_URL_PREFIX@/@REPLACE_KERNEL@'
- initrd:
- url: '@REPLACE_URL_PREFIX@/@REPLACE_INITRAMFS@'
- allow_modify: false
- nbdroot:
- url: '@REPLACE_URL_PREFIX@/@REPLACE_NBDROOT@'
- compression: @REPLACE_NBDROOT_COMPRESSION@
- os: debian
- failure_retry: 2
-
-# BOOT_BLOCK
-- boot:
- method: @REPLACE_BOOT_METHOD@
- commands: nbd
- type: @REPLACE_BOOT_TYPE@
- prompts: ["root@@REPLACE_MACHINE@:~"]
- auto_login:
- login_prompt: "login:"
- username: root
-
diff --git a/templates/machine/raspberrypi3/50_bblayers.conf.inc b/templates/machine/raspberrypi3/50_bblayers.conf.inc
deleted file mode 100644
index 1250b359f..000000000
--- a/templates/machine/raspberrypi3/50_bblayers.conf.inc
+++ /dev/null
@@ -1 +0,0 @@
-BBLAYERS =+ "${METADIR}/meta-raspberrypi"
diff --git a/templates/machine/raspberrypi3/50_local.conf.inc b/templates/machine/raspberrypi3/50_local.conf.inc
deleted file mode 100644
index e47637178..000000000
--- a/templates/machine/raspberrypi3/50_local.conf.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-MACHINE = "raspberrypi3"
-#see meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
-require conf/include/agl_raspberrypi3.inc
diff --git a/templates/machine/raspberrypi3/test/hwtest.enable b/templates/machine/raspberrypi3/test/hwtest.enable
deleted file mode 100644
index 573541ac9..000000000
--- a/templates/machine/raspberrypi3/test/hwtest.enable
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/templates/machine/raspberrypi3/test/hwtest.short.enable b/templates/machine/raspberrypi3/test/hwtest.short.enable
deleted file mode 100644
index 573541ac9..000000000
--- a/templates/machine/raspberrypi3/test/hwtest.short.enable
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/templates/machine/raspberrypi3/test/hwtest.short.environment b/templates/machine/raspberrypi3/test/hwtest.short.environment
deleted file mode 100644
index db4a5a044..000000000
--- a/templates/machine/raspberrypi3/test/hwtest.short.environment
+++ /dev/null
@@ -1,10 +0,0 @@
-DEVICE_TYPE=raspberrypi3-uboot
-DEVICE_NAME=raspberrypi3
-DEVICE_DTB=Image-bcm2710-rpi-3-b.dtb
-DEVICE_KERNEL=Image
-DEVICE_INITRAMFS=initramfs-netboot-image-raspberrypi3.ext4.gz
-DEVICE_NBDROOT=agl-demo-platform-raspberrypi3.ext4.xz
-DEVICE_NBDROOT_COMPRESSION=xz
-DEVICE_BOOT_METHOD=u-boot
-DEVICE_BOOT_TYPE=booti
-#DEVICE_URL_PREFIX=https://download.automotivelinux.org/AGL \ No newline at end of file
diff --git a/templates/machine/raspberrypi3/test/testjob_short.yaml b/templates/machine/raspberrypi3/test/testjob_short.yaml
deleted file mode 100644
index 2ff1ac995..000000000
--- a/templates/machine/raspberrypi3/test/testjob_short.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-# Your first LAVA JOB definition for a porter board
-device_type: @REPLACE_DEVICE_TYPE@
-job_name: AGL-short-smoke
-
-protocols:
- lava-xnbd:
- port: auto
-
-timeouts:
- job:
- minutes: 30
- action:
- minutes: 15
- connection:
- minutes: 5
- bootloader-commands:
- minutes: 4
-priority: medium
-visibility: public
-
-# ACTION_BLOCK
-actions:
-- deploy:
- timeout:
- minutes: 15
- to: nbd
- dtb:
- url: '@REPLACE_URL_PREFIX@/@REPLACE_DTB@'
- kernel:
- url: '@REPLACE_URL_PREFIX@/@REPLACE_KERNEL@'
- initrd:
- url: '@REPLACE_URL_PREFIX@/@REPLACE_INITRAMFS@'
- allow_modify: false
- nbdroot:
- url: '@REPLACE_URL_PREFIX@/@REPLACE_NBDROOT@'
- compression: @REPLACE_NBDROOT_COMPRESSION@
- os: debian
- failure_retry: 2
-
-# BOOT_BLOCK
-- boot:
- method: @REPLACE_BOOT_METHOD@
- commands: nbd
- type: @REPLACE_BOOT_TYPE@
- prompts: ["root@@REPLACE_MACHINE@:~"]
- auto_login:
- login_prompt: "login:"
- username: root
-
diff --git a/templates/machine/raspberrypi4/50_bblayers.conf.inc b/templates/machine/raspberrypi4/50_bblayers.conf.inc
new file mode 100644
index 000000000..2e677dd8a
--- /dev/null
+++ b/templates/machine/raspberrypi4/50_bblayers.conf.inc
@@ -0,0 +1 @@
+BBLAYERS =+ "${METADIR}/bsp/meta-raspberrypi"
diff --git a/templates/machine/raspberrypi4/50_local.conf.inc b/templates/machine/raspberrypi4/50_local.conf.inc
new file mode 100644
index 000000000..e12f4a4a3
--- /dev/null
+++ b/templates/machine/raspberrypi4/50_local.conf.inc
@@ -0,0 +1,4 @@
+MACHINE = "raspberrypi4-64"
+
+#see meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi4.inc
+require conf/include/agl_raspberrypi4.inc
diff --git a/templates/machine/raspberrypi5/50_bblayers.conf.inc b/templates/machine/raspberrypi5/50_bblayers.conf.inc
new file mode 100644
index 000000000..2e677dd8a
--- /dev/null
+++ b/templates/machine/raspberrypi5/50_bblayers.conf.inc
@@ -0,0 +1 @@
+BBLAYERS =+ "${METADIR}/bsp/meta-raspberrypi"
diff --git a/templates/machine/raspberrypi5/50_local.conf.inc b/templates/machine/raspberrypi5/50_local.conf.inc
new file mode 100644
index 000000000..9ee2644ab
--- /dev/null
+++ b/templates/machine/raspberrypi5/50_local.conf.inc
@@ -0,0 +1,4 @@
+MACHINE = "raspberrypi5"
+
+#see meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi5.inc
+require conf/include/agl_raspberrypi5.inc
diff --git a/templates/machine/s4sk/50_bblayers.conf.inc b/templates/machine/s4sk/50_bblayers.conf.inc
new file mode 100644
index 000000000..0cc25a9ab
--- /dev/null
+++ b/templates/machine/s4sk/50_bblayers.conf.inc
@@ -0,0 +1,7 @@
+BBLAYERS =+ "\
+ ${METADIR}/bsp/meta-renesas/meta-rcar-gateway \
+ ${METADIR}/external/poky/meta-yocto-bsp \
+ "
+
+AGL_META_PYTHON = "${METADIR}/external/meta-openembedded/meta-python"
+
diff --git a/templates/machine/s4sk/50_local.conf.inc b/templates/machine/s4sk/50_local.conf.inc
new file mode 100644
index 000000000..b804b3845
--- /dev/null
+++ b/templates/machine/s4sk/50_local.conf.inc
@@ -0,0 +1,4 @@
+MACHINE = "s4sk"
+#see meta-agl/meta-agl-bsp/conf/include/agl_s4sk.inc
+require conf/include/agl_s4sk.inc
+
diff --git a/templates/machine/s4sk/README_machine_s4sk.md b/templates/machine/s4sk/README_machine_s4sk.md
new file mode 100644
index 000000000..275be67a6
--- /dev/null
+++ b/templates/machine/s4sk/README_machine_s4sk.md
@@ -0,0 +1,11 @@
+---
+description: Machine s4sk
+authors: Loc Nguyen <loc.nguyen.wt@renesas.com>
+---
+
+### Machine s4sk
+
+Renesas RCar Gen4 "s4sk" board.
+
+* [R-Car S4 Starter Kit website](https://www.renesas.com/us/en/products/automotive-products/automotive-system-chips-socs/y-ask-rcar-s4-1000base-t-r-car-s4-starter-kit)
+* [elinux S4 Starter Kit](https://elinux.org/R-Car/Boards/S4SK)
diff --git a/templates/machine/unmatched/50_bblayers.conf.inc b/templates/machine/unmatched/50_bblayers.conf.inc
new file mode 100644
index 000000000..03565bafd
--- /dev/null
+++ b/templates/machine/unmatched/50_bblayers.conf.inc
@@ -0,0 +1,6 @@
+# This is the original place, but we need to tweak layer.conf
+BBLAYERS =+ "${METADIR}/bsp/meta-sifive"
+
+# For now, tweak the layer's compatibility to allow using with kirkstone,
+# since we know it works without major issues.
+LAYERSERIES_COMPAT_meta-sifive:append = " kirkstone"
diff --git a/templates/machine/unmatched/50_local.conf.inc b/templates/machine/unmatched/50_local.conf.inc
new file mode 100644
index 000000000..c4d2b3ae5
--- /dev/null
+++ b/templates/machine/unmatched/50_local.conf.inc
@@ -0,0 +1,4 @@
+MACHINE = "unmatched"
+
+#see meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi4.inc
+require conf/include/agl_unmatched.inc
diff --git a/templates/machine/virtio-aarch64/50_bblayers.conf.inc b/templates/machine/virtio-aarch64/50_bblayers.conf.inc
new file mode 100644
index 000000000..16c7ec5f8
--- /dev/null
+++ b/templates/machine/virtio-aarch64/50_bblayers.conf.inc
@@ -0,0 +1,6 @@
+BBFILES += " \
+ ${METADIR}/meta-agl/meta-agl-bsp/virtualization-layer/recipes*/*/*.bb \
+ ${METADIR}/meta-agl/meta-agl-bsp/virtualization-layer/recipes*/*/*.bbappend \
+ "
+
+BBMASK += "meta-agl/meta-agl-bsp/virtualization-layer/recipes-extended/xen"
diff --git a/templates/machine/virtio-aarch64/50_local.conf.inc b/templates/machine/virtio-aarch64/50_local.conf.inc
new file mode 100644
index 000000000..3328d6ab8
--- /dev/null
+++ b/templates/machine/virtio-aarch64/50_local.conf.inc
@@ -0,0 +1,3 @@
+MACHINE = "virtio-aarch64"
+# see meta-agl/meta-agl-bsp/conf/include/agl_virtio-aarch64.inc
+require conf/include/agl_virtio-aarch64.inc
diff --git a/templates/machine/virtio-aarch64/README_machine_virtio-aarch64.md b/templates/machine/virtio-aarch64/README_machine_virtio-aarch64.md
new file mode 100644
index 000000000..8149c4324
--- /dev/null
+++ b/templates/machine/virtio-aarch64/README_machine_virtio-aarch64.md
@@ -0,0 +1,10 @@
+---
+description: Machine virtio-aarch64
+authors: Vasyl Vavrychuk <vasyl.vavrychuk@opensynergy.com>
+---
+
+### Machine virtio-aarch64
+
+This machine is intended to run in an ARMv8 virtualized environment that
+provides VirtIO devices. For now, virtio-aarch64 machine was verified under QEMU
+and OpenSynergy COQOS Hypervisor.
diff --git a/templates/machine/wandboard/50_bblayers.conf.inc b/templates/machine/wandboard/50_bblayers.conf.inc
deleted file mode 100644
index 0198eb464..000000000
--- a/templates/machine/wandboard/50_bblayers.conf.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-BBLAYERS =+ "\
- ${METADIR}/meta-fsl-arm \
- ${METADIR}/meta-fsl-arm-extra \
- "
diff --git a/templates/machine/wandboard/50_local.conf.inc b/templates/machine/wandboard/50_local.conf.inc
deleted file mode 100644
index 42f9e5f77..000000000
--- a/templates/machine/wandboard/50_local.conf.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-MACHINE = "wandboard"
-