diff options
author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2013-03-04 10:15:20 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-17 23:10:27 +0000 |
commit | 04d15f567d0493654df519f404f564e2591e9453 (patch) | |
tree | 578c09979f6555a491b49e7c9cbf1b563e430d81 /scripts/lib/bsp/substrate/target/arch/arm/conf | |
parent | f0f436e0d28605424566bb28ea9171e3486cdfac (diff) | |
download | poky-04d15f567d0493654df519f404f564e2591e9453.tar.gz |
yocto-bsp: add support for linux-yocto-dev
(From meta-yocto rev: 637104794a5646869d03ff5851d94199b1584dcf)
Signed-off-by: Tom Zanussi <tom.zanussi@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 | 9 |
1 files changed, 5 insertions, 4 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 d9ac3ff602..ce9a58f38b 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 | |||
@@ -71,12 +71,13 @@ EXTRA_IMAGECMD_jffs2 = "-lnp " | |||
71 | SERIAL_CONSOLE = "115200 ttyO2" | 71 | SERIAL_CONSOLE = "115200 ttyO2" |
72 | 72 | ||
73 | {{ if kernel_choice == "custom": preferred_kernel = "linux-yocto-custom" }} | 73 | {{ if kernel_choice == "custom": preferred_kernel = "linux-yocto-custom" }} |
74 | {{ if kernel_choice == "custom": }} | 74 | {{ if kernel_choice == "linux-yocto-dev": preferred_kernel = "linux-yocto-dev" }} |
75 | {{ if kernel_choice == "custom" or kernel_choice == "linux-yocto-dev" : }} | ||
75 | PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" | 76 | PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" |
76 | 77 | ||
77 | {{ if kernel_choice != "custom": preferred_kernel = kernel_choice.split('_')[0] }} | 78 | {{ if kernel_choice != "custom" and kernel_choice != "linux-yocto-dev": preferred_kernel = kernel_choice.split('_')[0] }} |
78 | {{ if kernel_choice != "custom": preferred_kernel_version = kernel_choice.split('_')[1] }} | 79 | {{ if kernel_choice != "custom" and kernel_choice != "linux-yocto-dev": preferred_kernel_version = kernel_choice.split('_')[1] }} |
79 | {{ if kernel_choice != "custom": }} | 80 | {{ if kernel_choice != "custom" and kernel_choice != "linux-yocto-dev": }} |
80 | PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" | 81 | PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" |
81 | PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%" | 82 | PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%" |
82 | 83 | ||