diff options
author | George Nita <george.nita@enea.com> | 2015-08-07 05:12:02 +0200 |
---|---|---|
committer | George Nita <george.nita@enea.com> | 2015-08-07 05:12:02 +0200 |
commit | b314259dfc9cb978bf583d1ed6e67ca04bcc4cb1 (patch) | |
tree | 6652d08be3d8c02faceb17f18d29f8e7d1c230f4 | |
parent | 1be68da0e9ec9b9035c94346a5b51b4c3b27af96 (diff) | |
parent | fe124f44c7e84f7627429b2daff673d5d09094f6 (diff) | |
download | meta-intel-b314259dfc9cb978bf583d1ed6e67ca04bcc4cb1.tar.gz |
Merge remote-tracking branch 'origin/master' into master-enea
-rw-r--r-- | meta-isg/meta-valleyisland/conf/machine/valleyisland-32.conf | 2 | ||||
-rw-r--r-- | meta-isg/meta-valleyisland/conf/machine/valleyisland-64.conf | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/meta-isg/meta-valleyisland/conf/machine/valleyisland-32.conf b/meta-isg/meta-valleyisland/conf/machine/valleyisland-32.conf index 385fb93f..2353f3d1 100644 --- a/meta-isg/meta-valleyisland/conf/machine/valleyisland-32.conf +++ b/meta-isg/meta-valleyisland/conf/machine/valleyisland-32.conf | |||
@@ -14,6 +14,8 @@ require conf/machine/include/meta-intel.inc | |||
14 | 14 | ||
15 | MACHINE_FEATURES += "pcbios efi" | 15 | MACHINE_FEATURES += "pcbios efi" |
16 | 16 | ||
17 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware" | ||
18 | |||
17 | XSERVER ?= "${XSERVER_X86_BASE} \ | 19 | XSERVER ?= "${XSERVER_X86_BASE} \ |
18 | ${XSERVER_X86_EXT} \ | 20 | ${XSERVER_X86_EXT} \ |
19 | ${XSERVER_X86_FBDEV} \ | 21 | ${XSERVER_X86_FBDEV} \ |
diff --git a/meta-isg/meta-valleyisland/conf/machine/valleyisland-64.conf b/meta-isg/meta-valleyisland/conf/machine/valleyisland-64.conf index 7b5fe2d6..917b0a35 100644 --- a/meta-isg/meta-valleyisland/conf/machine/valleyisland-64.conf +++ b/meta-isg/meta-valleyisland/conf/machine/valleyisland-64.conf | |||
@@ -15,6 +15,7 @@ require conf/machine/include/meta-intel.inc | |||
15 | 15 | ||
16 | MACHINE_FEATURES += "pcbios efi" | 16 | MACHINE_FEATURES += "pcbios efi" |
17 | 17 | ||
18 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware" | ||
18 | 19 | ||
19 | XSERVER ?= "${XSERVER_X86_BASE} \ | 20 | XSERVER ?= "${XSERVER_X86_BASE} \ |
20 | ${XSERVER_X86_EXT} \ | 21 | ${XSERVER_X86_EXT} \ |