summaryrefslogtreecommitdiffstats
path: root/templates/machine
diff options
context:
space:
mode:
Diffstat (limited to 'templates/machine')
-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.inc2
-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.inc2
-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/dragonboard-410c/50_bblayers.conf.inc2
-rw-r--r--templates/machine/dragonboard-410c/50_local.conf.inc3
-rw-r--r--templates/machine/dragonboard-410c/README_machine_dragonboard-410c.md9
-rw-r--r--templates/machine/dragonboard-820c/50_bblayers.conf.inc1
-rw-r--r--templates/machine/dragonboard-820c/50_local.conf.inc3
-rw-r--r--templates/machine/dragonboard-820c/README_machine_dragonboard-820c.md9
-rw-r--r--templates/machine/ebisu/50_bblayers.conf.inc1
-rw-r--r--templates/machine/generic-arm64/50_bblayers.conf.inc (renamed from templates/machine/j7-evm/50_bblayers.conf.inc)1
-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.inc1
-rw-r--r--templates/machine/h3ulcb-kf/50_bblayers.conf.inc1
-rw-r--r--templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc1
-rw-r--r--templates/machine/h3ulcb/50_bblayers.conf.inc1
-rw-r--r--templates/machine/hsdk/40_bblayers.conf.inc2
-rw-r--r--templates/machine/hsdk/50_local.conf.inc2
-rw-r--r--templates/machine/hsdk/README_machine_hsdk.md9
-rw-r--r--templates/machine/imx8mq-evk-viv/40_bblayers.conf.inc (renamed from templates/machine/imx8mqevk-viv/40_bblayers.conf.inc)0
-rw-r--r--templates/machine/imx8mq-evk-viv/50_local.conf.inc3
-rw-r--r--templates/machine/imx8mq-evk-viv/50_setup.sh (renamed from templates/machine/imx8mqevk-viv/50_setup.sh)0
-rw-r--r--templates/machine/imx8mq-evk-viv/README_machine_imx8mq-evk-viv.md (renamed from templates/machine/imx8mqevk-viv/README_machine_imx8mqevk-viv.md)0
-rw-r--r--templates/machine/imx8mq-evk/40_bblayers.conf.inc (renamed from templates/machine/imx8mqevk/40_bblayers.conf.inc)0
-rw-r--r--templates/machine/imx8mq-evk/50_local.conf.inc3
-rw-r--r--templates/machine/imx8mq-evk/50_setup.sh (renamed from templates/machine/imx8mqevk/50_setup.sh)0
-rw-r--r--templates/machine/imx8mq-evk/README_machine_imx8mq-evk.md (renamed from templates/machine/imx8mqevk/README_machine_imx8mqevk.md)4
-rw-r--r--templates/machine/imx8mqevk-viv/50_local.conf.inc3
-rw-r--r--templates/machine/imx8mqevk/50_local.conf.inc3
-rw-r--r--templates/machine/j7-evm/50_local.conf.inc3
-rw-r--r--templates/machine/j7-evm/README_machine_j7-evm.md9
-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/m3-salvator-x/50_bblayers.conf.inc1
-rw-r--r--templates/machine/m3ulcb-kf/50_bblayers.conf.inc1
-rw-r--r--templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc1
-rw-r--r--templates/machine/m3ulcb/50_bblayers.conf.inc1
-rw-r--r--templates/machine/nitrogen6x/40_bblayers.conf.inc6
-rw-r--r--templates/machine/nitrogen6x/50_local.conf.inc3
-rw-r--r--templates/machine/nitrogen6x/50_setup.sh2
-rw-r--r--templates/machine/nitrogen6x/README_machine_nitrogen6x.md9
-rw-r--r--templates/machine/raspberrypi5/50_bblayers.conf.inc4
-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.inc2
-rw-r--r--templates/machine/unmatched/50_local.conf.inc4
61 files changed, 184 insertions, 83 deletions
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
index 6e6a6c951..c94c1db8f 100644
--- a/templates/machine/bbe/50_bblayers.conf.inc
+++ b/templates/machine/bbe/50_bblayers.conf.inc
@@ -1,7 +1,7 @@
BBLAYERS =+ " \
${METADIR}/bsp/meta-arm/meta-arm \
${METADIR}/bsp/meta-arm/meta-arm-toolchain \
- ${METADIR}/bsp/meta-ti \
+ ${METADIR}/bsp/meta-ti/meta-ti-bsp \
${METADIR}/bsp/meta-sancloud \
${METADIR}/bsp/meta-rtlwifi \
"
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 6152217d3..6ef08c43e 100644
--- a/templates/machine/beaglebone/50_bblayers.conf.inc
+++ b/templates/machine/beaglebone/50_bblayers.conf.inc
@@ -1,5 +1,5 @@
BBLAYERS =+ "\
${METADIR}/bsp/meta-arm/meta-arm \
${METADIR}/bsp/meta-arm/meta-arm-toolchain \
- ${METADIR}/bsp/meta-ti \
+ ${METADIR}/bsp/meta-ti/meta-ti-bsp \
"
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/dragonboard-410c/50_bblayers.conf.inc b/templates/machine/dragonboard-410c/50_bblayers.conf.inc
deleted file mode 100644
index 41fe36719..000000000
--- a/templates/machine/dragonboard-410c/50_bblayers.conf.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-BBLAYERS =+ "${METADIR}/bsp/meta-qcom"
-BBMASK += "bsp/meta-qcom/openembedded-layer/recipes-navigation/gpsd"
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/README_machine_dragonboard-410c.md b/templates/machine/dragonboard-410c/README_machine_dragonboard-410c.md
deleted file mode 100644
index 047e08c28..000000000
--- a/templates/machine/dragonboard-410c/README_machine_dragonboard-410c.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-description: Machine dragonboard-410c
-authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Kotaro Hashimoto <Hashimoto.Kotaro@ds.MitsubishiElectric.co.jp>, Stephane Desneux <stephane.desneux@iot.bzh>
----
-
-### Machine dragonboard-410c
-
-*Description is missing - please complete file meta-agl/templates/machine/dragonboard-410c/README_machine_dragonboard-410c.md*
-
diff --git a/templates/machine/dragonboard-820c/50_bblayers.conf.inc b/templates/machine/dragonboard-820c/50_bblayers.conf.inc
deleted file mode 100644
index f3b96cbb6..000000000
--- a/templates/machine/dragonboard-820c/50_bblayers.conf.inc
+++ /dev/null
@@ -1 +0,0 @@
-BBLAYERS =+ "${METADIR}/bsp/meta-qcom"
diff --git a/templates/machine/dragonboard-820c/50_local.conf.inc b/templates/machine/dragonboard-820c/50_local.conf.inc
deleted file mode 100644
index 1cd53d60c..000000000
--- a/templates/machine/dragonboard-820c/50_local.conf.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-MACHINE = "dragonboard-820c"
-#see meta-agl/meta-agl-bsp/conf/include/agl_dragonboard-410c.inc
-require conf/include/agl_dragonboard-820c.inc
diff --git a/templates/machine/dragonboard-820c/README_machine_dragonboard-820c.md b/templates/machine/dragonboard-820c/README_machine_dragonboard-820c.md
deleted file mode 100644
index 73d9532c3..000000000
--- a/templates/machine/dragonboard-820c/README_machine_dragonboard-820c.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-description: Machine dragonboard-820c
-authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
----
-
-### Machine dragonboard-820c
-
-*Description is missing - please complete file meta-agl/templates/machine/dragonboard-820c/README_machine_dragonboard-820c.md*
-
diff --git a/templates/machine/ebisu/50_bblayers.conf.inc b/templates/machine/ebisu/50_bblayers.conf.inc
index 16397c2eb..e06bd413d 100644
--- a/templates/machine/ebisu/50_bblayers.conf.inc
+++ b/templates/machine/ebisu/50_bblayers.conf.inc
@@ -1,3 +1,4 @@
BBLAYERS =+ "\
${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
+ ${METADIR}/external/poky/meta-yocto-bsp \
"
diff --git a/templates/machine/j7-evm/50_bblayers.conf.inc b/templates/machine/generic-arm64/50_bblayers.conf.inc
index 6152217d3..05e60f69b 100644
--- a/templates/machine/j7-evm/50_bblayers.conf.inc
+++ b/templates/machine/generic-arm64/50_bblayers.conf.inc
@@ -1,5 +1,4 @@
BBLAYERS =+ "\
${METADIR}/bsp/meta-arm/meta-arm \
${METADIR}/bsp/meta-arm/meta-arm-toolchain \
- ${METADIR}/bsp/meta-ti \
"
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
index 16397c2eb..e06bd413d 100644
--- a/templates/machine/h3-salvator-x/50_bblayers.conf.inc
+++ b/templates/machine/h3-salvator-x/50_bblayers.conf.inc
@@ -1,3 +1,4 @@
BBLAYERS =+ "\
${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
+ ${METADIR}/external/poky/meta-yocto-bsp \
"
diff --git a/templates/machine/h3ulcb-kf/50_bblayers.conf.inc b/templates/machine/h3ulcb-kf/50_bblayers.conf.inc
index 61d472ab1..25e36b019 100644
--- a/templates/machine/h3ulcb-kf/50_bblayers.conf.inc
+++ b/templates/machine/h3ulcb-kf/50_bblayers.conf.inc
@@ -1,4 +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-nogfx/50_bblayers.conf.inc b/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc
index 16397c2eb..e06bd413d 100644
--- a/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc
+++ b/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc
@@ -1,3 +1,4 @@
BBLAYERS =+ "\
${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
+ ${METADIR}/external/poky/meta-yocto-bsp \
"
diff --git a/templates/machine/h3ulcb/50_bblayers.conf.inc b/templates/machine/h3ulcb/50_bblayers.conf.inc
index 16397c2eb..e06bd413d 100644
--- a/templates/machine/h3ulcb/50_bblayers.conf.inc
+++ b/templates/machine/h3ulcb/50_bblayers.conf.inc
@@ -1,3 +1,4 @@
BBLAYERS =+ "\
${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
+ ${METADIR}/external/poky/meta-yocto-bsp \
"
diff --git a/templates/machine/hsdk/40_bblayers.conf.inc b/templates/machine/hsdk/40_bblayers.conf.inc
deleted file mode 100644
index e3954fef3..000000000
--- a/templates/machine/hsdk/40_bblayers.conf.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Use meta-synopsys layer for ARC HSDK board
-BBLAYERS =+ "${METADIR}/bsp/meta-synopsys"
diff --git a/templates/machine/hsdk/50_local.conf.inc b/templates/machine/hsdk/50_local.conf.inc
deleted file mode 100644
index 61f77435e..000000000
--- a/templates/machine/hsdk/50_local.conf.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-MACHINE = "hsdk"
-require conf/include/agl_hsdk.inc
diff --git a/templates/machine/hsdk/README_machine_hsdk.md b/templates/machine/hsdk/README_machine_hsdk.md
deleted file mode 100644
index 30e56d13b..000000000
--- a/templates/machine/hsdk/README_machine_hsdk.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-description: Machine hsdk
-authors: Evgeniy Didin <didin@synopsys.com>, Jan-Simon Möller <jsmoeller@linuxfoundation.org>
----
-
-### Machine hsdk
-
-*Description is missing - please complete file meta-agl/templates/machine/hsdk/README_machine_hsdk.md*
-
diff --git a/templates/machine/imx8mqevk-viv/40_bblayers.conf.inc b/templates/machine/imx8mq-evk-viv/40_bblayers.conf.inc
index edcb6a3a2..edcb6a3a2 100644
--- a/templates/machine/imx8mqevk-viv/40_bblayers.conf.inc
+++ b/templates/machine/imx8mq-evk-viv/40_bblayers.conf.inc
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/imx8mqevk-viv/50_setup.sh b/templates/machine/imx8mq-evk-viv/50_setup.sh
index eefd1eb7f..eefd1eb7f 100644
--- a/templates/machine/imx8mqevk-viv/50_setup.sh
+++ b/templates/machine/imx8mq-evk-viv/50_setup.sh
diff --git a/templates/machine/imx8mqevk-viv/README_machine_imx8mqevk-viv.md b/templates/machine/imx8mq-evk-viv/README_machine_imx8mq-evk-viv.md
index be30e00fe..be30e00fe 100644
--- a/templates/machine/imx8mqevk-viv/README_machine_imx8mqevk-viv.md
+++ b/templates/machine/imx8mq-evk-viv/README_machine_imx8mq-evk-viv.md
diff --git a/templates/machine/imx8mqevk/40_bblayers.conf.inc b/templates/machine/imx8mq-evk/40_bblayers.conf.inc
index edcb6a3a2..edcb6a3a2 100644
--- a/templates/machine/imx8mqevk/40_bblayers.conf.inc
+++ b/templates/machine/imx8mq-evk/40_bblayers.conf.inc
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/imx8mqevk/50_setup.sh b/templates/machine/imx8mq-evk/50_setup.sh
index eefd1eb7f..eefd1eb7f 100644
--- a/templates/machine/imx8mqevk/50_setup.sh
+++ b/templates/machine/imx8mq-evk/50_setup.sh
diff --git a/templates/machine/imx8mqevk/README_machine_imx8mqevk.md b/templates/machine/imx8mq-evk/README_machine_imx8mq-evk.md
index 5d2bcbd37..ea9ddacce 100644
--- a/templates/machine/imx8mqevk/README_machine_imx8mqevk.md
+++ b/templates/machine/imx8mq-evk/README_machine_imx8mq-evk.md
@@ -3,11 +3,11 @@ description: i.MX8MQ EVK with etnaviv GPU driver
authors: Scott Murray <scott.murray@konsulko.com>
---
-### Machine imx8mqevk
+### 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 imx8mqevk-viv template using the NXP Vivante
+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/imx8mqevk-viv/50_local.conf.inc b/templates/machine/imx8mqevk-viv/50_local.conf.inc
deleted file mode 100644
index e9668c307..000000000
--- a/templates/machine/imx8mqevk-viv/50_local.conf.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-MACHINE = "imx8mqevk"
-#see meta-agl/meta-agl-bsp/conf/include/agl_imx8mqevk-viv.inc
-require conf/include/agl_imx8mqevk-viv.inc
diff --git a/templates/machine/imx8mqevk/50_local.conf.inc b/templates/machine/imx8mqevk/50_local.conf.inc
deleted file mode 100644
index 5f9b95943..000000000
--- a/templates/machine/imx8mqevk/50_local.conf.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-MACHINE = "imx8mqevk"
-#see meta-agl/meta-agl-bsp/conf/include/agl_imx8mqevk.inc
-require conf/include/agl_imx8mqevk.inc
diff --git a/templates/machine/j7-evm/50_local.conf.inc b/templates/machine/j7-evm/50_local.conf.inc
deleted file mode 100644
index 1a81cb7ed..000000000
--- a/templates/machine/j7-evm/50_local.conf.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-MACHINE = "j7-evm"
-#see meta-agl/meta-agl-bsp/conf/include/agl_j7-evm.inc
-require conf/include/agl_j7-evm.inc
diff --git a/templates/machine/j7-evm/README_machine_j7-evm.md b/templates/machine/j7-evm/README_machine_j7-evm.md
deleted file mode 100644
index f1441a301..000000000
--- a/templates/machine/j7-evm/README_machine_j7-evm.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-description: Machine j7-evm
-authors: Scott Murray <scott.murray@konsulko.com>
----
-
-### Machine j7-evm
-
-*Description is missing - please complete file meta-agl/templates/machine/dra7xx-evm/README_machine_j7-evm.md*
-
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/m3-salvator-x/50_bblayers.conf.inc b/templates/machine/m3-salvator-x/50_bblayers.conf.inc
index 16397c2eb..e06bd413d 100644
--- a/templates/machine/m3-salvator-x/50_bblayers.conf.inc
+++ b/templates/machine/m3-salvator-x/50_bblayers.conf.inc
@@ -1,3 +1,4 @@
BBLAYERS =+ "\
${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
+ ${METADIR}/external/poky/meta-yocto-bsp \
"
diff --git a/templates/machine/m3ulcb-kf/50_bblayers.conf.inc b/templates/machine/m3ulcb-kf/50_bblayers.conf.inc
index 61d472ab1..25e36b019 100644
--- a/templates/machine/m3ulcb-kf/50_bblayers.conf.inc
+++ b/templates/machine/m3ulcb-kf/50_bblayers.conf.inc
@@ -1,4 +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-nogfx/50_bblayers.conf.inc b/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc
index 16397c2eb..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}/bsp/meta-renesas/meta-rcar-gen3 \
+ ${METADIR}/external/poky/meta-yocto-bsp \
"
diff --git a/templates/machine/m3ulcb/50_bblayers.conf.inc b/templates/machine/m3ulcb/50_bblayers.conf.inc
index 16397c2eb..e06bd413d 100644
--- a/templates/machine/m3ulcb/50_bblayers.conf.inc
+++ b/templates/machine/m3ulcb/50_bblayers.conf.inc
@@ -1,3 +1,4 @@
BBLAYERS =+ "\
${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
+ ${METADIR}/external/poky/meta-yocto-bsp \
"
diff --git a/templates/machine/nitrogen6x/40_bblayers.conf.inc b/templates/machine/nitrogen6x/40_bblayers.conf.inc
deleted file mode 100644
index a4323be1a..000000000
--- a/templates/machine/nitrogen6x/40_bblayers.conf.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-# This must be parsed after qt5, etc. layers so that they are correctly
-# recognized by meta-freescale/dynamic-layers
-BBLAYERS =+ "\
- ${METADIR}/bsp/meta-freescale \
- ${METADIR}/bsp/meta-freescale-3rdparty \
- "
diff --git a/templates/machine/nitrogen6x/50_local.conf.inc b/templates/machine/nitrogen6x/50_local.conf.inc
deleted file mode 100644
index f8178bbd1..000000000
--- a/templates/machine/nitrogen6x/50_local.conf.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-MACHINE = "nitrogen6x"
-#see meta-agl/meta-agl-bsp/conf/include/agl_nitrogen6x.inc
-require conf/include/agl_nitrogen6x.inc
diff --git a/templates/machine/nitrogen6x/50_setup.sh b/templates/machine/nitrogen6x/50_setup.sh
deleted file mode 100644
index eefd1eb7f..000000000
--- a/templates/machine/nitrogen6x/50_setup.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-find_and_ack_eula $METADIR/bsp/meta-freescale EULA
-export EULA_FLAG_NAME="ACCEPT_FSL_EULA"
diff --git a/templates/machine/nitrogen6x/README_machine_nitrogen6x.md b/templates/machine/nitrogen6x/README_machine_nitrogen6x.md
deleted file mode 100644
index 9994de052..000000000
--- a/templates/machine/nitrogen6x/README_machine_nitrogen6x.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-description: Machine nitrogen6x
-authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Mihail Grigorov <michael.grigorov@konsulko.com>, Nathan Illerbrun <nathani@validmanufacturing.com>, Scott Murray <scott.murray@konsulko.com>
----
-
-### Machine nitrogen6x
-
-*Description is missing - please complete file meta-agl/templates/machine/nitrogen6x/README_machine_nitrogen6x.md*
-
diff --git a/templates/machine/raspberrypi5/50_bblayers.conf.inc b/templates/machine/raspberrypi5/50_bblayers.conf.inc
new file mode 100644
index 000000000..d225d627b
--- /dev/null
+++ b/templates/machine/raspberrypi5/50_bblayers.conf.inc
@@ -0,0 +1,4 @@
+BBLAYERS =+ " \
+ ${METADIR}/bsp/meta-raspberrypi \
+ ${METADIR}/bsp/meta-lts-mixins_u-boot \
+"
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..bf78285b5
--- /dev/null
+++ b/templates/machine/unmatched/50_bblayers.conf.inc
@@ -0,0 +1,2 @@
+# This is the original place, but we need to tweak layer.conf
+BBLAYERS =+ "${METADIR}/bsp/meta-sifive"
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