aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Rossi <nathan.rossi@xilinx.com>2014-11-06 16:20:35 +1000
committerElvis Dowson <elvis.dowson@gmail.com>2014-11-19 08:21:58 +0400
commit6a7ebbc6e895bd87593a2571e43cc5215e45fa52 (patch)
tree6e552ad02c00e19c7975f9f8484bf79a85030a4b
parent33e70b7269313459b4fbdb2f057df5f91f2003fe (diff)
downloadmeta-xilinx-community-6a7ebbc6e895bd87593a2571e43cc5215e45fa52.tar.gz
meta-xilinx-community-6a7ebbc6e895bd87593a2571e43cc5215e45fa52.tar.bz2
meta-xilinx-community-6a7ebbc6e895bd87593a2571e43cc5215e45fa52.zip
linux-netmodule-zx3: Add a seperate recipe for netmodule-zx3 kernelHEADmaster
* Create a recipe for the netmodule-zx3 kernel, this avoids issues with the linux-xlnx recipes being overwritten with netmodule-zx3 source trees * Remove overrides on the linux-xlnx_3.14 recipe * Move defconfigs for ze7000-zynq7 and zx3-pm3-zynq7 machines into a kernel versioned sub directory * Update ze7000-zynq7 and zx3-pm3-zynq7 machines confs to point to linux-netmodule-zx3 as the default kernel provider Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com> Signed-off-by: Elvis Dowson <elvis.dowson@gmail.com>
-rw-r--r--conf/machine/ze7000-zynq7.conf4
-rw-r--r--conf/machine/zx3-pm3-zynq7.conf6
-rw-r--r--recipes-kernel/linux/linux-netmodule-zx3_3.14.bb18
-rw-r--r--recipes-kernel/linux/linux-xlnx/3.14/ze7000-zynq7/defconfig (renamed from recipes-kernel/linux/linux-xlnx/ze7000-zynq7/defconfig)0
-rw-r--r--recipes-kernel/linux/linux-xlnx/3.14/zx3-pm3-zynq7/defconfig (renamed from recipes-kernel/linux/linux-xlnx/zx3-pm3-zynq7/defconfig)0
-rw-r--r--recipes-kernel/linux/linux-xlnx_3.14.bbappend24
6 files changed, 23 insertions, 29 deletions
diff --git a/conf/machine/ze7000-zynq7.conf b/conf/machine/ze7000-zynq7.conf
index 7bd2eab..74f3af8 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-netmodule-zx3"
+PREFERRED_VERSION_linux-netmodule-zx3 ?= "3.14%"
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "kernel-module-xilinx-emacps"
diff --git a/conf/machine/zx3-pm3-zynq7.conf b/conf/machine/zx3-pm3-zynq7.conf
index cf3e748..b428323 100644
--- a/conf/machine/zx3-pm3-zynq7.conf
+++ b/conf/machine/zx3-pm3-zynq7.conf
@@ -9,9 +9,9 @@ MACHINE_DEVICETREE := " \
zx3-pm3/zx3-pm3-zynq7.dts \
"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx"
-PREFERRED_VERSION_linux-xlnx ?= "3.14%"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-netmodule-zx3"
+PREFERRED_VERSION_linux-netmodule-zx3 ?= "3.14%"
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "kernel-module-xilinx-emacps"
-PREFERRED_VERSION_u-boot-zx3 = "2013.04-git%" \ No newline at end of file
+PREFERRED_VERSION_u-boot-zx3 = "2013.04-git%"
diff --git a/recipes-kernel/linux/linux-netmodule-zx3_3.14.bb b/recipes-kernel/linux/linux-netmodule-zx3_3.14.bb
new file mode 100644
index 0000000..2ce3df5
--- /dev/null
+++ b/recipes-kernel/linux/linux-netmodule-zx3_3.14.bb
@@ -0,0 +1,18 @@
+
+LINUX_VERSION = "3.14"
+KBRANCH ?= "zx3-v3.14"
+SRCREV ?= "4ea440987eb3b5a9cb1f3fd50bb63c86703ef438"
+
+SRC_URI = "git://github.com/netmodule/kernel-zx3.git;protocol=https;branch=${KBRANCH}"
+
+include recipes-kernel/linux/linux-xlnx.inc
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/linux-xlnx/${LINUX_VERSION}:"
+
+### ZE7000 machine configuration ###
+SRC_URI_append_ze7000-zynq7 += "file://defconfig"
+
+### PM3 machine configuration ###
+SRC_URI_append_zx3-pm3-zynq7 += "file://defconfig"
+
+COMPATIBLE_MACHINE = "ze7000-zynq7|zx3-pm3-zynq7"
diff --git a/recipes-kernel/linux/linux-xlnx/ze7000-zynq7/defconfig b/recipes-kernel/linux/linux-xlnx/3.14/ze7000-zynq7/defconfig
index 01652a0..01652a0 100644
--- a/recipes-kernel/linux/linux-xlnx/ze7000-zynq7/defconfig
+++ b/recipes-kernel/linux/linux-xlnx/3.14/ze7000-zynq7/defconfig
diff --git a/recipes-kernel/linux/linux-xlnx/zx3-pm3-zynq7/defconfig b/recipes-kernel/linux/linux-xlnx/3.14/zx3-pm3-zynq7/defconfig
index f4f7ede..f4f7ede 100644
--- a/recipes-kernel/linux/linux-xlnx/zx3-pm3-zynq7/defconfig
+++ b/recipes-kernel/linux/linux-xlnx/3.14/zx3-pm3-zynq7/defconfig
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 80efa22..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 = "4ea440987eb3b5a9cb1f3fd50bb63c86703ef438"
-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
-}