5 files changed, 55 insertions, 0 deletions

diff --git a/meta-linaro/conf/machine/genericarmv7a.conf b/meta-linaro/conf/machine/genericarmv7a.conf
new file mode 100644
index 0000000..3f71e60
--- /dev/null
+++ b/meta-linaro/conf/machine/genericarmv7a.conf
@@ -0,0 +1,34 @@
+#@TYPE: Machine
+#@NAME: generic armv7a machine
+#@DESCRIPTION: generic machine to be used by linaro-media-create
+
+
+require conf/machine/include/arm/arch-armv7a.inc
+
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+
+XSERVER ?= "xserver-xorg \
+            mesa-driver-swrast \
+            xf86-input-evdev \
+            xf86-input-mouse \
+            xf86-video-fbdev \
+            xf86-input-keyboard"
+
+MACHINE_FEATURES = "usbhost screen"
+
+# Don't include kernels in standard images
+RDEPENDS_kernel-base = ""
+
+# Use a common kernel recipe for all QEMU machines
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-linaro-vexpress"
+
+KERNEL_IMAGETYPE = "zImage"
+
+GRUBPLATFORM_pn-grub = "efi"
+
+# Force auto-serial-console to be used by all image types
+# Ideally this would be part of core oe or as a bbclassappend,
+# but as we don't have an easy way to append a class, defining
+# it here
+EXTRA_IMAGE_FEATURES += "autoserial"
+FEATURE_PACKAGES_autoserial = "auto-serial-console"
diff --git a/meta-linaro/conf/machine/genericarmv7ab.conf b/meta-linaro/conf/machine/genericarmv7ab.conf
new file mode 100644
index 0000000..69a08cc
--- /dev/null
+++ b/meta-linaro/conf/machine/genericarmv7ab.conf
@@ -0,0 +1,7 @@
+#@TYPE: Machine
+#@NAME: generic armv7a big endian machine
+#@DESCRIPTION: generic machine to be used by linaro-media-create
+
+DEFAULTTUNE ?= "armv7ab"
+
+require conf/machine/genericarmv7a.conf
diff --git a/meta-linaro/conf/machine/lng-rt-x86-64.conf b/meta-linaro/conf/machine/lng-rt-x86-64.conf
new file mode 100644
index 0000000..040af95
--- /dev/null
+++ b/meta-linaro/conf/machine/lng-rt-x86-64.conf
@@ -0,0 +1,4 @@
+include lng.inc
+DEFAULTTUNE = "core2-64"
+require conf/machine/include/tune-core2.inc
+PREFERRED_PROVIDER_virtual/kernel = "linaro-lng-rt-x86-64"
diff --git a/meta-linaro/conf/machine/lng-x86-64.conf b/meta-linaro/conf/machine/lng-x86-64.conf
new file mode 100644
index 0000000..a90b6e0
--- /dev/null
+++ b/meta-linaro/conf/machine/lng-x86-64.conf
@@ -0,0 +1,4 @@
+include lng.inc
+DEFAULTTUNE = "core2-64"
+require conf/machine/include/tune-core2.inc
+PREFERRED_PROVIDER_virtual/kernel = "linaro-lng-x86-64"
diff --git a/meta-linaro/conf/machine/lng.inc b/meta-linaro/conf/machine/lng.inc
new file mode 100644
index 0000000..55bc77b
--- /dev/null
+++ b/meta-linaro/conf/machine/lng.inc
@@ -0,0 +1,6 @@
+KERNEL_IMAGETYPE = "bzImage"
+
+MACHINE_FEATURES += "x86"
+
+EXTRA_IMAGE_FEATURES += "autoserial"
+FEATURE_PACKAGES_autoserial = "auto-serial-console"