From 9cd3816e4db97c8fd093a120a75a2b5d193afcdd Mon Sep 17 00:00:00 2001 From: Michel Thebeau Date: Thu, 28 Mar 2013 19:32:55 +0000 Subject: [PATCH] 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 Signed-off-by: Michel Thebeau Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta-yocto-bsp/conf/machine/routerstationpro.conf | 4 ++-- 1 file 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 MACHINE_FEATURES = "screen keyboard pci usbhost ext2 ext3 serial" -KERNEL_IMAGETYPE = "vmlinux" -KERNEL_ALT_IMAGETYPE = "vmlinux.bin" +KERNEL_ALT_IMAGETYPE = "vmlinux" +KERNEL_IMAGETYPE = "vmlinux.bin" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" PREFERRED_VERSION_linux-yocto ?= "3.4%"