summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Thebeau <michel.thebeau@windriver.com>2013-03-28 19:32:55 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-03 17:01:14 +0100
commit9cd3816e4db97c8fd093a120a75a2b5d193afcdd (patch)
tree0c482a838909601f1afd8d13cafd0d5c7a664ae4
parent22133e5c77bd90143adcf0a2542b4961545b07d0 (diff)
downloadpoky-9cd3816e4db97c8fd093a120a75a2b5d193afcdd.tar.gz
routerstationpro: swap KERNEL_IMAGETYPE and KERNEL_ALT_IMAGETYPE
The routerstationpro has a 16mb flash which the kernel image should fit into. The default build type for vmlinux then should be the stripped arch/mips/boot/vmlinux.bin. Swapping KERNEL_IMAGETYPE and KERNEL_ALT_IMAGETYPE for rsp causes vmlinux.bin to be linked in tmp/deploy/images instead of vmlinux, and causes vmlinux.bin to appear in the kernel rpm file. [YOCTO #3515] (From meta-yocto rev: 70b569e9ea92a680f23b9bfddb2f27f4f5df3028) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Michel Thebeau <michel.thebeau@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta-yocto-bsp/conf/machine/routerstationpro.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-yocto-bsp/conf/machine/routerstationpro.conf b/meta-yocto-bsp/conf/machine/routerstationpro.conf
index e5e4d1a338..a727e2a0a2 100644
--- a/meta-yocto-bsp/conf/machine/routerstationpro.conf
+++ b/meta-yocto-bsp/conf/machine/routerstationpro.conf
@@ -6,8 +6,8 @@ require conf/machine/include/tune-mips32.inc
6 6
7MACHINE_FEATURES = "screen keyboard pci usbhost ext2 ext3 serial" 7MACHINE_FEATURES = "screen keyboard pci usbhost ext2 ext3 serial"
8 8
9KERNEL_IMAGETYPE = "vmlinux" 9KERNEL_ALT_IMAGETYPE = "vmlinux"
10KERNEL_ALT_IMAGETYPE = "vmlinux.bin" 10KERNEL_IMAGETYPE = "vmlinux.bin"
11 11
12PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" 12PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
13PREFERRED_VERSION_linux-yocto ?= "3.4%" 13PREFERRED_VERSION_linux-yocto ?= "3.4%"