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/arm/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/arm/conf')
-rw-r--r-- | scripts/lib/bsp/substrate/target/arch/arm/conf/machine/{{=machine}}.conf | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/{{=machine}}.conf b/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/{{=machine}}.conf index 744486e6a9..44a80d226c 100644 --- a/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/{{=machine}}.conf +++ b/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/{{=machine}}.conf | |||
@@ -5,18 +5,18 @@ | |||
5 | 5 | ||
6 | {{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }} | 6 | {{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }} |
7 | {{ if xserver == "y": }} | 7 | {{ if xserver == "y": }} |
8 | PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" | 8 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" |
9 | XSERVER = "xserver-xorg \ | 9 | XSERVER ?= "xserver-xorg \ |
10 | xf86-input-evdev \ | 10 | xf86-input-evdev \ |
11 | xf86-input-mouse \ | 11 | xf86-input-mouse \ |
12 | xf86-video-omap \ | 12 | xf86-video-omapfb \ |
13 | xf86-input-keyboard" | 13 | xf86-input-keyboard" |
14 | 14 | ||
15 | # Ship all kernel modules by default | 15 | # Ship all kernel modules by default |
16 | MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" | 16 | MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" |
17 | 17 | ||
18 | # Allow for MMC booting (required by the NAND-less Beagleboard XM) | 18 | # Allow for MMC booting (required by the NAND-less Beagleboard XM) |
19 | EXTRA_IMAGEDEPENDS += "u-boot x-load" | 19 | EXTRA_IMAGEDEPENDS += "u-boot" |
20 | 20 | ||
21 | # Uncomment the following line to enable the hard floating point abi. Note that | 21 | # Uncomment the following line to enable the hard floating point abi. Note that |
22 | # this breaks some binary libraries and 3D (neither of which ship with | 22 | # this breaks some binary libraries and 3D (neither of which ship with |
@@ -27,8 +27,11 @@ EXTRA_IMAGEDEPENDS += "u-boot x-load" | |||
27 | {{ input type:"choice" val:"tune_arm920t" msg:"arm920t tuning optimizations" }} | 27 | {{ input type:"choice" val:"tune_arm920t" msg:"arm920t tuning optimizations" }} |
28 | {{ input type:"choice" val:"tune_arm926ejs" msg:"arm926ejs tuning optimizations" }} | 28 | {{ input type:"choice" val:"tune_arm926ejs" msg:"arm926ejs tuning optimizations" }} |
29 | {{ input type:"choice" val:"tune_arm9tdmi" msg:"arm9tdmi tuning optimizations" }} | 29 | {{ input type:"choice" val:"tune_arm9tdmi" msg:"arm9tdmi tuning optimizations" }} |
30 | {{ input type:"choice" val:"tune_cortexa5" msg:"cortexa5 tuning optimizations" }} | ||
31 | {{ input type:"choice" val:"tune_cortexa7" msg:"cortexa7 tuning optimizations" }} | ||
30 | {{ input type:"choice" val:"tune_cortexa8" msg:"cortexa8 tuning optimizations" }} | 32 | {{ input type:"choice" val:"tune_cortexa8" msg:"cortexa8 tuning optimizations" }} |
31 | {{ input type:"choice" val:"tune_cortexa9" msg:"cortexa9 tuning optimizations" }} | 33 | {{ input type:"choice" val:"tune_cortexa9" msg:"cortexa9 tuning optimizations" }} |
34 | {{ input type:"choice" val:"tune_cortexa15" msg:"cortexa15 tuning optimizations" }} | ||
32 | {{ input type:"choice" val:"tune_cortexm1" msg:"cortexm1 tuning optimizations" }} | 35 | {{ input type:"choice" val:"tune_cortexm1" msg:"cortexm1 tuning optimizations" }} |
33 | {{ input type:"choice" val:"tune_cortexm3" msg:"cortexm3 tuning optimizations" }} | 36 | {{ input type:"choice" val:"tune_cortexm3" msg:"cortexm3 tuning optimizations" }} |
34 | {{ input type:"choice" val:"tune_cortexr4" msg:"cortexr4 tuning optimizations" }} | 37 | {{ input type:"choice" val:"tune_cortexr4" msg:"cortexr4 tuning optimizations" }} |
@@ -44,10 +47,16 @@ include conf/machine/include/tune-arm920t.inc | |||
44 | include conf/machine/include/tune-arm926ejs.inc | 47 | include conf/machine/include/tune-arm926ejs.inc |
45 | {{ if tunefile == "tune_arm9tdmi": }} | 48 | {{ if tunefile == "tune_arm9tdmi": }} |
46 | include conf/machine/include/tune-arm9tdmi.inc | 49 | include conf/machine/include/tune-arm9tdmi.inc |
50 | {{ if tunefile == "tune_cortexa5": }} | ||
51 | include conf/machine/include/tune-cortexa5.inc | ||
52 | {{ if tunefile == "tune_cortexa7": }} | ||
53 | include conf/machine/include/tune-cortexa7.inc | ||
47 | {{ if tunefile == "tune_cortexa8": }} | 54 | {{ if tunefile == "tune_cortexa8": }} |
48 | include conf/machine/include/tune-cortexa8.inc | 55 | include conf/machine/include/tune-cortexa8.inc |
49 | {{ if tunefile == "tune_cortexa9": }} | 56 | {{ if tunefile == "tune_cortexa9": }} |
50 | include conf/machine/include/tune-cortexa9.inc | 57 | include conf/machine/include/tune-cortexa9.inc |
58 | {{ if tunefile == "tune_cortexa15": }} | ||
59 | include conf/machine/include/tune-cortexa15.inc | ||
51 | {{ if tunefile == "tune_cortexm1": }} | 60 | {{ if tunefile == "tune_cortexm1": }} |
52 | include conf/machine/include/tune-cortexm1.inc | 61 | include conf/machine/include/tune-cortexm1.inc |
53 | {{ if tunefile == "tune_cortexm3": }} | 62 | {{ if tunefile == "tune_cortexm3": }} |
@@ -81,8 +90,11 @@ PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" | |||
81 | PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" | 90 | PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" |
82 | PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%" | 91 | PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%" |
83 | 92 | ||
84 | KERNEL_IMAGETYPE = "uImage" | 93 | KERNEL_IMAGETYPE = "zImage" |
94 | KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/omap3-beagle.dts ${S}/arch/arm/boot/dts/omap3-beagle-xm.dts" | ||
85 | 95 | ||
96 | SPL_BINARY = "MLO" | ||
97 | UBOOT_SUFFIX = "img" | ||
86 | {{ input type:"edit" name:"uboot_machine" prio:"40" msg:"Please specify a value for UBOOT_MACHINE:" default:"omap3_beagle_config" }} | 98 | {{ input type:"edit" name:"uboot_machine" prio:"40" msg:"Please specify a value for UBOOT_MACHINE:" default:"omap3_beagle_config" }} |
87 | UBOOT_MACHINE = "{{=uboot_machine}}" | 99 | UBOOT_MACHINE = "{{=uboot_machine}}" |
88 | {{ input type:"edit" name:"uboot_entrypoint" prio:"40" msg:"Please specify a value for UBOOT_ENTRYPOINT:" default:"0x80008000" }} | 100 | {{ input type:"edit" name:"uboot_entrypoint" prio:"40" msg:"Please specify a value for UBOOT_ENTRYPOINT:" default:"0x80008000" }} |