diff options
| author | Darren Hart <dvhart@linux.intel.com> | 2011-11-30 17:47:10 -0800 |
|---|---|---|
| committer | Darren Hart <dvhart@linux.intel.com> | 2011-12-07 16:17:22 -0800 |
| commit | f635e47fe4022aab5e9d61660e418a66ef030c48 (patch) | |
| tree | 7cde2fa5e2b0fab9351ce34e228dd414e04729a5 /meta-fri2 | |
| parent | 5003358f2647f937b57e97c1655e39bf08d85fb0 (diff) | |
| download | meta-intel-f635e47fe4022aab5e9d61660e418a66ef030c48.tar.gz | |
fri2: Add pcbios and efi to MACHINE_FEATURES
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>
Diffstat (limited to 'meta-fri2')
| -rw-r--r-- | meta-fri2/conf/machine/fri2-noemgd.conf | 2 | ||||
| -rw-r--r-- | 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 7e994868..a8b889ff 100644 --- a/meta-fri2/conf/machine/fri2-noemgd.conf +++ b/meta-fri2/conf/machine/fri2-noemgd.conf | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | include conf/machine/include/tune-atom.inc | 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 pcbios efi" |
| 11 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5" | 11 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5" |
| 12 | 12 | ||
| 13 | XSERVER ?= "${XSERVER_IA32_BASE} \ | 13 | XSERVER ?= "${XSERVER_IA32_BASE} \ |
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf index 72d7a482..da4e981b 100644 --- a/meta-fri2/conf/machine/fri2.conf +++ b/meta-fri2/conf/machine/fri2.conf | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | include conf/machine/include/tune-atom.inc | 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 pcbios efi" |
| 11 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5" | 11 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5" |
| 12 | 12 | ||
| 13 | XSERVER ?= "${XSERVER_IA32_BASE} \ | 13 | XSERVER ?= "${XSERVER_IA32_BASE} \ |