diff options
author | Tom Zanussi <tom.zanussi@intel.com> | 2012-12-12 22:56:32 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-13 16:54:32 +0000 |
commit | 254bf8c5d9135185c7f8cbb27496056be589b4ff (patch) | |
tree | dd1a7a463180722800d627d3e4a262c77b4443bb /scripts/lib/bsp/substrate/target/arch/arm/conf | |
parent | 4dc96e3629f3bb6e8478b95b9f4613a467c2f6bb (diff) | |
download | poky-254bf8c5d9135185c7f8cbb27496056be589b4ff.tar.gz |
yocto-bsp: update existing templates for linux-yocto-custom
Update existing templates to integrate with linux-yocto-custom.
(From meta-yocto rev: 7a8b55bdf499d001b77bb87345eb4eeab6013b2e)
Signed-off-by: Tom Zanussi <tom.zanussi@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, 7 insertions, 2 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 1990ef6796..d9ac3ff602 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 | |||
@@ -70,8 +70,13 @@ EXTRA_IMAGECMD_jffs2 = "-lnp " | |||
70 | # earlier kernels use ttyS2 | 70 | # earlier kernels use ttyS2 |
71 | SERIAL_CONSOLE = "115200 ttyO2" | 71 | SERIAL_CONSOLE = "115200 ttyO2" |
72 | 72 | ||
73 | {{ preferred_kernel = kernel_choice.split('_')[0] }} | 73 | {{ if kernel_choice == "custom": preferred_kernel = "linux-yocto-custom" }} |
74 | {{ preferred_kernel_version = kernel_choice.split('_')[1] }} | 74 | {{ if kernel_choice == "custom": }} |
75 | PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" | ||
76 | |||
77 | {{ if kernel_choice != "custom": preferred_kernel = kernel_choice.split('_')[0] }} | ||
78 | {{ if kernel_choice != "custom": preferred_kernel_version = kernel_choice.split('_')[1] }} | ||
79 | {{ if kernel_choice != "custom": }} | ||
75 | PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" | 80 | PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" |
76 | PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%" | 81 | PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%" |
77 | 82 | ||