summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndré Draszik <adraszik@tycoint.com>2017-09-20 10:41:56 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-09-25 14:14:17 +0100
commit0dff25481fb1f222d32e155dd17f7b27d9de6a56 (patch)
treeb47e755f8f2ebf9ae08d7a44e02e453235229d68
parent4fec14feacae09e22adef297ad76d299b9100392 (diff)
downloadpoky-0dff25481fb1f222d32e155dd17f7b27d9de6a56.tar.gz
kernel-uboot: support compressed kernel on MIPS
MIPS generates vmlinuz.bin when compression in the kernel build is enabled, including any necessary objcopy so we can leverage that and skip our manual invocation of objcopy here. We just have to put the file into the right place for the rest of the build to find it. (From OE-Core rev: 00bc7682473c2558d72ba42c182f8e3bd445f8af) Signed-off-by: André Draszik <adraszik@tycoint.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/kernel-uboot.bbclass8
1 files changed, 7 insertions, 1 deletions
diff --git a/meta/classes/kernel-uboot.bbclass b/meta/classes/kernel-uboot.bbclass
index 868e97d7a7..87f02654fa 100644
--- a/meta/classes/kernel-uboot.bbclass
+++ b/meta/classes/kernel-uboot.bbclass
@@ -3,13 +3,19 @@ uboot_prep_kimage() {
3 vmlinux_path="arch/${ARCH}/boot/compressed/vmlinux" 3 vmlinux_path="arch/${ARCH}/boot/compressed/vmlinux"
4 linux_suffix="" 4 linux_suffix=""
5 linux_comp="none" 5 linux_comp="none"
6 elif [ -e arch/${ARCH}/boot/vmlinuz.bin ]; then
7 rm -f linux.bin
8 cp -l arch/${ARCH}/boot/vmlinuz.bin linux.bin
9 vmlinux_path=""
10 linux_suffix=""
11 linux_comp="none"
6 else 12 else
7 vmlinux_path="vmlinux" 13 vmlinux_path="vmlinux"
8 linux_suffix=".gz" 14 linux_suffix=".gz"
9 linux_comp="gzip" 15 linux_comp="gzip"
10 fi 16 fi
11 17
12 ${OBJCOPY} -O binary -R .note -R .comment -S "${vmlinux_path}" linux.bin 18 [ -n "${vmlinux_path}" ] && ${OBJCOPY} -O binary -R .note -R .comment -S "${vmlinux_path}" linux.bin
13 19
14 if [ "${linux_comp}" != "none" ] ; then 20 if [ "${linux_comp}" != "none" ] ; then
15 gzip -9 linux.bin 21 gzip -9 linux.bin