aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Rossi <nathan.rossi@xilinx.com>2014-10-23 14:56:07 +1000
committerNathan Rossi <nathan.rossi@xilinx.com>2014-10-27 17:59:47 +1000
commit46807120150759591a39d40ef7bad69ea2bc7d22 (patch)
tree393b3e9a2e65144aaa2100701e84f361b2a5c74c
parentbf251026c9b7b54a5c3981fec48425245459dee2 (diff)
downloadmeta-xilinx-46807120150759591a39d40ef7bad69ea2bc7d22.tar.gz
meta-xilinx-46807120150759591a39d40ef7bad69ea2bc7d22.tar.bz2
meta-xilinx-46807120150759591a39d40ef7bad69ea2bc7d22.zip
linux-*_3.10: Disable the MACB driver
* In the Linux kernel v3.10 the MACB driver does not function correctly * Both kernels have the EMACPS driver, use this instead * Add a feature config fragement to disable MACB, this is useful in the case that the machine needs to use the EMACPS driver Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
-rw-r--r--recipes-kernel/linux/config/xilinx-common/features/xilinx/disable-macb.cfg2
-rw-r--r--recipes-kernel/linux/config/xilinx-common/features/xilinx/disable-macb.scc5
-rw-r--r--recipes-kernel/linux/linux-xlnx_3.10.bb8
-rw-r--r--recipes-kernel/linux/linux-yocto_3.10.bbappend3
4 files changed, 16 insertions, 2 deletions
diff --git a/recipes-kernel/linux/config/xilinx-common/features/xilinx/disable-macb.cfg b/recipes-kernel/linux/config/xilinx-common/features/xilinx/disable-macb.cfg
new file mode 100644
index 00000000..536c8e0d
--- /dev/null
+++ b/recipes-kernel/linux/config/xilinx-common/features/xilinx/disable-macb.cfg
@@ -0,0 +1,2 @@
+CONFIG_MACB=n
+
diff --git a/recipes-kernel/linux/config/xilinx-common/features/xilinx/disable-macb.scc b/recipes-kernel/linux/config/xilinx-common/features/xilinx/disable-macb.scc
new file mode 100644
index 00000000..e44196bc
--- /dev/null
+++ b/recipes-kernel/linux/config/xilinx-common/features/xilinx/disable-macb.scc
@@ -0,0 +1,5 @@
+define KFEATURE_DESCRIPTION "Disable the MACB Ethernet Driver"
+define KFEATURE_COMPATIBILITY board
+
+kconfig hardware disable-macb.cfg
+
diff --git a/recipes-kernel/linux/linux-xlnx_3.10.bb b/recipes-kernel/linux/linux-xlnx_3.10.bb
index 7f03bc63..8edd4d71 100644
--- a/recipes-kernel/linux/linux-xlnx_3.10.bb
+++ b/recipes-kernel/linux/linux-xlnx_3.10.bb
@@ -1,7 +1,11 @@
-# Kernel version and SRCREV correspond to:
+# Kernel version and SRCREV correspond to:
LINUX_VERSION = "3.10"
-# xilinx-v14.7 tag
+# xilinx-v14.7 tag
SRCREV ?= "efc27505715e64526653f35274717c0fc56491e3"
PR = "r1"
include linux-xlnx.inc
+
+# The MACB driver is non-functional in the 3.10 kernel
+KERNEL_FEATURES_append_zynq += "features/xilinx/disable-macb.scc"
+
diff --git a/recipes-kernel/linux/linux-yocto_3.10.bbappend b/recipes-kernel/linux/linux-yocto_3.10.bbappend
index 03a5da7d..76097188 100644
--- a/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -2,6 +2,9 @@
require linux-xilinx-configs.inc
require linux-xilinx-machines.inc
+# The MACB driver is non-functional in the 3.10 kernel
+KERNEL_FEATURES_append_zynq += "features/xilinx/disable-macb.scc"
+
FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto:"
SRC_URI_append_microblaze += " \
file://ec2eba55f0c0e74dd39aca14dcc597583cf1eb67.patch \