[PATCH 0/7][meta-intel] fri2: Update display, wifi, serial, and EFI

[PATCH 0/7][meta-intel] fri2: Update display, wifi, serial, and EFI

[Darren Hart]

This series applies to the master branch.

The following changes since commit 3d5574efe623923b24f78d77f1d4bd8ef8432698:

  meta-emenlow: use original libva (2011-12-06 09:27:08 -0600)

are available in the git repository at:
  git://git.yoctoproject.org/meta-intel-contrib dvhart/fri2
  http://git.yoctoproject.org/cgit.cgi/meta-intel-contrib/log/?h=dvhart/fri2

Darren Hart (7):
  fri2: use ttyS0,115200 for serial console and syslinux
  fri2: change preferred display order
  linux-firmware: append support for the iwlwifi-6000g2a-5 firmware
  fri2: include linux-firmware for iwlwifi in images
  fri2: Add pcbios and efi to MACHINE_FEATURES
  fri2: Add efi-ext to KERNEL_FEATURES
  fri2: Comment framebuffer APPEND setting

 meta-fri2/conf/machine/fri2-noemgd.conf            |    9 ++++++++-
 meta-fri2/conf/machine/fri2.conf                   |    8 +++++++-
 .../xserver-xf86-config/fri2/xorg.conf             |    2 +-
 .../linux-firmware/linux-firmware_git.bbappend     |   18 ++++++++++++++++++
 .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |    4 ++--
 5 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 meta-fri2/recipes-kernel/linux-firmware/linux-firmware_git.bbappend

-- 
1.7.6.4

[PATCH 1/7] fri2: use ttyS0, 115200 for serial console and syslinux

[Darren Hart]

The FRI2 has an optional serial expansion board. Enable the use of this
as a console for both syslinux and the OS.

Note: while the settings all appear to be correct, the serial port is
      not working on my test device in syslinux or the getty. The
      kernel messages do make their way to the serial port after PCI
      initialization.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
 meta-fri2/conf/machine/fri2-noemgd.conf |    4 ++++
 meta-fri2/conf/machine/fri2.conf        |    4 ++++
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/meta-fri2/conf/machine/fri2-noemgd.conf b/meta-fri2/conf/machine/fri2-noemgd.conf
index 1871cad..3ac60c2 100644
--- a/meta-fri2/conf/machine/fri2-noemgd.conf
+++ b/meta-fri2/conf/machine/fri2-noemgd.conf
@@ -14,4 +14,8 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
            ${XSERVER_IA32_VESA} \
            "
 
+SYSLINUX_OPTS = "serial 0 115200"
+SERIAL_CONSOLE = "115200 ttyS0"
+APPEND += "console=ttyS0,115200 console=tty0"
+
 APPEND += "video=vesafb vga=0x318"
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf
index 15036a4..ae69742 100644
--- a/meta-fri2/conf/machine/fri2.conf
+++ b/meta-fri2/conf/machine/fri2.conf
@@ -18,4 +18,8 @@ PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
 PREFERRED_VERSION_mesa-dri ?= "7.11"
 PREFERRED_VERSION_emgd-driver-bin ?= "1.8"
 
+SYSLINUX_OPTS = "serial 0 115200"
+SERIAL_CONSOLE = "115200 ttyS0"
+APPEND += "console=ttyS0,115200 console=tty0"
+
 APPEND += "video=vesafb vga=0x318"
-- 
1.7.6.4

[PATCH 2/7] fri2: change preferred display order

[Darren Hart]

The current PortOrder value assumes LVDS. Change the value to first try the
primary SDVO output, then the secondary SDVO, and fallback to LVDS if neither
are present.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
 .../xserver-xf86-config/fri2/xorg.conf             |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2/xorg.conf b/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2/xorg.conf
index fce58f8..73736ac 100644
--- a/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2/xorg.conf
+++ b/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2/xorg.conf
@@ -23,7 +23,7 @@ Section "Device"
     Option     "PcfVersion"            "1792"
     Option     "ConfigId"              "1"
     Option     "ALL/1/name"                   "e6xx"
