diff options
author | Darren Hart <dvhart@linux.intel.com> | 2011-09-27 20:37:32 (GMT) |
---|---|---|
committer | Darren Hart <dvhart@linux.intel.com> | 2011-12-08 00:17:22 (GMT) |
commit | 5003358f2647f937b57e97c1655e39bf08d85fb0 (patch) | |
tree | 397b5117acda280feaf09ae478c82744d36e6511 /meta-fri2/conf | |
parent | 4157c57dc7c90fb96256c1653eb89ae6273c875d (diff) | |
download | meta-intel-5003358f2647f937b57e97c1655e39bf08d85fb0.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 | 2 | ||||
-rw-r--r-- | 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 | |||
8 | include conf/machine/include/ia32-base.inc | 8 | include conf/machine/include/ia32-base.inc |
9 | 9 | ||
10 | MACHINE_FEATURES += "wifi 3g" | 10 | MACHINE_FEATURES += "wifi 3g" |
11 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5" | ||
11 | 12 | ||
12 | XSERVER ?= "${XSERVER_IA32_BASE} \ | 13 | XSERVER ?= "${XSERVER_IA32_BASE} \ |
13 | ${XSERVER_IA32_EXT} \ | 14 | ${XSERVER_IA32_EXT} \ |
@@ -19,3 +20,4 @@ SERIAL_CONSOLE = "115200 ttyS0" | |||
19 | APPEND += "console=ttyS0,115200 console=tty0" | 20 | APPEND += "console=ttyS0,115200 console=tty0" |
20 | 21 | ||
21 | APPEND += "video=vesafb vga=0x318" | 22 | APPEND += "video=vesafb vga=0x318" |
23 | |||
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 | |||
8 | include conf/machine/include/ia32-base.inc | 8 | include conf/machine/include/ia32-base.inc |
9 | 9 | ||
10 | MACHINE_FEATURES += "wifi 3g" | 10 | MACHINE_FEATURES += "wifi 3g" |
11 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5" | ||
11 | 12 | ||
12 | XSERVER ?= "${XSERVER_IA32_BASE} \ | 13 | XSERVER ?= "${XSERVER_IA32_BASE} \ |
13 | ${XSERVER_IA32_EXT} \ | 14 | ${XSERVER_IA32_EXT} \ |