From e129330972e00e0675698b061383c3dafc6960fd Mon Sep 17 00:00:00 2001
From: Ting Liu <b28495@freescale.com>
Date: Tue, 18 Feb 2014 16:47:44 +0800
Subject: [PATCH] linux: update to sdk v1.6 release

1.move more generic bits to linux-qoriq-sdk.inc file
2.add support for multiple kernel delta config files
3.Append SDK_VERSION to .scmversion, and use the same version format
with u-boot. For exmaple: 3.12.17-rt25-QorIQ-SDK-V1.6+gfae7d11
4.add linux-qoirq-sdk_3.12.bb to use latest released codes in sdk v1.6, detailed changes can be viewed at:
http://git.freescale.com/git/cgit.cgi/ppc/sdk/linux.git/log/?qt=range&q=c29fe1a733308cbe592b3af054a97be1b91cf2dd

Signed-off-by: Ting Liu <b28495@freescale.com>
---
 .../recipes-kernel/linux/linux-qoriq-sdk.bb   | 37 -------------
 .../recipes-kernel/linux/linux-qoriq-sdk.inc  | 52 +++++++++++++++----
 .../linux/linux-qoriq-sdk_3.12.bb             |  5 ++
 3 files changed, 47 insertions(+), 47 deletions(-)
 delete mode 100644 meta-fsl-ppc/recipes-kernel/linux/linux-qoriq-sdk.bb
 create mode 100644 meta-fsl-ppc/recipes-kernel/linux/linux-qoriq-sdk_3.12.bb

diff --git a/meta-fsl-ppc/recipes-kernel/linux/linux-qoriq-sdk.bb b/meta-fsl-ppc/recipes-kernel/linux/linux-qoriq-sdk.bb
deleted file mode 100644
index 275691ab..00000000
--- a/meta-fsl-ppc/recipes-kernel/linux/linux-qoriq-sdk.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-inherit kernel
-require recipes-kernel/linux/linux-dtb.inc
-
-DESCRIPTION = "Linux kernel for Freescale platforms"
-SECTION = "kernel"
-LICENSE = "GPLv2"
-
-require recipes-kernel/linux/linux-qoriq-sdk.inc
-
-PR = "${INC_PR}.1"
-
-SCMVERSION ?= "y"
-
-DEPENDS_append = " libgcc"
-KERNEL_CC_append = " ${TOOLCHAIN_OPTIONS}"
-KERNEL_LD_append = " ${TOOLCHAIN_OPTIONS}"
-
-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    
-    	if [ -f "${DELTA_KERNEL_DEFCONFIG}" ]; then
-        	${S}/scripts/kconfig/merge_config.sh -m .config ${DELTA_KERNEL_DEFCONFIG}
-    	fi
-
-	# append sdk version in kernel version if SDK_VERSION is defined
-        if [ -n "${SDK_VERSION}" ]; then
-                 echo "CONFIG_LOCALVERSION=\"-${SDK_VERSION}\"" >> ${S}/.config
-        fi
-    
-        # Add GIT revision to the local version 
-        if [ "${SCMVERSION}" = "y" ]; then
-               head=`git rev-parse --verify --short HEAD 2> /dev/null`
-               printf "%s%s" +g $head > ${S}/.scmversion
-        fi
-}
diff --git a/meta-fsl-ppc/recipes-kernel/linux/linux-qoriq-sdk.inc b/meta-fsl-ppc/recipes-kernel/linux/linux-qoriq-sdk.inc
index 83c632e3..00fe526f 100644
--- a/meta-fsl-ppc/recipes-kernel/linux/linux-qoriq-sdk.inc
+++ b/meta-fsl-ppc/recipes-kernel/linux/linux-qoriq-sdk.inc
@@ -1,17 +1,13 @@
-LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
-
-PV = "3.8"
-INC_PR = "r11"
+inherit kernel
+require recipes-kernel/linux/linux-dtb.inc
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/linux.git;nobranch=1"
-SRCREV = "3edd71eeb4e4ae27baf539e0a5f0c8e8261bf65b"
-SRCREV_t2080qds = "47914f6cf77197921c648c6ea8977974fa54d03a"
-SRCREV_t2080qds-64b = "47914f6cf77197921c648c6ea8977974fa54d03a"
+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)}'
-# make everything compatible for the time being
-COMPATIBLE_MACHINE_$MACHINE = "$MACHINE"
 
 python () {
 	ma = d.getVar("DISTRO_FEATURES", True)
@@ -35,3 +31,39 @@ python () {
 	if 'arch' in all_qa:
 		d.setVar('ALL_QA', all_qa.replace(' arch', ''))
 }
+
+DEPENDS_append = " libgcc"
+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 "${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 rev-parse --verify --short HEAD 2> /dev/null`
+            printf "%s%s%s" $sdkversion +g $head > ${S}/.scmversion
+    fi
+}
+
+# make everything compatible for the time being
+COMPATIBLE_MACHINE_$MACHINE = "$MACHINE"
+
diff --git a/meta-fsl-ppc/recipes-kernel/linux/linux-qoriq-sdk_3.12.bb b/meta-fsl-ppc/recipes-kernel/linux/linux-qoriq-sdk_3.12.bb
new file mode 100644
index 00000000..5fa66028
--- /dev/null
+++ b/meta-fsl-ppc/recipes-kernel/linux/linux-qoriq-sdk_3.12.bb
@@ -0,0 +1,5 @@
+require recipes-kernel/linux/linux-qoriq-sdk.inc
+
+SRC_URI = "git://git.freescale.com/ppc/sdk/linux.git;nobranch=1"
+SRCREV = "c29fe1a733308cbe592b3af054a97be1b91cf2dd"
+
-- 
2.40.1