summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorJussi Laako <jussi.laako@linux.intel.com>2017-03-20 13:08:02 (GMT)
committerSaul Wold <sgw@linux.intel.com>2017-03-22 02:03:03 (GMT)
commit66637d28a779c8fc5b838a5f94f11806a4f553bc (patch)
tree53dff1fce7e8ced06e01b06b7c573dba83f95e2b /conf
parent37d46e1319d336195fb2b638412c9910fdd1668d (diff)
downloadmeta-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')
-rw-r--r--conf/machine/include/meta-intel.inc3
-rw-r--r--conf/machine/intel-core2-32.conf2
-rw-r--r--conf/machine/intel-corei7-64.conf2
-rw-r--r--conf/machine/intel-quark.conf2
4 files changed, 4 insertions, 5 deletions
diff --git a/conf/machine/include/meta-intel.inc b/conf/machine/include/meta-intel.inc
index 04bd553..38d856f 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.
30MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append = "${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', ' intel-microcode', '', d)}" 30MACHINE_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
33MACHINE_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.
34INITRD_LIVE_prepend = "${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', '${DEPLOY_DIR_IMAGE}/microcode.cpio ', '', d)}" 37INITRD_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 c5cfb9c..c15f72b 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
15MACHINE_HWCODECS ?= "va-intel gstreamer1.0-vaapi" 15MACHINE_HWCODECS ?= "va-intel gstreamer1.0-vaapi"
16 16
17MACHINE_EXTRA_RRECOMMENDS += "linux-firmware"
18
19MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "gma500-gfx-check" 17MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "gma500-gfx-check"
20 18
21XSERVER ?= "${XSERVER_X86_BASE} \ 19XSERVER ?= "${XSERVER_X86_BASE} \
diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf
index 43e7c1a..1e5de49 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
15MACHINE_HWCODECS ?= "va-intel gstreamer1.0-vaapi" 15MACHINE_HWCODECS ?= "va-intel gstreamer1.0-vaapi"
16 16
17MACHINE_EXTRA_RRECOMMENDS += "linux-firmware lms8" 17MACHINE_EXTRA_RRECOMMENDS += "lms8"
18 18
19XSERVER ?= "${XSERVER_X86_BASE} \ 19XSERVER ?= "${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 6e3bb30..17e8c52 100644
--- a/conf/machine/intel-quark.conf
+++ b/conf/machine/intel-quark.conf
@@ -13,8 +13,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS = ""
13MACHINE_FEATURES = "efi usb" 13MACHINE_FEATURES = "efi usb"
14MACHINE_FEATURES += "intel-ucode" 14MACHINE_FEATURES += "intel-ucode"
15 15
16MACHINE_EXTRA_RRECOMMENDS += "kernel-modules linux-firmware"
17
18SERIAL_CONSOLE = "115200 ttyS1" 16SERIAL_CONSOLE = "115200 ttyS1"
19APPEND += "rootwait console=ttyS1,115200 console=tty0" 17APPEND += "rootwait console=ttyS1,115200 console=tty0"
20 18