-    Option     "ALL/1/General/PortOrder"      "40000"
+    Option     "ALL/1/General/PortOrder"      "32400"
     Option     "ALL/1/General/DisplayConfig"  "1"
     Option     "ALL/1/General/DisplayDetect"  "1"
     Option     "ALL/1/General/TuningWA" "1"
-- 
1.7.6.4

[PATCH 3/7] linux-firmware: append support for the iwlwifi-6000g2a-5 firmware

[Darren Hart]

Add firmware required by the Intel Centrino Adnanced-N 6205 mini-pcie card.
The content is already available in the linux-firmware repository, this patch
just adds the meta-data to include the right files and define a package.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
 .../linux-firmware/linux-firmware_git.bbappend     |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)
 create mode 100644 meta-fri2/recipes-kernel/linux-firmware/linux-firmware_git.bbappend

diff --git a/meta-fri2/recipes-kernel/linux-firmware/linux-firmware_git.bbappend b/meta-fri2/recipes-kernel/linux-firmware/linux-firmware_git.bbappend
new file mode 100644
index 0000000..97e64a5
--- /dev/null
+++ b/meta-fri2/recipes-kernel/linux-firmware/linux-firmware_git.bbappend
@@ -0,0 +1,18 @@
+FILESEXTRAPATHS_prepend := "${THISDIR/${PN}:"
+
+# This exists in Yocto 1.1, but include it here for completeness
+LIC_FILES_CHKSUM += "file://LICENCE.iwlwifi_firmware;md5=311cc823df5b1be4f00fbf0f17d96a6b"
+
+FWPATH = "/lib/firmware"
+
+do_install_append() {
+	install -m 0644 LICENCE.iwlwifi_firmware ${D}${FWPATH}
+	install -m 0644 iwlwifi-6000g2a-5.ucode ${D}${FWPATH}
+}
+
+PACKAGES =+ "${PN}-iwlwifi-6000g2a-5"
+
+FILES_${PN}-iwlwifi-6000g2a-5 = "  \
+  ${FWPATH}/LICENCE.iwlwifi_firmware \
+  ${FWPATH}/iwlwifi-6000g2a-5.ucode  \
+"
-- 
1.7.6.4

[PATCH 4/7] fri2: include linux-firmware for iwlwifi in images

[Darren Hart]

Include the firmware package for the iwlwifi card for task-base based images
using the MACHINE_EXTRA_RRECOMMENDS variable. This will exclude the firmware
from being installed in core-image-minimal, but it doesn't have the tooling
required to connect over wifi anyway.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
 meta-fri2/conf/machine/fri2-noemgd.conf |    2 ++
 meta-fri2/conf/machine/fri2.conf        |    1 +
 2 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/meta-fri2/conf/machine/fri2-noemgd.conf b/meta-fri2/conf/machine/fri2-noemgd.conf
index 3ac60c2..7e99486 100644
--- a/meta-fri2/conf/machine/fri2-noemgd.conf
+++ b/meta-fri2/conf/machine/fri2-noemgd.conf
@@ -8,6 +8,7 @@ include conf/machine/include/tune-atom.inc
 include conf/machine/include/ia32-base.inc
 
 MACHINE_FEATURES += "wifi 3g"
+MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5"
 
 XSERVER ?= "${XSERVER_IA32_BASE} \
            ${XSERVER_IA32_EXT} \
@@ -19,3 +20,4 @@ SERIAL_CONSOLE = "115200 ttyS0"
 APPEND += "console=ttyS0,115200 console=tty0"
 
 APPEND += "video=vesafb vga=0x318"
+
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf
index ae69742..72d7a48 100644
--- a/meta-fri2/conf/machine/fri2.conf
+++ b/meta-fri2/conf/machine/fri2.conf
@@ -8,6 +8,7 @@ include conf/machine/include/tune-atom.inc
 include conf/machine/include/ia32-base.inc
 
 MACHINE_FEATURES += "wifi 3g"
+MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5"
 
 XSERVER ?= "${XSERVER_IA32_BASE} \
            ${XSERVER_IA32_EXT} \
-- 
1.7.6.4

[PATCH 5/7] fri2: Add pcbios and efi to MACHINE_FEATURES

[Darren Hart]

