[meta-intel] [PATCH 1/1] Romley: Add Ivy Bridge Support

[kishore.k.bodke at intel.com]

From: Kishore Bodke <kishore.k.bodke at intel.com>

Create a new Machine to support Romley Ivy Bridge CPU
support.

Signed-off-by: Kishore Bodke <kishore.k.bodke at intel.com>
---
 meta-romley/README                                 |   21 ++++++++++++----
 meta-romley/conf/machine/romley-ivb.conf           |   20 +++++++++++++++
 .../formfactor/formfactor/romley-ivb/machconfig    |    3 +++
 .../xserver-xf86-config/romley-ivb/xorg.conf       |   26 ++++++++++++++++++++
 .../recipes-kernel/linux/linux-yocto_3.4.bbappend  |    7 ++++++
 5 files changed, 72 insertions(+), 5 deletions(-)
 create mode 100644 meta-romley/conf/machine/romley-ivb.conf
 create mode 100644 meta-romley/recipes-bsp/formfactor/formfactor/romley-ivb/machconfig
 create mode 100644 meta-romley/recipes-graphics/xorg-xserver/xserver-xf86-config/romley-ivb/xorg.conf

diff --git a/meta-romley/README b/meta-romley/README
index f1a9bb0..1290e3c 100644
--- a/meta-romley/README
+++ b/meta-romley/README
@@ -2,9 +2,18 @@ This README file contains information on building the meta-romley
 BSP layer, and booting the images contained in the /binary directory.
 Please see the corresponding sections below for details.
 
-The 'romley' platform consists of the Intel Xeon E5-2600 and E5-2400
+Romley platform consists of two versions.
+1. Romley - Sandy Bridge
+2. Romley - Ivy Bridge
+
+
+Romley - Sandy Bridge  platform consists of the Intel Xeon E5-2600 and E5-2400
 Series Processors, plus the Intel C604/C602-J Chipset
-(Sandy Bridge-EP/EN + Patsburg).
+(Sandy Bridge-EP/EN + Patsburg)
+
+Romley - Ivy Bridge platform consists of Intel Xeon E5-2600 and E5-2400
+v2 Series Processors with Intel C604/C602-J Chipset
+(Ivy Bridge-EP/EN + Patsburg)
 
 This BSP assumes Matrox graphics is being used.
 
@@ -76,10 +85,14 @@ common metadata shared between BSPs) e.g.:
   yocto/meta-intel \
   yocto/meta-intel/meta-romley \
 
-To enable the romley layer, add the romley MACHINE to local.conf:
+To enable the romley Sandy Bridge layer, add the romley MACHINE to local.conf:
 
   MACHINE ?= "romley"
 
+To enable the romley Ivy Bridge layer, add the romley-ivb MACHINE to local.conf:
+
+  MACHINE ?= "romley-ivb"
+
 You should then be able to build a romley image as such:
 
   $ source oe-init-build-env
@@ -142,5 +155,3 @@ the syslinux boot: prompt, or the boot: prompt contains strange
 characters), try doing this first:
 
 # dd if=/dev/zero of=/dev/sdf bs=1M count=512
-
-
diff --git a/meta-romley/conf/machine/romley-ivb.conf b/meta-romley/conf/machine/romley-ivb.conf
new file mode 100644
index 0000000..bf9dd9f
--- /dev/null
+++ b/meta-romley/conf/machine/romley-ivb.conf
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@NAME: romley-ivb
+
+#@WEBTITLE: Intel Xeon E5-2600 and E5-2400 v2 Series (Formerly Ivy Bridge-EP/EN)
+#Processors with Intel C604/C602-J Chipset (Romley-EP/EN Platform)
+
+#@DESCRIPTION: Machine configuration for Romley systems
+# i.e. Xeon E5-2600 and E5-2400 + Intel CC604/C602-J
+
+
+PREFERRED_VERSION_linux-yocto ?= "3.4%"
+
+require conf/machine/include/tune-x86_64.inc
+require conf/machine/include/ia32-base.inc
+require conf/machine/include/meta-intel.inc
+
+XSERVER ?= "${XSERVER_IA32_BASE} \
+           ${XSERVER_IA32_EXT} \
+	   ${XSERVER_IA32_MATROX_MGA} \
+           "
diff --git a/meta-romley/recipes-bsp/formfactor/formfactor/romley-ivb/machconfig b/meta-romley/recipes-bsp/formfactor/formfactor/romley-ivb/machconfig
new file mode 100644
index 0000000..ffce012
--- /dev/null
+++ b/meta-romley/recipes-bsp/formfactor/formfactor/romley-ivb/machconfig
@@ -0,0 +1,3 @@
+# Assume a USB mouse and keyboard are connected
+HAVE_TOUCHSCREEN=0
+HAVE_KEYBOARD=1
diff --git a/meta-romley/recipes-graphics/xorg-xserver/xserver-xf86-config/romley-ivb/xorg.conf b/meta-romley/recipes-graphics/xorg-xserver/xserver-xf86-config/romley-ivb/xorg.conf
new file mode 100644
index 0000000..28ad0bf
--- /dev/null
+++ b/meta-romley/recipes-graphics/xorg-xserver/xserver-xf86-config/romley-ivb/xorg.conf
@@ -0,0 +1,26 @@
+Section "Device"
+    Identifier	"Matrox MGA"
+    Driver	"mga"
+EndSection
+
+Section "Monitor"
+    Identifier    "Generic Monitor"
+    Option        "DPMS"
+EndSection
+
+Section "Screen"
+    Identifier    "Default Screen"
+    Device	  "Matrox MGA"
+    Monitor       "Generic Monitor"
+    DefaultDepth  24
+EndSection
+
+Section "ServerLayout"
+    Identifier     "Default Layout"
+    Screen         "Default Screen"
+EndSection
+
+Section "ServerFlags"
+    Option        "DontZap"  "0"
+    Option        "AutoAddDevices"  "False"
+EndSection
diff --git a/meta-romley/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-romley/recipes-kernel/linux/linux-yocto_3.4.bbappend
index 44a485b..fc2c303 100644
--- a/meta-romley/recipes-kernel/linux/linux-yocto_3.4.bbappend
+++ b/meta-romley/recipes-kernel/linux/linux-yocto_3.4.bbappend
@@ -8,6 +8,13 @@ KBRANCH_romley  = "standard/common-pc-64/romley"
 SRCREV_machine_pn-linux-yocto_romley ?= "13809f2cfd9be0ce86bd486e1643f9b90bed6f4f"
 SRCREV_meta_pn-linux-yocto_romley ?= "f697e099bc76d5df3a307a5bc0cc25021dd6dfe0"
 
+COMPATIBLE_MACHINE_romley-ivb = "romley-ivb"
+KMACHINE_romley-ivb  = "romley"
+KBRANCH_romley-ivb  = "standard/common-pc-64/romley"
+
+SRCREV_machine_pn-linux-yocto_romley-ivb ?= "13809f2cfd9be0ce86bd486e1643f9b90bed6f4f"
+SRCREV_meta_pn-linux-yocto_romley-ivb ?= "f697e099bc76d5df3a307a5bc0cc25021dd6dfe0"
+
 module_autoload_uio = "uio"
 
 LINUX_VERSION = "3.4.28"
-- 
1.7.9.5