diff options
author | Jussi Laako <jussi.laako@linux.intel.com> | 2017-03-20 15:08:02 +0200 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2017-03-21 19:03:03 -0700 |
commit | 66637d28a779c8fc5b838a5f94f11806a4f553bc (patch) | |
tree | 53dff1fce7e8ced06e01b06b7c573dba83f95e2b /conf/machine | |
parent | 37d46e1319d336195fb2b638412c9910fdd1668d (diff) | |
download | meta-intel-66637d28a779c8fc5b838a5f94f11806a4f553bc.tar.gz |
Include recommended packges for all Intel machines
Moves common MACHINE_EXTRA_RRECOMMENDS to a common include file and
add thermald to MACHINE_EXTRA_RRECOMMENDS.
Signed-off-by: Jussi Laako <jussi.laako@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'conf/machine')
-rw-r--r-- | conf/machine/include/meta-intel.inc | 3 | ||||
-rw-r--r-- | conf/machine/intel-core2-32.conf | 2 | ||||
-rw-r--r-- | conf/machine/intel-corei7-64.conf | 2 | ||||
-rw-r--r-- | conf/machine/intel-quark.conf | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/conf/machine/include/meta-intel.inc b/conf/machine/include/meta-intel.inc index 04bd5534..38d856fd 100644 --- a/conf/machine/include/meta-intel.inc +++ b/conf/machine/include/meta-intel.inc | |||
@@ -29,6 +29,9 @@ XSERVER_X86_ASPEED_AST = "xf86-video-ast \ | |||
29 | # include the user space intel microcode loading support in the generated images. | 29 | # include the user space intel microcode loading support in the generated images. |
30 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append = "${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', ' intel-microcode', '', d)}" | 30 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append = "${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', ' intel-microcode', '', d)}" |
31 | 31 | ||
32 | # recommended extra packages common to all intel machines | ||
33 | MACHINE_EXTRA_RRECOMMENDS_append = " kernel-modules linux-firmware thermald" | ||
34 | |||
32 | # for the early boot time kernel microcode loading support, | 35 | # for the early boot time kernel microcode loading support, |
33 | # merge the microcode data in the final initrd image. | 36 | # merge the microcode data in the final initrd image. |
34 | INITRD_LIVE_prepend = "${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', '${DEPLOY_DIR_IMAGE}/microcode.cpio ', '', d)}" | 37 | INITRD_LIVE_prepend = "${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', '${DEPLOY_DIR_IMAGE}/microcode.cpio ', '', d)}" |
diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf index c5cfb9c0..c15f72b6 100644 --- a/conf/machine/intel-core2-32.conf +++ b/conf/machine/intel-core2-32.conf | |||
@@ -14,8 +14,6 @@ MACHINE_FEATURES += "intel-ucode" | |||
14 | 14 | ||
15 | MACHINE_HWCODECS ?= "va-intel gstreamer1.0-vaapi" | 15 | MACHINE_HWCODECS ?= "va-intel gstreamer1.0-vaapi" |
16 | 16 | ||
17 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware" | ||
18 | |||
19 | MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "gma500-gfx-check" | 17 | MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "gma500-gfx-check" |
20 | 18 | ||
21 | XSERVER ?= "${XSERVER_X86_BASE} \ | 19 | XSERVER ?= "${XSERVER_X86_BASE} \ |
diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf index 43e7c1ab..1e5de49e 100644 --- a/conf/machine/intel-corei7-64.conf +++ b/conf/machine/intel-corei7-64.conf | |||
@@ -14,7 +14,7 @@ MACHINE_FEATURES += "intel-ucode" | |||
14 | 14 | ||
15 | MACHINE_HWCODECS ?= "va-intel gstreamer1.0-vaapi" | 15 | MACHINE_HWCODECS ?= "va-intel gstreamer1.0-vaapi" |
16 | 16 | ||
17 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware lms8" | 17 | MACHINE_EXTRA_RRECOMMENDS += "lms8" |
18 | 18 | ||
19 | XSERVER ?= "${XSERVER_X86_BASE} \ | 19 | XSERVER ?= "${XSERVER_X86_BASE} \ |
20 | ${XSERVER_X86_EXT} \ | 20 | ${XSERVER_X86_EXT} \ |
diff --git a/conf/machine/intel-quark.conf b/conf/machine/intel-quark.conf index 6e3bb30d..17e8c52f 100644 --- a/conf/machine/intel-quark.conf +++ b/conf/machine/intel-quark.conf | |||
@@ -13,8 +13,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "" | |||
13 | MACHINE_FEATURES = "efi usb" | 13 | MACHINE_FEATURES = "efi usb" |
14 | MACHINE_FEATURES += "intel-ucode" | 14 | MACHINE_FEATURES += "intel-ucode" |
15 | 15 | ||
16 | MACHINE_EXTRA_RRECOMMENDS += "kernel-modules linux-firmware" | ||
17 | |||
18 | SERIAL_CONSOLE = "115200 ttyS1" | 16 | SERIAL_CONSOLE = "115200 ttyS1" |
19 | APPEND += "rootwait console=ttyS1,115200 console=tty0" | 17 | APPEND += "rootwait console=ttyS1,115200 console=tty0" |
20 | 18 | ||