Enable both legacy pcbios and efi booting for live images using the
new bootimg and grub-efi code.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
 meta-fri2/conf/machine/fri2-noemgd.conf |    2 +-
 meta-fri2/conf/machine/fri2.conf        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-fri2/conf/machine/fri2-noemgd.conf b/meta-fri2/conf/machine/fri2-noemgd.conf
index 7e99486..a8b889f 100644
--- a/meta-fri2/conf/machine/fri2-noemgd.conf
+++ b/meta-fri2/conf/machine/fri2-noemgd.conf
@@ -7,7 +7,7 @@
 include conf/machine/include/tune-atom.inc
 include conf/machine/include/ia32-base.inc
 
-MACHINE_FEATURES += "wifi 3g"
+MACHINE_FEATURES += "wifi 3g pcbios efi"
 MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5"
 
 XSERVER ?= "${XSERVER_IA32_BASE} \
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf
index 72d7a48..da4e981 100644
--- a/meta-fri2/conf/machine/fri2.conf
+++ b/meta-fri2/conf/machine/fri2.conf
@@ -7,7 +7,7 @@
 include conf/machine/include/tune-atom.inc
 include conf/machine/include/ia32-base.inc
 
-MACHINE_FEATURES += "wifi 3g"
+MACHINE_FEATURES += "wifi 3g pcbios efi"
 MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5"
 
 XSERVER ?= "${XSERVER_IA32_BASE} \
-- 
1.7.6.4

[PATCH 6/7] fri2: Add efi-ext to KERNEL_FEATURES

[Darren Hart]

The fri2 can boot via EFI or legacy PCBIOS. Add support for EFI.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
 .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.0.bbappend
index 34395a7..71d6c54 100644
--- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.0.bbappend
+++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.0.bbappend
@@ -2,11 +2,11 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 COMPATIBLE_MACHINE_fri2 = "fri2"
 KMACHINE_fri2  = "yocto/standard/fri2"
-KERNEL_FEATURES_append_fri2 += " cfg/smp.scc"
+KERNEL_FEATURES_append_fri2 += " cfg/smp.scc cfg/efi-ext.scc"
 
 COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd"
 KMACHINE_fri2-noemgd  = "yocto/standard/fri2"
-KERNEL_FEATURES_append_fri2-noemgd += " cfg/smp.scc"
+KERNEL_FEATURES_append_fri2-noemgd += " cfg/smp.scc cfg/efi-ext.scc"
 
 SRCREV_machine_pn-linux-yocto_fri2 ?= "20507c447f92907a6df53bc4f03655f050367ec7"
 SRCREV_meta_pn-linux-yocto_fri2 ?= "67ce7623909cef63927fd145026aaf371cf4abf1"
-- 
1.7.6.4

[PATCH 7/7] fri2: Comment framebuffer APPEND setting

[Darren Hart]

Note that the vesafb will only be used when booting via legacy PCBIOS.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
 meta-fri2/conf/machine/fri2-noemgd.conf |    1 +
 meta-fri2/conf/machine/fri2.conf        |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/meta-fri2/conf/machine/fri2-noemgd.conf b/meta-fri2/conf/machine/fri2-noemgd.conf
index a8b889f..911a449 100644
--- a/meta-fri2/conf/machine/fri2-noemgd.conf
+++ b/meta-fri2/conf/machine/fri2-noemgd.conf
@@ -19,5 +19,6 @@ SYSLINUX_OPTS = "serial 0 115200"
 SERIAL_CONSOLE = "115200 ttyS0"
 APPEND += "console=ttyS0,115200 console=tty0"
 
+# EFI boot will ignore this and use the EFI framebuffer at 800x600
 APPEND += "video=vesafb vga=0x318"
 
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf
index da4e981..9ae4287 100644
--- a/meta-fri2/conf/machine/fri2.conf
+++ b/meta-fri2/conf/machine/fri2.conf
@@ -23,4 +23,5 @@ SYSLINUX_OPTS = "serial 0 115200"
 SERIAL_CONSOLE = "115200 ttyS0"
 APPEND += "console=ttyS0,115200 console=tty0"
 
+# EFI boot will ignore this and use the EFI framebuffer at 800x600
 APPEND += "video=vesafb vga=0x318"
-- 
1.7.6.4