[yocto] [[meta-xilinx-community][PATCH] 1/2] Create a new independant recipe for ze7000 kernel

[Alexandre Bard]

Upgrade to yocto 2.0 jethro brings compatibility issues between
the default xilinx-kernel configuration and it extention for
for ZE7000 machine.

Signed-off-by: Alexandre Bard <alexandre.bard at netmodule.com>
---
 conf/machine/ze7000-zynq7.conf                |  4 ++--
 recipes-kernel/linux/linux-xlnx_3.10.bbappend | 16 --------------
 recipes-kernel/linux/linux-xlnx_3.14.bb       | 30 +++++++++++++++++++++++++++
 recipes-kernel/linux/linux-xlnx_3.14.bbappend | 24 ---------------------
 4 files changed, 32 insertions(+), 42 deletions(-)
 delete mode 100644 recipes-kernel/linux/linux-xlnx_3.10.bbappend
 create mode 100644 recipes-kernel/linux/linux-xlnx_3.14.bb
 delete mode 100644 recipes-kernel/linux/linux-xlnx_3.14.bbappend

diff --git a/conf/machine/ze7000-zynq7.conf b/conf/machine/ze7000-zynq7.conf
index 7bd2eab..027f1a1 100644
--- a/conf/machine/ze7000-zynq7.conf
+++ b/conf/machine/ze7000-zynq7.conf
@@ -9,7 +9,7 @@ MACHINE_DEVICETREE := " \
 		ze7000/ze7000-zynq7.dts \
 		"
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx"
-PREFERRED_VERSION_linux-xlnx ?= "3.14%"
+PREFERRED_PROVIDER_virtual/kernel = "linux-xlnx"
+PREFERRED_VERSION_linux-xlnx = "3.14%"
 
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "kernel-module-xilinx-emacps"
diff --git a/recipes-kernel/linux/linux-xlnx_3.10.bbappend b/recipes-kernel/linux/linux-xlnx_3.10.bbappend
deleted file mode 100644
index 69253c7..0000000
--- a/recipes-kernel/linux/linux-xlnx_3.10.bbappend
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "Xilinx linux kernel support for Zynq-7 Base TRD 14.5"
-
-MACHINE_DEVICETREE_zc702-zynq7 := " \
-        zc702/zc702-zynq7-board.dtsi \
-        zc702/zc702-zynq7.dts \
-        common/zynq7-base-trd.dtsi \
-        zc702/zc702-zynq7-base-trd.dts \
-        "
-MACHINE_KCONFIG_zc702-zynq7    := "common/linux/zynq/xilinx_zynq_base_trd_defconfig_${LINUX_VERSION}.cfg"
-
-MACHINE_DEVICETREE_zc706-zynq7 := " \
-        zc706/zc706-zynq7-board.dtsi \
-        zc706/zc706-zynq7.dts \
-        zc706/zc706-zynq7-pcie-trd-qspi.dts \
-        "
-MACHINE_KCONFIG_zc706-zynq7    := "common/linux/zynq/xilinx_zynq_base_trd_defconfig_${LINUX_VERSION}.cfg"
diff --git a/recipes-kernel/linux/linux-xlnx_3.14.bb b/recipes-kernel/linux/linux-xlnx_3.14.bb
new file mode 100644
index 0000000..b258cb2
--- /dev/null
+++ b/recipes-kernel/linux/linux-xlnx_3.14.bb
@@ -0,0 +1,30 @@
+require recipes-kernel/linux/linux-yocto.inc
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+
+### ZE7000 machine configuration ###
+KBRANCH_ze7000-zynq7 = "zx3-v3.14"
+SRCREV_ze7000-zynq7 = "${AUTOREV}"
+SRC_URI_ze7000-zynq7 = "git://github.com/netmodule/kernel-zx3.git;protocol=https;branch=${KBRANCH}"
+
+SRC_URI_append_ze7000-zynq7 = " \
+            file://defconfig \
+            "
+
+
+### PM3 machine configuration ###
+KBRANCH_zx3-pm3-zynq7 = "zx3-v3.14"
+SRCREV_zx3-pm3-zynq7 = "4ea440987eb3b5a9cb1f3fd50bb63c86703ef438"
+SRC_URI_zx3-pm3-zynq7 = "git://github.com/netmodule/kernel-zx3.git;protocol=https;branch=${KBRANCH}"
+
+SRC_URI_append_zx3-pm3-zynq7 = " \
+            file://defconfig \
+            "
+
+
+
+do_configure_append() {
+  # Use a defconfig file if provided instead of appending again and again
+  [ -f ${WORKDIR}/defconfig ] && cp ${WORKDIR}/defconfig ${S}/.config
+}
diff --git a/recipes-kernel/linux/linux-xlnx_3.14.bbappend b/recipes-kernel/linux/linux-xlnx_3.14.bbappend
deleted file mode 100644
index dd4c2bc..0000000
--- a/recipes-kernel/linux/linux-xlnx_3.14.bbappend
+++ /dev/null
@@ -1,24 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-### ZE7000 machine configuration ###
-KBRANCH_ze7000-zynq7 = "zx3-v3.14"
-SRCREV_ze7000-zynq7 = "${AUTOREV}"
-SRC_URI_ze7000-zynq7 = "git://github.com/netmodule/kernel-zx3.git;protocol=https;branch=${KBRANCH}"
-
-SRC_URI_append_ze7000-zynq7 = " \
-            file://defconfig \
-            "
-
-### PM3 machine configuration ###
-KBRANCH_zx3-pm3-zynq7 = "zx3-v3.14"
-SRCREV_zx3-pm3-zynq7 = "4ea440987eb3b5a9cb1f3fd50bb63c86703ef438"
-SRC_URI_zx3-pm3-zynq7 = "git://github.com/netmodule/kernel-zx3.git;protocol=https;branch=${KBRANCH}"
-
-SRC_URI_append_zx3-pm3-zynq7 = " \
-            file://defconfig \
-            "
-
-do_configure_append() {
-  # Use a defconfig file if provided instead of appending again and again
-  [ -f ${WORKDIR}/defconfig ] && cp ${WORKDIR}/defconfig ${S}/.config
-}
-- 
2.1.4