From ad53934bfb7602362eff7fc27878ca0e6b42882a Mon Sep 17 00:00:00 2001
From: Ting Liu <ting.liu@nxp.com>
Date: Thu, 16 Jun 2016 17:04:22 +0800
Subject: linux-qoriq: merge .inc and .bb

Signed-off-by: Ting Liu <ting.liu@nxp.com>
---
 recipes-kernel/linux/linux-qoriq.inc     | 51 --------------------------------
 recipes-kernel/linux/linux-qoriq_3.12.bb | 51 +++++++++++++++++++++++++++++++-
 2 files changed, 50 insertions(+), 52 deletions(-)
 delete mode 100644 recipes-kernel/linux/linux-qoriq.inc

diff --git a/recipes-kernel/linux/linux-qoriq.inc b/recipes-kernel/linux/linux-qoriq.inc
deleted file mode 100644
index 15a9f1a..0000000
--- a/recipes-kernel/linux/linux-qoriq.inc
+++ /dev/null
@@ -1,51 +0,0 @@
-inherit kernel kernel-arch qoriq_build_64bit_kernel
-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)}'
-
-DEPENDS_append = " libgcc"
-# not put Images into /boot of rootfs, install kernel-image if needed
-RDEPENDS_kernel-base = ""
-
-KERNEL_CC_append = " ${TOOLCHAIN_OPTIONS}"
-KERNEL_LD_append = " ${TOOLCHAIN_OPTIONS}"
-
-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 "${WORKDIR}/${deltacfg}" ]; then
-            ${S}/scripts/kconfig/merge_config.sh -m .config ${WORKDIR}/${deltacfg}
-        elif [ -f "${S}/arch/${ARCH}/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
-}
-
-# make everything compatible for the time being
-COMPATIBLE_MACHINE_$MACHINE = "$MACHINE"
-
diff --git a/recipes-kernel/linux/linux-qoriq_3.12.bb b/recipes-kernel/linux/linux-qoriq_3.12.bb
index 744aa4e..533225d 100644
--- a/recipes-kernel/linux/linux-qoriq_3.12.bb
+++ b/recipes-kernel/linux/linux-qoriq_3.12.bb
@@ -1,4 +1,10 @@
-require recipes-kernel/linux/linux-qoriq.inc
+inherit kernel kernel-arch qoriq_build_64bit_kernel
+require recipes-kernel/linux/linux-dtb.inc
+
+DESCRIPTION = "Linux kernel for Freescale platforms"
+SECTION = "kernel"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
 SRC_URI = "git://git.freescale.com/ppc/sdk/linux.git;branch=sdk-v1.9.x \
     file://modify-defconfig-t1040-nr-cpus.patch \
@@ -8,3 +14,46 @@ SRC_URI = "git://git.freescale.com/ppc/sdk/linux.git;branch=sdk-v1.9.x \
     file://module-remove-MODULE_GENERIC_TABLE.patch \
 "
 SRCREV = "43cecda943a6c40a833b588801b0929e8bd48813"
+
+KSRC ?= ""
+S = '${@base_conditional("KSRC", "", "${WORKDIR}/git", "${KSRC}", d)}'
+
+DEPENDS_append = " libgcc"
+# not put Images into /boot of rootfs, install kernel-image if needed
+RDEPENDS_kernel-base = ""
+
+KERNEL_CC_append = " ${TOOLCHAIN_OPTIONS}"
+KERNEL_LD_append = " ${TOOLCHAIN_OPTIONS}"
+
+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 "${WORKDIR}/${deltacfg}" ]; then
+            ${S}/scripts/kconfig/merge_config.sh -m .config ${WORKDIR}/${deltacfg}
+        elif [ -f "${S}/arch/${ARCH}/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
+}
+
+# make everything compatible for the time being
+COMPATIBLE_MACHINE_$MACHINE = "$MACHINE"
-- 
cgit v1.2.3-54-g00ecf