1/2] Create a new independant recipe for ze7000 kernel

PATCH New Alexandre Bard 1 participant 2 messages Jun 9, 2016 Arm/Zynq architecture

Share & tools

Alexandre Bard

author

2016-06-09 16:11 UTC #0 lore raw

PATCH 1/1 1/2] Create a new independant recipe for ze7000 kernel

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 <[email protected]>

---
 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

conf/machine/ze7000-zynq7.conf +2 -2

index 7bd2eab..027f1a1 100644
@@ -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"

recipes-kernel/linux/linux-xlnx_3.10.bbappend deleted +0 ~~-16~~

deleted file mode 100644
index 69253c7..0000000
@@ -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"

recipes-kernel/linux/linux-xlnx_3.14.bb new file +30 -0

new file mode 100644
index 0000000..b258cb2
@@ -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
+}

recipes-kernel/linux/linux-xlnx_3.14.bbappend deleted +0 ~~-24~~

deleted file mode 100644
index dd4c2bc..0000000
@@ -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
-}

Signature · 1 line

2.1.4

Alexandre Bard

author

2016-06-09 16:11 UTC #1 lore raw

PATCH 1/1 2/2] Remove useless copy of kernel config

Former code from daisy branch copied the kernel config to the kernel source directory. This is now useless and creates a issue when bitbake builds the kernel

Signed-off-by Alexandre Bard <[email protected]>

---
 recipes-kernel/linux/linux-xlnx_3.14.bb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

recipes-kernel/linux/linux-xlnx_3.14.bb +2 -6

index b258cb2..9a9288b 100644
@@ -1,5 +1,7 @@
 require recipes-kernel/linux/linux-yocto.inc
 
+LINUX_VERSION_EXTENSION = "-netmodule"
+
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"

@@ -22,9 +24,3 @@ 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
-}

Signature · 1 line

2.1.4