new configuration templates based on fragments

This is the application of the process proposed here:
https://lists.linuxfoundation.org/pipermail/automotive-discussions/2016-June/002232.html

Bug-AGL: SPEC-180

Change-Id: I5a7015fa810547a9ecf4fb096367323af3cdc670
Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>

20 files changed, 465 insertions, 0 deletions

diff --git a/templates/machine/dra7xx-evm/50_bblayers.conf.inc b/templates/machine/dra7xx-evm/50_bblayers.conf.inc
new file mode 100644
index 000000000..c62a1bbb3
--- /dev/null
+++ b/templates/machine/dra7xx-evm/50_bblayers.conf.inc
@@ -0,0 +1 @@
+BBLAYERS =+ "${METADIR}/meta-ti"
diff --git a/templates/machine/dra7xx-evm/50_local.conf.inc b/templates/machine/dra7xx-evm/50_local.conf.inc
new file mode 100644
index 000000000..adf577e8b
--- /dev/null
+++ b/templates/machine/dra7xx-evm/50_local.conf.inc
@@ -0,0 +1,5 @@
+MACHINE = "dra7xx-evm"
+
+## ATTENTION, this is needed right now to build meta-ti with AGL: ##
+## due to meta-ti being based on YP 1.8 instead of YP 2.0
+BBMASK  = "meta-ti/.*eudev"
diff --git a/templates/machine/dragonboard-410c/50_bblayers.conf.inc b/templates/machine/dragonboard-410c/50_bblayers.conf.inc
new file mode 100644
index 000000000..01ffb7f17
--- /dev/null
+++ b/templates/machine/dragonboard-410c/50_bblayers.conf.inc
@@ -0,0 +1 @@
+BBLAYERS =+ "${METADIR}/meta-qcom"
diff --git a/templates/machine/dragonboard-410c/50_local.conf.inc b/templates/machine/dragonboard-410c/50_local.conf.inc
new file mode 100644
index 000000000..472592c1f
--- /dev/null
+++ b/templates/machine/dragonboard-410c/50_local.conf.inc
@@ -0,0 +1 @@
+MACHINE = "dragonboard-410c"
diff --git a/templates/machine/dragonboard-410c/50_setup.sh b/templates/machine/dragonboard-410c/50_setup.sh
new file mode 100644
index 000000000..7be1dad32
--- /dev/null
+++ b/templates/machine/dragonboard-410c/50_setup.sh
@@ -0,0 +1 @@
+find_and_ack_eula $METADIR/meta-qcom
diff --git a/templates/machine/intel-corei7-64/50_bblayers.conf.inc b/templates/machine/intel-corei7-64/50_bblayers.conf.inc
new file mode 100644
index 000000000..d50ccc922
--- /dev/null
+++ b/templates/machine/intel-corei7-64/50_bblayers.conf.inc
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000..e88000f5c
--- /dev/null
+++ b/templates/machine/intel-corei7-64/50_local.conf.inc
@@ -0,0 +1,20 @@
+MACHINE = "intel-corei7-64"
+
+# Configurations to run on VirtualBox/VMWare
+#
+# To get wide screen than default, there are a selection of resolutions
+# available:
+#
+#APPEND += "uvesafb.mode_option=1024x768-32"
+#APPEND += "uvesafb.mode_option=1280x1024-32"
+#APPEND += "uvesafb.mode_option=1600x1200-32"
+#
+# To avoid corrupt boot screen by systemd message, you can use serial
+# console separated from VGA console or disable all boot messages by
+# kernel command line.
+#
+# Configuration for serial console
+#APPEND += "console=ttyS0,115200n8"
+#
+# All boot message will be off
+#APPEND += "quiet"
diff --git a/templates/machine/porter-nogfx/50_bblayers.conf.inc b/templates/machine/porter-nogfx/50_bblayers.conf.inc
new file mode 100644
index 000000000..ba0e17ef3
--- /dev/null
+++ b/templates/machine/porter-nogfx/50_bblayers.conf.inc
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 000000000..ff76a8731
--- /dev/null
+++ b/templates/machine/porter-nogfx/50_local.conf.inc
@@ -0,0 +1,180 @@
+MACHINE = "porter"
+
+# For running GStreamer on wayland (experimental).
+#
+# Uncoment below if want to use multimedia acceleration on wayland
+#
+#IMAGE_INSTALL_append_porter = " \
+#    gstreamer1.0-plugins-bad-waylandsink \
+#    "
+
+# Additional plugins to test multimedia acceleration (experimental)
+#
+# Uncoment below if want to use multimedia acceleration
+#
+#IMAGE_INSTALL_append_porter = " \
+#    gstreamer1.0-plugins-base-videorate \
+#    gstreamer1.0-plugins-base-videotestsrc \
+#    gstreamer1.0-plugins-base-audiotestsrc \
+#    gstreamer1.0-plugins-base-alsa \
+#    gstreamer1.0-plugins-good-autodetect \
+#    gstreamer1.0-plugins-good-isomp4 \
+#    gstreamer1.0-plugins-good-video4linux2 \
+#    gstreamer1.0-plugins-good-videocrop \
+#    gstreamer1.0-plugins-bad-asfmux \
+#    gstreamer1.0-plugins-bad-fbdevsink \
+#    gstreamer1.0-plugins-bad-faad \
+#    gstreamer1.0-plugins-bad-videoparsersbad \
+#"
+# for graphics acceleration
+#
+# Uncoment below if want to use multimedia acceleration
+#
+#IMAGE_INSTALL_append_porter = " \
+#    libegl libegl-dev libgbm-dev \
+#    gles-kernel-module gles-user-module \
+#    libdrm-tests \
+#    libdrm-kms \
+#    "
+
+# for multimedia acceleration
+#
+# Uncoment below if want to use multimedia acceleration
+#
+#IMAGE_INSTALL_append_porter = " \
+#    packagegroup-rcar-gen2-multimedia \
+#    packagegroup-lcb-oss-codecs \
+#    alsa-utils alsa-utils-config alsa-tools \
+#"
+
+# For Bluetooth hardware support
+BT_KERNEL_MODULES = " \
+    kernel-module-btusb \
+    kernel-module-bnep \
+    kernel-module-rfcomm \
+    kernel-module-rfkill \
+    "
+
+# Distribution-specific runtime components
+IMAGE_INSTALL_append = " \
+    ${@bb.utils.contains("DISTRO_FEATURES", "bluetooth", "${BT_KERNEL_MODULES}", "", d)} \
+    "
+
+# TODO: When booting weston, someone try to load 'libgbm_kms.so' then
+# fail to boot. It should be 'libgbm_kms.so.1'.
+# Tentatively, it is to install 'libgbm-dev' pkg.
+#IMAGE_INSTALL_append = "libgbm-dev"
+# this is not recommended and should be done in the recipe requiring this module (gles-user-module)
+
+LICENSE_FLAGS_WHITELIST = "commercial"
+
+# Define the name of multimedia, dtv, graphic test, multimedia-test for bbmask
+BB_MULTIMEDIA_KERNEL_MODULE = "fdpm-kernel-module|mmngr-kernel-module|\
+                               mmngrbuf-kernel-module|s3ctl-kernel-module|\
+                               uvcs-kernel-module|vspm-kernel-module"
+BB_MULTIMEDIA_USER_MODULE = "fdpm-user-module|mmngr-user-module|\
+                             mmngrbuf-user-module|omx-user-module|\
+                             s3ctl-user-module|vspm-user-module|libmemcpy"
+BB_MULTIMEDIA_TEST_MODULE = "fdpm-tp-user-module|mmngr-tp-user-module|\
+                             mmngrbuf-tp-user-module|s3ctl-tp-user-module|\
+                             vspm-tp-user-module"
+BB_GST_PLUGINS = "meta-renesas/meta-rcar-gen2/recipes-multimedia/gstreamer"
+MULTIMEDIA_BB = "${BB_MULTIMEDIA_KERNEL_MODULE}|${BB_MULTIMEDIA_USER_MODULE}|\
+                 ${BB_MULTIMEDIA_TEST_MODULE}|${BB_GST_PLUGINS}"
+
+# Enable Multimedia standard pkg
+#MACHINE_FEATURES_append = " multimedia"
+
+# UnMask the multimedia kernel modules
+#BBMASK .= "|${BB_MULTIMEDIA_KERNEL_MODULE}"
+
+# UnMask the multimedia user modules
+#BBMASK .= "|${BB_MULTIMEDIA_USER_MODULE}"
+
+# Include static library in SDK
+SDKIMAGE_FEATURES_append = " staticdev-pkgs"
+
+# Mask the DTV pkgs
+#MACHINE_FEATURES_append = " dtv"
+BBMASK = "dtv-module|ssp-module|scu-module"
+
+# Enable graphic pkgs
+#BBMASK .= "|gles-kernel-module|gles-user-module"
+
+# Mask the multimedia-test
+BBMASK .= "|${BB_MULTIMEDIA_TEST_MODULE}"
+
+# Mask the graphic test
+BBMASK .= "|gles-test-module"
+
+#DISTRO_FEATURES_append = " mm-test"
+#DISTRO_FEATURES_append = " gles-test"
+
+# Enable Gfx Pkgs
+MACHINE_FEATURES_append = " sgx"
+MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2"
+
+# for Wayland/Weston
+
+PREFERRED_PROVIDER_virtual/libgles1 = ""
+PREFERRED_PROVIDER_virtual/libgles2 = "gles-user-module"
+PREFERRED_PROVIDER_virtual/egl = "libegl"
+PREFERRED_PROVIDER_virtual/libgl = ""
+PREFERRED_PROVIDER_virtual/mesa = ""
+PREFERRED_PROVIDER_libgbm = "libgbm"
+PREFERRED_PROVIDER_libgbm-dev = "libgbm"
+
+# Setting for u-boot Wayland
+UBOOT_MACHINE = "porter_vin_config"
+
+# Addtional Configurations of Optional OMX modules
+
+# OMX Media Component H263 Decoder Library
+#DISTRO_FEATURES_append = " h263dec_lib"
+# OMX Media Component VC-1 Decoder Library
+#DISTRO_FEATURES_append = " vc1dec_lib"
+# OMX Media Component MPEG-4 Decoder Library
+#DISTRO_FEATURES_append = " mpeg4dec_lib"
+# VCP3 Driver Adapted for Linux MPEG-2 Decoder Library
+#DISTRO_FEATURES_append = " mpeg2dec_lib"
+# DivX Decoder Library for Linux
+#DISTRO_FEATURES_append = " divxdec_lib"
+# Encoder Library for Linux
+DISTRO_FEATURES_append = " h264avcenc_lib"
+
+# Configurations of Optional Audio Decoders
+# ARM 5.1ch aacPlus V2 Decoder for Linux
+#DISTRO_FEATURES_append = " aacp2dec_lib"
+# ARM MP3 Decoder for Linux
+#DISTRO_FEATURES_append = " mp3dec_lib"
+# ARM WMA Decoder for Linux
+#DISTRO_FEATURES_append = " wmadec_lib"
+# ARM 5.1ch Dolby Digital Decoder for Linux
+#DISTRO_FEATURES_append = " ddddec_lib"
+# ARM ALAC Decoder for Linux
+#DISTRO_FEATURES_append = " alacdec_lib"
+# ARM FLAC Decoder for Linux
+#DISTRO_FEATURES_append = " flacdec_lib"
+# ARM AAC-LC Decoder Library Sample for Linux
+#DISTRO_FEATURES_append = " aaclcsdec_lib"
+# ARM AAC Encoder for Linux
+#DISTRO_FEATURES_append = " aacenc_lib"
+
+# Configurations of Optional Audio Middlewares
+# ARM 5.1ch aacPlus V2 Decode Middleware for Linux
+#DISTRO_FEATURES_append = " armaccp2dec_mdw"
+# ARM MP3 Decode Middleware for Linux
+#DISTRO_FEATURES_append = " mp3dec_mdw"
+# ARM WMA Decode Middleware for Linux
+#DISTRO_FEATURES_append = " wmadec_mdw"
+# ARM 5.1ch Dolby Digital Decode Middleware for Linux
+#DISTRO_FEATURES_append = " ddddec_mdw"
+# ARM ALAC Decode Middleware for Linux
+#DISTRO_FEATURES_append = " alacdec_mdw"
+# ARM FLAC Decode Middleware for Linux
+#DISTRO_FEATURES_append = " flacdec_mdw"
+# ARM AAC Decode Middleware Sample for Linux
+#DISTRO_FEATURES_append = " aacsdec_mdw"
+# ARM AAC Encode Middleware for Linux
+#DISTRO_FEATURES_append = " aacenc_mdw"
+
diff --git a/templates/machine/porter/50_bblayers.conf.inc b/templates/machine/porter/50_bblayers.conf.inc
new file mode 100644
index 000000000..ba0e17ef3
--- /dev/null
+++ b/templates/machine/porter/50_bblayers.conf.inc
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 000000000..72b255de4
--- /dev/null
+++ b/templates/machine/porter/50_local.conf.inc
@@ -0,0 +1,179 @@
+MACHINE = "porter"
+
+# For running GStreamer on wayland (experimental).
+#
+# Uncoment below if want to use multimedia acceleration on wayland
+#
+IMAGE_INSTALL_append_porter = " \
+    gstreamer1.0-plugins-bad-waylandsink \
+    "
+
+# Additional plugins to test multimedia acceleration (experimental)
+#
+# Uncoment below if want to use multimedia acceleration
+#
+IMAGE_INSTALL_append_porter = " \
+    gstreamer1.0-plugins-base-videorate \
+    gstreamer1.0-plugins-base-videotestsrc \
+    gstreamer1.0-plugins-base-audiotestsrc \
+    gstreamer1.0-plugins-base-alsa \
+    gstreamer1.0-plugins-good-autodetect \
+    gstreamer1.0-plugins-good-isomp4 \
+    gstreamer1.0-plugins-good-video4linux2 \
+    gstreamer1.0-plugins-good-videocrop \
+    gstreamer1.0-plugins-bad-asfmux \
+    gstreamer1.0-plugins-bad-fbdevsink \
+    gstreamer1.0-plugins-bad-faad \
+    gstreamer1.0-plugins-bad-videoparsersbad \
+"
+# for graphics acceleration
+#
+# Uncoment below if want to use multimedia acceleration
+#
+IMAGE_INSTALL_append_porter = " \
+    libegl libegl-dev libgbm-dev \
+    gles-kernel-module gles-user-module \
+    libdrm-tests \
+   libdrm-kms \
+    "
+
+# for multimedia acceleration
+#
+# Uncoment below if want to use multimedia acceleration
+#
+IMAGE_INSTALL_append_porter = " \
+    packagegroup-rcar-gen2-multimedia \
+    packagegroup-lcb-oss-codecs \
+    alsa-utils alsa-utils-config alsa-tools \
+"
+
+# For Bluetooth hardware support
+BT_KERNEL_MODULES = " \
+    kernel-module-btusb \
+    kernel-module-bnep \
+    kernel-module-rfcomm \
+    kernel-module-rfkill \
+    "
+
+# Distribution-specific runtime components
+IMAGE_INSTALL_append = " \
+    ${@bb.utils.contains("DISTRO_FEATURES", "bluetooth", "${BT_KERNEL_MODULES}", "", d)} \
+    "
+
+# TODO: When booting weston, someone try to load 'libgbm_kms.so' then
+# fail to boot. It should be 'libgbm_kms.so.1'.
+# Tentatively, it is to install 'libgbm-dev' pkg.
+#IMAGE_INSTALL_append = "libgbm-dev"
+# this is not recommended and should be done in the recipe requiring this module (gles-user-module)
+
+LICENSE_FLAGS_WHITELIST = "commercial"
+
+# Define the name of multimedia, dtv, graphic test, multimedia-test for bbmask
+BB_MULTIMEDIA_KERNEL_MODULE = "fdpm-kernel-module|mmngr-kernel-module|\
+                               mmngrbuf-kernel-module|s3ctl-kernel-module|\
+                               uvcs-kernel-module|vspm-kernel-module"
+BB_MULTIMEDIA_USER_MODULE = "fdpm-user-module|mmngr-user-module|\
+                             mmngrbuf-user-module|omx-user-module|\
+                             s3ctl-user-module|vspm-user-module|libmemcpy"
+BB_MULTIMEDIA_TEST_MODULE = "fdpm-tp-user-module|mmngr-tp-user-module|\
+                             mmngrbuf-tp-user-module|s3ctl-tp-user-module|\
+                             vspm-tp-user-module"
+BB_GST_PLUGINS = "meta-renesas/meta-rcar-gen2/recipes-multimedia/gstreamer"
+MULTIMEDIA_BB = "${BB_MULTIMEDIA_KERNEL_MODULE}|${BB_MULTIMEDIA_USER_MODULE}|\
+                 ${BB_MULTIMEDIA_TEST_MODULE}|${BB_GST_PLUGINS}"
+
+# Enable Multimedia standard pkg
+MACHINE_FEATURES_append = " multimedia"
+
+# UnMask the multimedia kernel modules
+#BBMASK .= "|${BB_MULTIMEDIA_KERNEL_MODULE}"
+
+# UnMask the multimedia user modules
+#BBMASK .= "|${BB_MULTIMEDIA_USER_MODULE}"
+
+# Include static library in SDK
+SDKIMAGE_FEATURES_append = " staticdev-pkgs"
+
+# Mask the DTV pkgs
+#MACHINE_FEATURES_append = " dtv"
+BBMASK = "dtv-module|ssp-module|scu-module"
+
+# Enable graphic pkgs
+#BBMASK .= "|gles-kernel-module|gles-user-module"
+
+# Mask the multimedia-test
+BBMASK .= "|${BB_MULTIMEDIA_TEST_MODULE}"
+
+# Mask the graphic test
+BBMASK .= "|gles-test-module"
+
+#DISTRO_FEATURES_append = " mm-test"
+#DISTRO_FEATURES_append = " gles-test"
+
+# Enable Gfx Pkgs
+MACHINE_FEATURES_append = " sgx"
+MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2"
+
+# for Wayland/Weston
+
+PREFERRED_PROVIDER_virtual/libgles1 = ""
+PREFERRED_PROVIDER_virtual/libgles2 = "gles-user-module"
+PREFERRED_PROVIDER_virtual/egl = "libegl"
+PREFERRED_PROVIDER_virtual/libgl = ""
+PREFERRED_PROVIDER_virtual/mesa = ""
+PREFERRED_PROVIDER_libgbm = "libgbm"
+PREFERRED_PROVIDER_libgbm-dev = "libgbm"
+
+# Setting for u-boot Wayland
+UBOOT_MACHINE = "porter_vin_config"
+
+# Addtional Configurations of Optional OMX modules
+
+# OMX Media Component H263 Decoder Library
+#DISTRO_FEATURES_append = " h263dec_lib"
+# OMX Media Component VC-1 Decoder Library
+#DISTRO_FEATURES_append = " vc1dec_lib"
+# OMX Media Component MPEG-4 Decoder Library
+#DISTRO_FEATURES_append = " mpeg4dec_lib"
+# VCP3 Driver Adapted for Linux MPEG-2 Decoder Library
+#DISTRO_FEATURES_append = " mpeg2dec_lib"
+# DivX Decoder Library for Linux
+#DISTRO_FEATURES_append = " divxdec_lib"
+# Encoder Library for Linux
+DISTRO_FEATURES_append = " h264avcenc_lib"
+
+# Configurations of Optional Audio Decoders
+# ARM 5.1ch aacPlus V2 Decoder for Linux
+#DISTRO_FEATURES_append = " aacp2dec_lib"
+# ARM MP3 Decoder for Linux
+#DISTRO_FEATURES_append = " mp3dec_lib"
+# ARM WMA Decoder for Linux
+#DISTRO_FEATURES_append = " wmadec_lib"
+# ARM 5.1ch Dolby Digital Decoder for Linux
+#DISTRO_FEATURES_append = " ddddec_lib"
+# ARM ALAC Decoder for Linux
+#DISTRO_FEATURES_append = " alacdec_lib"
+# ARM FLAC Decoder for Linux
+#DISTRO_FEATURES_append = " flacdec_lib"
+# ARM AAC-LC Decoder Library Sample for Linux
+#DISTRO_FEATURES_append = " aaclcsdec_lib"
+# ARM AAC Encoder for Linux
+#DISTRO_FEATURES_append = " aacenc_lib"
+
+# Configurations of Optional Audio Middlewares
+# ARM 5.1ch aacPlus V2 Decode Middleware for Linux
+#DISTRO_FEATURES_append = " armaccp2dec_mdw"
+# ARM MP3 Decode Middleware for Linux
+#DISTRO_FEATURES_append = " mp3dec_mdw"
+# ARM WMA Decode Middleware for Linux
+#DISTRO_FEATURES_append = " wmadec_mdw"
+# ARM 5.1ch Dolby Digital Decode Middleware for Linux
+#DISTRO_FEATURES_append = " ddddec_mdw"
+# ARM ALAC Decode Middleware for Linux
+#DISTRO_FEATURES_append = " alacdec_mdw"
+# ARM FLAC Decode Middleware for Linux
+#DISTRO_FEATURES_append = " flacdec_mdw"
+# ARM AAC Decode Middleware Sample for Linux
+#DISTRO_FEATURES_append = " aacsdec_mdw"
+# ARM AAC Encode Middleware for Linux
+#DISTRO_FEATURES_append = " aacenc_mdw"
diff --git a/templates/machine/porter/50_setup.sh b/templates/machine/porter/50_setup.sh
new file mode 100644
index 000000000..f51d4f4f5
--- /dev/null
+++ b/templates/machine/porter/50_setup.sh
@@ -0,0 +1,14 @@
+# 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/qemux86-64/50_local.conf.inc b/templates/machine/qemux86-64/50_local.conf.inc
new file mode 100644
index 000000000..f5bb53cfc
--- /dev/null
+++ b/templates/machine/qemux86-64/50_local.conf.inc
@@ -0,0 +1,20 @@
+MACHINE = "qemux86-64"
+
+# Configurations to run on VirtualBox/VMWare
+#
+# To get wide screen than default, there are a selection of resolutions
+# available:
+#
+#APPEND += "uvesafb.mode_option=1024x768-32"
+APPEND += "uvesafb.mode_option=1280x1024-32"
+#APPEND += "uvesafb.mode_option=1600x1200-32"
+#
+# To avoid corrupt boot screen by systemd message, you can use serial
+# console separated from VGA console or disable all boot messages by
+# kernel command line.
+#
+# Configuration for serial console
+APPEND += "console=ttyS0,115200n8"
+#
+# All boot message will be off
+APPEND += "quiet"
diff --git a/templates/machine/qemux86/50_local.conf.inc b/templates/machine/qemux86/50_local.conf.inc
new file mode 100644
index 000000000..9cdc49da9
--- /dev/null
+++ b/templates/machine/qemux86/50_local.conf.inc
@@ -0,0 +1,20 @@
+MACHINE = "qemux86"
+
+# Configurations to run on VirtualBox/VMWare
+#
+# To get wide screen than default, there are a selection of resolutions
+# available:
+#
+#APPEND += "uvesafb.mode_option=1024x768-32"
+APPEND += "uvesafb.mode_option=1280x1024-32"
+#APPEND += "uvesafb.mode_option=1600x1200-32"
+#
+# To avoid corrupt boot screen by systemd message, you can use serial
+# console separated from VGA console or disable all boot messages by
+# kernel command line.
+#
+# Configuration for serial console
+APPEND += "console=ttyS0,115200n8"
+#
+# All boot message will be off
+APPEND += "quiet"
diff --git a/templates/machine/raspberrypi2/50_bblayers.conf.inc b/templates/machine/raspberrypi2/50_bblayers.conf.inc
new file mode 100644
index 000000000..8b166859c
--- /dev/null
+++ b/templates/machine/raspberrypi2/50_bblayers.conf.inc
@@ -0,0 +1 @@
+BBLAYERS =+ "${METADIR}/meta-raspberry"
diff --git a/templates/machine/raspberrypi2/50_local.conf.inc b/templates/machine/raspberrypi2/50_local.conf.inc
new file mode 100644
index 000000000..343768e91
--- /dev/null
+++ b/templates/machine/raspberrypi2/50_local.conf.inc
@@ -0,0 +1,2 @@
+MACHINE = "raspberrypi2"
+
diff --git a/templates/machine/raspberrypi3/50_bblayers.conf.inc b/templates/machine/raspberrypi3/50_bblayers.conf.inc
new file mode 100644
index 000000000..8b166859c
--- /dev/null
+++ b/templates/machine/raspberrypi3/50_bblayers.conf.inc
@@ -0,0 +1 @@
+BBLAYERS =+ "${METADIR}/meta-raspberry"
diff --git a/templates/machine/raspberrypi3/50_local.conf.inc b/templates/machine/raspberrypi3/50_local.conf.inc
new file mode 100644
index 000000000..cfdd0299d
--- /dev/null
+++ b/templates/machine/raspberrypi3/50_local.conf.inc
@@ -0,0 +1,2 @@
+MACHINE = "raspberrypi3"
+
diff --git a/templates/machine/wandboard/50_bblayers.conf.inc b/templates/machine/wandboard/50_bblayers.conf.inc
new file mode 100644
index 000000000..051a5668c
--- /dev/null
+++ b/templates/machine/wandboard/50_bblayers.conf.inc
@@ -0,0 +1,4 @@
+BBLAYERS =+ "\
+  ${METADIR}/meta-fsl-arm \
+  ${METADIR}/meta-fsm-arm-extra \
+  "
diff --git a/templates/machine/wandboard/50_local.conf.inc b/templates/machine/wandboard/50_local.conf.inc
new file mode 100644
index 000000000..42f9e5f77
--- /dev/null
+++ b/templates/machine/wandboard/50_local.conf.inc
@@ -0,0 +1,2 @@
+MACHINE = "wandboard"
+