diff --git a/arm/conf/layer.conf b/arm/conf/layer.conf
new file mode 100644
index 00000000..df08fc10
--- /dev/null
+++ b/arm/conf/layer.conf
@@ -0,0 +1,21 @@
+# SPDX-License-Identifier: MIT
+#
+# Copyright (c) 2019 Arm Limited
+#
+
+# arm has a conf and classes directory, add to BBPATH
+BBPATH	 .= ":${LAYERDIR}"
+
+BBFILES += " \
+		${LAYERDIR}/recipes-*/*/*.bb \
+		${LAYERDIR}/recipes-*/*/*.bbappend"
+
+BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.bbappend' % layer \
+	     for layer in BBFILE_COLLECTIONS.split())}"
+
+BBFILE_COLLECTIONS += "arm"
+BBFILE_PATTERN_arm := "^${LAYERDIR}/"
+BBFILE_PRIORITY_arm = "10"
+LAYERSERIES_COMPAT_arm = "warrior"
+
+LAYERDEPENDS_arm = "core"
diff --git a/arm/conf/machine/include/arm-common-configuration.inc b/arm/conf/machine/include/arm-common-configuration.inc
new file mode 100644
index 00000000..3b99b812
--- /dev/null
+++ b/arm/conf/machine/include/arm-common-configuration.inc
@@ -0,0 +1,18 @@
+# SPDX-License-Identifier: MIT
+#
+# Copyright (c) 2019 Arm Limited
+#
+
+IMAGE_FSTYPES += "tar.bz2 wic cpio.gz"
+
+EXTRA_IMAGEDEPENDS_append = " trusted-firmware-a"
+
+PREFERRED_PROVIDER_u-boot ?= "u-boot"
+PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
+
+UBOOT_SUFFIX ?= "bin"
+UBOOT_MACHINE ?= "vexpress_aemv8a_aarch32_defconfig"
+
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-arm"
+
+SERIAL_CONSOLES = "115200;ttyAMA0"
diff --git a/arm/conf/machine/include/cortex-a32.inc b/arm/conf/machine/include/cortex-a32.inc
new file mode 100644
index 00000000..dcf3c9e5
--- /dev/null
+++ b/arm/conf/machine/include/cortex-a32.inc
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: MIT
+#
+# Copyright (c) 2019 Arm Limited
+#
+
+TUNE_FEATURES = "aarch32"
+
+require conf/machine/include/arm/arch-armv8a.inc
diff --git a/arm/conf/machine/include/cortex-a5.inc b/arm/conf/machine/include/cortex-a5.inc
new file mode 100644
index 00000000..26d731fe
--- /dev/null
+++ b/arm/conf/machine/include/cortex-a5.inc
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: MIT
+#
+# Copyright (c) 2019 Arm Limited
+#
+
+DEFAULTTUNE="cortexa5"
+
+require conf/machine/include/tune-cortexa5.inc
+
+TF-A_EXTRA_OPTIONS = "ARM_ARCH_MAJOR=7 ARM_CORTEX_A5=yes \
+		     ARM_XLAT_TABLES_LIB_V1=1"