kernel: Pull uImage generation into separate class

Pull the uImage image format generation from kernel.bbclass into
a separate kernel-uimage.bbclass. Introduce new KERNEL_CLASSES
variable, which allows registration of additional classes which
implement new kernel image types. The default value of is to
register kernel-uimage to preserve the original behavior.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
Cc: Koen Kooi <koen@dominion.thruhere.net>
Cc: Paul Eggleton <paul.eggleton@linux.intel.com>
Cc: Ross Burton <ross.burton@intel.com>
Cc: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/kernel-uimage.bbclass b/meta/classes/kernel-uimage.bbclass
new file mode 100644 (file)
index 0000000..8a3efc6
--- /dev/null
+++ b/meta/classes/kernel-uimage.bbclass
@@ -0,0 +1,48 @@
+python __anonymous () {
+    kerneltype = d.getVar('KERNEL_IMAGETYPE', True)
+    if kerneltype == 'uImage':
+        depends = d.getVar("DEPENDS", True)
+        depends = "%s u-boot-mkimage-native" % depends
+        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
+                       uboot_prep_kimage
+
+                       ENTRYPOINT=${UBOOT_ENTRYPOINT}
+                       if test -n "${UBOOT_ENTRYSYMBOL}"; then
+                               ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \
+                                       awk '$3=="${UBOOT_ENTRYSYMBOL}" {print $1}'`
+                       fi
+
+                       uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C "${linux_comp}" -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin arch/${ARCH}/boot/uImage
+                       rm -f linux.bin
+               fi
+       fi
+}
+
+addtask uboot_mkimage before do_install after do_compile

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index ba4bc607b0c0cb689f7331d90afe8bc7055356f3..76d03dc4a7f8a7c1052e3f00a0da44de061e90a3 100644 (file)
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -20,10 +20,6 @@ python __anonymous () {
     import re
 
     kerneltype = d.getVar('KERNEL_IMAGETYPE', True)
-    if kerneltype == 'uImage':
-        depends = d.getVar("DEPENDS", True)
-        depends = "%s u-boot-mkimage-native" % depends
-        d.setVar("DEPENDS", depends)
 
     d.setVar("KERNEL_IMAGETYPE_FOR_MAKE", re.sub(r'\.gz$', '', kerneltype))
 
@@ -40,6 +36,23 @@ python __anonymous () {
         d.appendVarFlag('do_configure', 'depends', ' ${INITRAMFS_TASK}')
 }
 
+# Here we pull in all various kernel image types which we support.
+#
+# In case you're wondering why kernel.bbclass inherits the other image
+# types instead of the other way around, the reason for that is to
+# maintain compatibility with various currently existing meta-layers.
+# By pulling in the various kernel image types here, we retain the
+# original behavior of kernel.bbclass, so no meta-layers should get
+# broken.
+#
+# KERNEL_CLASSES by default pulls in kernel-uimage.bbclass, since this
+# used to be the default behavior when only uImage was supported. This
+# variable can be appended by users who implement support for new kernel
+# image types.
+
+KERNEL_CLASSES ?= " kernel-uimage "
+inherit ${KERNEL_CLASSES}
+
 # Old style kernels may set ${S} = ${WORKDIR}/git for example
 # We need to move these over to STAGING_KERNEL_DIR. We can't just
 # create the symlink in advance as the git fetcher can't cope with
@@ -437,47 +450,6 @@ MODULE_TARBALL_BASE_NAME ?= "${MODULE_IMAGE_BASE_NAME}.tgz"
 MODULE_TARBALL_SYMLINK_NAME ?= "modules-${MACHINE}.tgz"
 MODULE_TARBALL_DEPLOY ?= "1"
 
-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
-                       uboot_prep_kimage
-
-                       ENTRYPOINT=${UBOOT_ENTRYPOINT}
-                       if test -n "${UBOOT_ENTRYSYMBOL}"; then
-                               ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \
-                                       awk '$3=="${UBOOT_ENTRYSYMBOL}" {print $1}'`
-                       fi
-
-                       uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C "${linux_comp}" -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin arch/${ARCH}/boot/uImage
-                       rm -f linux.bin
-               fi
-       fi
-}
-
-addtask uboot_mkimage before do_install after do_compile
-
 kernel_do_deploy() {
        install -m 0644 ${KERNEL_OUTPUT} ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
        if [ ${MODULE_TARBALL_DEPLOY} = "1" ] && (grep -q -i -e '^CONFIG_MODULES=y$' .config); then