fri2: Update display, wifi, and serial console

The following changes since commit c3e12aa981e97261093abee05bb0301c35f54c23:

meta-emenlow: switch edison back to linux-yocto-2.6.37 kernel (2011-10-11 13:54:59 -0500)

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

Darren Hart (4):
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

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

1.7.6.4

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.

---
 meta-fri2/conf/machine/fri2-noemgd.conf |    2 ++
 meta-fri2/conf/machine/fri2.conf        |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

index a871529..8137912 100644
@@ -26,7 +26,9 @@ XSERVER ?= "xserver-xf86-dri-lite \
            xf86-input-synaptics \
            xf86-video-vesa"
 
+SYSLINUX_OPTS = "serial 0 115200"
 SERIAL_CONSOLE = "115200 ttyS0"
+APPEND += "console=ttyS0,115200 console=tty0"
 
 MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
 

index 4b81fab..941d9f0 100644
@@ -29,7 +29,9 @@ XSERVER ?= "xserver-xf86-dri-lite \
 PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.9.3"
 PREFERRED_VERSION_emgd-driver-bin ?= "1.8"
 
+SYSLINUX_OPTS = "serial 0 115200"
 SERIAL_CONSOLE = "115200 ttyS0"
+APPEND += "console=ttyS0,115200 console=tty0"
 
 MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
 

1.7.6.4

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.

---
 .../xserver-xf86-config/fri2/xorg.conf             |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index fce58f8..73736ac 100644
@@ -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

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.

---
 .../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

new file mode 100644
index 0000000..97e64a5
@@ -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

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.

---
 meta-fri2/conf/machine/fri2-noemgd.conf |    3 ++-
 meta-fri2/conf/machine/fri2.conf        |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

index 8137912..292c925 100644
@@ -30,7 +30,8 @@ SYSLINUX_OPTS = "serial 0 115200"
 SERIAL_CONSOLE = "115200 ttyS0"
 APPEND += "console=ttyS0,115200 console=tty0"
 
-MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
+MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts \
+                             linux-firmware-iwlwifi-6000g2a-5"
 
 IMAGE_FSTYPES ?= "ext3 cpio.gz live"
 

index 941d9f0..1d84c30 100644
@@ -33,7 +33,8 @@ SYSLINUX_OPTS = "serial 0 115200"
 SERIAL_CONSOLE = "115200 ttyS0"
 APPEND += "console=ttyS0,115200 console=tty0"
 
-MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
+MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts \
+                             linux-firmware-iwlwifi-6000g2a-5"
 
 IMAGE_FSTYPES ?= "ext3 cpio.gz live"
 

1.7.6.4

This series applies to edison.

Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel