linux-qoriq: Unify recipe for QorIQ ARM and QorIQ PPC

* update linux-qoriq recipe to support both QorIQ ARM and QorIQ PPC
* move PREFERRED_PROVIDER_virtual/linux to qoriq-base.inc
* remove linux-ls1 recipes

Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
Acked-by: Daiane Angolini <daiane.angolini@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

1 files changed, 36 insertions, 29 deletions

diff --git a/recipes-kernel/linux/linux-qoriq.inc b/recipes-kernel/linux/linux-qoriq.inc
index a832b46a..6c925de3 100644
--- a/recipes-kernel/linux/linux-qoriq.inc
+++ b/recipes-kernel/linux/linux-qoriq.inc
@@ -1,46 +1,53 @@
-inherit kernel qoriq_build_64bit_kernel
+inherit kernel kernel-arch qoriq_build_64bit_kernel
+inherit fsl-kernel-localversion
 require recipes-kernel/linux/linux-dtb.inc
 
 DESCRIPTION = "Linux kernel for Freescale platforms"
-SECTION = "kernel"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
-KSRC ?= ""
-S = '${@base_conditional("KSRC", "", "${WORKDIR}/git", "${KSRC}", d)}'
+S = "${WORKDIR}/git"
 
 DEPENDS_append = " libgcc"
+# not put uImage into /boot of rootfs, install kernel-image if needed
+RDEPENDS_kernel-base = ""
+
 KERNEL_CC_append = " ${TOOLCHAIN_OPTIONS}"
 KERNEL_LD_append = " ${TOOLCHAIN_OPTIONS}"
 
+KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
+ZIMAGE_BASE_NAME = "zImage-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
+
 SCMVERSION ?= "y"
 DELTA_KERNEL_DEFCONFIG ?= ""
+
 do_configure_prepend() {
-        # copy desired defconfig so we pick it up for the real kernel_do_configure
-        cp ${KERNEL_DEFCONFIG} ${B}/.config
-
-        # add config fragments
-        for deltacfg in ${DELTA_KERNEL_DEFCONFIG}; do
-                if [ -f "${deltacfg}" ]; then
-                        ${S}/scripts/kconfig/merge_config.sh -m .config ${deltacfg}
-                elif [ -f "${S}/arch/powerpc/configs/${deltacfg}" ]; then
-                    ${S}/scripts/kconfig/merge_config.sh -m .config \
-                            ${S}/arch/powerpc/configs/${deltacfg}
-                fi
-        done
-
-    #add git revision to the local version
-    if [ "${SCMVERSION}" = "y" ]; then
-            # append sdk version if SDK_VERSION is defined
-            sdkversion=''
-            if [ -n "${SDK_VERSION}" ]; then
-                sdkversion="-${SDK_VERSION}"
-            fi
-            head=`git --git-dir=${S}/.git rev-parse --verify --short HEAD 2> /dev/null`
-            printf "%s%s%s" $sdkversion +g $head > ${B}/.scmversion
-    fi
+    # copy desired defconfig so we pick it up for the real kernel_do_configure
+    cp ${KERNEL_DEFCONFIG} ${B}/.config
+    cp ${KERNEL_DEFCONFIG} ${WORKDIR}/defconfig
+    # add config fragments
+    for deltacfg in ${DELTA_KERNEL_DEFCONFIG}; do
+        if [ -f "${deltacfg}" ]; then
+            ${S}/scripts/kconfig/merge_config.sh -m .config ${deltacfg}
+        elif [ -f "${S}/arch/${ARCH}/configs/${deltacfg}" ]; then
+            ${S}/scripts/kconfig/merge_config.sh -m .config \
+                ${S}/arch/powerpc/configs/${deltacfg}
+        fi
+    done
+
 }
 
-# make everything compatible for the time being
-COMPATIBLE_MACHINE_$MACHINE = "$MACHINE"
+do_install_append_qoriq-arm() {
+    install -m 0644 arch/${ARCH}/boot/zImage ${D}/boot/zImage-${KERNEL_VERSION}
+}
+
+do_deploy_append_qoriq-arm() {
+    install -m 0644 arch/${ARCH}/boot/zImage ${DEPLOYDIR}/${ZIMAGE_BASE_NAME}.bin
+    ln -sf ${ZIMAGE_BASE_NAME}.bin ${DEPLOYDIR}/zImage-${MACHINE}.bin
+    ln -sf ${ZIMAGE_BASE_NAME}.bin ${DEPLOYDIR}/zImage
+}
 
+FILES_kernel-image += "/boot/zImage*"
+
+# make everything compatible for the time being
+COMPATIBLE_MACHINE = "(qoriq)"