diff options
author | George Nita <george.nita@enea.com> | 2015-08-20 05:12:04 +0200 |
---|---|---|
committer | George Nita <george.nita@enea.com> | 2015-08-20 05:12:04 +0200 |
commit | 52b57c5f39a041f0a05aac092d142050845734c9 (patch) | |
tree | 620d8cc0cd1e2d82403e4445e58c2ea0801e62fc /conf/machine/intel-quark.conf | |
parent | aedac614e462f2c11ea7ce7de02e5aa2267a3e3b (diff) | |
parent | adc8064908409d29b9f6a7f0710be400769807af (diff) | |
download | meta-intel-52b57c5f39a041f0a05aac092d142050845734c9.tar.gz |
Merge remote-tracking branch 'origin/master' into master-enea
Diffstat (limited to 'conf/machine/intel-quark.conf')
-rw-r--r-- | conf/machine/intel-quark.conf | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/conf/machine/intel-quark.conf b/conf/machine/intel-quark.conf index b59e5664..7da054ec 100644 --- a/conf/machine/intel-quark.conf +++ b/conf/machine/intel-quark.conf | |||
@@ -7,9 +7,8 @@ require conf/machine/include/meta-intel.inc | |||
7 | require conf/machine/include/intel-quark-common.inc | 7 | require conf/machine/include/intel-quark-common.inc |
8 | require conf/machine/include/intel-common-pkgarch.inc | 8 | require conf/machine/include/intel-common-pkgarch.inc |
9 | 9 | ||
10 | # Use dev kernel which is 4.1 based currently | 10 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" |
11 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto-dev" | 11 | PREFERRED_VERSION_linux-yocto ?= "4.1%" |
12 | PREFERRED_PROVIDER_linux-yocto ?= "linux-yocto-dev" | ||
13 | 12 | ||
14 | #Avoid pulling in GRUB | 13 | #Avoid pulling in GRUB |
15 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "" | 14 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "" |
@@ -24,5 +23,5 @@ APPEND += "console=ttyS1,115200 console=tty0" | |||
24 | 23 | ||
25 | EFI_PROVIDER = "gummiboot" | 24 | EFI_PROVIDER = "gummiboot" |
26 | 25 | ||
27 | 26 | # Ensure that the Lock prefix is omitted for the kernel" | |
28 | 27 | KERNEL_EXTRA_ARGS = "EXTRA_CFLAGS=-Wa,-momit-lock-prefix=yes" | |