summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2011-12-01 01:47:10 (GMT)
committerDarren Hart <dvhart@linux.intel.com>2011-12-08 00:17:22 (GMT)
commitf635e47fe4022aab5e9d61660e418a66ef030c48 (patch)
tree7cde2fa5e2b0fab9351ce34e228dd414e04729a5
parent5003358f2647f937b57e97c1655e39bf08d85fb0 (diff)
downloadmeta-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>
-rw-r--r--meta-fri2/conf/machine/fri2-noemgd.conf2
-rw-r--r--meta-fri2/conf/machine/fri2.conf2
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 @@
7include conf/machine/include/tune-atom.inc 7include conf/machine/include/tune-atom.inc
8include conf/machine/include/ia32-base.inc 8include conf/machine/include/ia32-base.inc
9 9
10MACHINE_FEATURES += "wifi 3g" 10MACHINE_FEATURES += "wifi 3g pcbios efi"
11MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5" 11MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5"
12 12
13XSERVER ?= "${XSERVER_IA32_BASE} \ 13XSERVER ?= "${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 @@
7include conf/machine/include/tune-atom.inc 7include conf/machine/include/tune-atom.inc
8include conf/machine/include/ia32-base.inc 8include conf/machine/include/ia32-base.inc
9 9
10MACHINE_FEATURES += "wifi 3g" 10MACHINE_FEATURES += "wifi 3g pcbios efi"
11MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5" 11MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5"
12 12
13XSERVER ?= "${XSERVER_IA32_BASE} \ 13XSERVER ?= "${XSERVER_IA32_BASE} \