Separate the function which prepares the kernel for packing into uImage into separate class, so this function can be reused by the fitImage class.
Signed-off-by: Marek Vasut <[email protected]> Cc: Richard Purdie <[email protected]> Cc: Koen Kooi <[email protected]> Cc: Paul Eggleton <[email protected]> Cc: Ross Burton <[email protected]> Cc: Bruce Ashfield <[email protected]> --- meta/classes/kernel-uboot.bbclass | 21 +++++++++++++++++++++ meta/classes/kernel-uimage.bbclass | 24 ++---------------------- 2 files changed, 23 insertions(+), 22 deletions(-) create mode 100644 meta/classes/kernel-uboot.bbclass diff --git a/meta/classes/kernel-uboot.bbclass b/meta/classes/kernel-uboot.bbclass new file mode 100644 index 0000000..8ab30b8 --- /dev/null +++ b/meta/classes/kernel-uboot.bbclass @@ -0,0 +1,21 @@ +uboot_prep_kimage() { + if test -e arch/${ARCH}/boot/compressed/vmlinux ; then + vmlinux_path="arch/${ARCH}/boot/compressed/vmlinux" + linux_suffix="" + linux_comp="none" + else + vmlinux_path="vmlinux" + linux_suffix=".gz" + linux_comp="gzip" + fi + + ${OBJCOPY} -O binary -R .note -R .comment -S "${vmlinux_path}" linux.bin + + if [ "${linux_comp}" != "none" ] ; then + rm -f linux.bin + gzip -9 linux.bin + mv -f "linux.bin${linux_suffix}" linux.bin + fi + + echo "${linux_comp}" +} diff --git a/meta/classes/kernel-uimage.bbclass b/meta/classes/kernel-uimage.bbclass index 8a3efc6..ce8f96f 100644 --- a/meta/classes/kernel-uimage.bbclass +++ b/meta/classes/kernel-uimage.bbclass @@ -1,3 +1,5 @@ +inherit kernel-uboot + python __anonymous () { kerneltype = d.getVar('KERNEL_IMAGETYPE', True) if kerneltype == 'uImage': @@ -6,28 +8,6 @@ python __anonymous () { d.setVar("DEPENDS", depends) } -uboot_prep_kimage() { - if test -e arch/${ARCH}/boot/compressed/vmlinux ; then - vmlinux_path="arch/${ARCH}/boot/compressed/vmlinux" - linux_suffix="" - linux_comp="none" - else - vmlinux_path="vmlinux" - linux_suffix=".gz" - linux_comp="gzip" - fi - - ${OBJCOPY} -O binary -R .note -R .comment -S "${vmlinux_path}" linux.bin - - if [ "${linux_comp}" != "none" ] ; then - rm -f linux.bin - gzip -9 linux.bin - mv -f "linux.bin${linux_suffix}" linux.bin - fi - - echo "${linux_comp}" -} - do_uboot_mkimage() { if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then if test "x${KEEPUIMAGE}" != "xyes" ; then -- 2.1.4 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
