diff options
| author | Darren Hart <dvhart@linux.intel.com> | 2011-09-27 13:37:32 -0700 |
|---|---|---|
| committer | Darren Hart <dvhart@linux.intel.com> | 2011-12-08 13:55:04 -0800 |
| commit | 10e3a043fbc6abcf4b1f5b464c2df5a6d957cf97 (patch) | |
| tree | 106d763fe4e3cbbddcb056ac319c40e96c0d69cd /meta-fri2/conf | |
| parent | d141e55c458f66db88e9fccbd3239c5e89002512 (diff) | |
| download | meta-intel-10e3a043fbc6abcf4b1f5b464c2df5a6d957cf97.tar.gz | |
fri2: include linux-firmware for iwlwifi in images
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>
Diffstat (limited to 'meta-fri2/conf')
| -rw-r--r-- | meta-fri2/conf/machine/fri2-noemgd.conf | 3 | ||||
| -rw-r--r-- | meta-fri2/conf/machine/fri2.conf | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/meta-fri2/conf/machine/fri2-noemgd.conf b/meta-fri2/conf/machine/fri2-noemgd.conf index 867cf7f1..9526b120 100644 --- a/meta-fri2/conf/machine/fri2-noemgd.conf +++ b/meta-fri2/conf/machine/fri2-noemgd.conf | |||
| @@ -30,7 +30,8 @@ SYSLINUX_OPTS = "serial 0 115200" | |||
| 30 | SERIAL_CONSOLE = "115200 ttyS0" | 30 | SERIAL_CONSOLE = "115200 ttyS0" |
| 31 | APPEND += "console=ttyS0,115200 console=tty0" | 31 | APPEND += "console=ttyS0,115200 console=tty0" |
| 32 | 32 | ||
| 33 | MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts" | 33 | MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts \ |
| 34 | linux-firmware-iwlwifi-6000g2a-5" | ||
| 34 | 35 | ||
| 35 | IMAGE_FSTYPES ?= "ext3 cpio.gz live" | 36 | IMAGE_FSTYPES ?= "ext3 cpio.gz live" |
| 36 | 37 | ||
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf index 49d72249..38e3bb5d 100644 --- a/meta-fri2/conf/machine/fri2.conf +++ b/meta-fri2/conf/machine/fri2.conf | |||
| @@ -33,7 +33,8 @@ SYSLINUX_OPTS = "serial 0 115200" | |||
| 33 | SERIAL_CONSOLE = "115200 ttyS0" | 33 | SERIAL_CONSOLE = "115200 ttyS0" |
| 34 | APPEND += "console=ttyS0,115200 console=tty0" | 34 | APPEND += "console=ttyS0,115200 console=tty0" |
| 35 | 35 | ||
| 36 | MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts" | 36 | MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts \ |
| 37 | linux-firmware-iwlwifi-6000g2a-5" | ||
| 37 | 38 | ||
| 38 | IMAGE_FSTYPES ?= "ext3 cpio.gz live" | 39 | IMAGE_FSTYPES ?= "ext3 cpio.gz live" |
| 39 | 40 | ||