diff options
author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2013-09-23 08:42:51 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-24 12:01:47 +0100 |
commit | 0fc8317c6385eb1ed69ca4522ee6424c456dbb92 (patch) | |
tree | 8b878687d9309556c4476ccb17467f52faa36d62 /scripts/lib/bsp/substrate/target/arch/mips/conf/machine/{{=machine}}.conf | |
parent | bf6b0d95db3863a2cfbccb154c0c7ad5b3bbf0b0 (diff) | |
download | poky-0fc8317c6385eb1ed69ca4522ee6424c456dbb92.tar.gz |
yocto-bsp: add 3.10/remove 3.8 kernel from templates
For Yocto 1.5, 3.10 is the preferred kernel and 3.8 is obsolete.
This also removes any mention of emgd from the templates - we want to
discourage users from using it - it will be obsolete soon in any case.
Fixes [YOCTO #5107]
(From meta-yocto rev: 4dd4bf6ac2dcc7652ec8f807df02298546bdb41b)
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/bsp/substrate/target/arch/mips/conf/machine/{{=machine}}.conf')
-rw-r--r-- | scripts/lib/bsp/substrate/target/arch/mips/conf/machine/{{=machine}}.conf | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/conf/machine/{{=machine}}.conf b/scripts/lib/bsp/substrate/target/arch/mips/conf/machine/{{=machine}}.conf index 08bb9f193d..3856b38b13 100644 --- a/scripts/lib/bsp/substrate/target/arch/mips/conf/machine/{{=machine}}.conf +++ b/scripts/lib/bsp/substrate/target/arch/mips/conf/machine/{{=machine}}.conf | |||
@@ -9,6 +9,7 @@ MACHINE_FEATURES = "screen keyboard pci usbhost ext2 ext3 serial" | |||
9 | 9 | ||
10 | KERNEL_IMAGETYPE = "vmlinux" | 10 | KERNEL_IMAGETYPE = "vmlinux" |
11 | KERNEL_ALT_IMAGETYPE = "vmlinux.bin" | 11 | KERNEL_ALT_IMAGETYPE = "vmlinux.bin" |
12 | KERNEL_IMAGE_STRIP_EXTRA_SECTIONS = ".comment" | ||
12 | 13 | ||
13 | {{ if kernel_choice == "custom": preferred_kernel = "linux-yocto-custom" }} | 14 | {{ if kernel_choice == "custom": preferred_kernel = "linux-yocto-custom" }} |
14 | {{ if kernel_choice == "linux-yocto-dev": preferred_kernel = "linux-yocto-dev" }} | 15 | {{ if kernel_choice == "linux-yocto-dev": preferred_kernel = "linux-yocto-dev" }} |
@@ -23,13 +24,13 @@ PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%" | |||
23 | 24 | ||
24 | {{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }} | 25 | {{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }} |
25 | {{ if xserver == "y": }} | 26 | {{ if xserver == "y": }} |
26 | PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" | 27 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" |
27 | XSERVER = "xserver-xorg \ | 28 | XSERVER ?= "xserver-xorg \ |
28 | xserver-xorg-extension-extmod \ | 29 | xf86-input-evdev \ |
29 | xf86-input-evdev \ | 30 | xf86-video-fbdev" |
30 | xf86-video-fbdev" | ||
31 | 31 | ||
32 | SERIAL_CONSOLE = "115200 ttyS0" | 32 | SERIAL_CONSOLE = "115200 ttyS0" |
33 | USE_VT ?= "0" | ||
33 | 34 | ||
34 | MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" | 35 | MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" |
35 | 36 | ||