diff options
| author |   Christian Gromm <christian.gromm@microchip.com> | 2017-01-24 13:48:26 +0100 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2017-01-31 14:26:21 +0000 |
| commit | 50d06c5bd1d141a1549aafe9cdaceeeb75889e46 (patch) | |
| tree | 758a5bdf9087a92ef8251fc96054d6873ab16023 /recipes-kernel/aim-network | |
| parent | c3a3974d075836fc700e57b2020f4b5473c89021 (diff) | |
meta-agl-demo: recipes-kernel: update MOST driver recipes
This patch updates the recipes used to build the MOST driver.
Since the driver source directory holds version 1.4.0-stable
as of commit f19c18408b515c5e33f96893cbe213d9ab30b904 it also
adds backport patches for the MOST sound and networking driver
needed to build for porter.
v2 (jsmoeller): combine with c8359
Change-Id: Ie56cadf9ef6224afb585fe950a0c3b0aff53b572
Signed-off-by: Christian Gromm <christian.gromm@microchip.com>
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
(cherry picked from commit 853bd2c5ee8fb08c8654b1a07e154b66972b49ab)
Diffstat (limited to 'recipes-kernel/aim-network')
| -rw-r--r-- | recipes-kernel/aim-network/aim-network.bb | 11 | ||||
| -rw-r--r-- | recipes-kernel/aim-network/files/0001-aim-network-backport-patch-for-3.10.31-ltsi.patch | 45 |
2 files changed, 48 insertions, 8 deletions
diff --git a/recipes-kernel/aim-network/aim-network.bb b/recipes-kernel/aim-network/aim-network.bb index ce504ead2..b731f9351 100644 --- a/recipes-kernel/aim-network/aim-network.bb +++ b/recipes-kernel/aim-network/aim-network.bb @@ -1,18 +1,16 @@ -DESCRIPTION = "Example of how to build an external Linux kernel module" +DESCRIPTION = "Build networking driver for MOST" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -#LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ -# " inherit module PV = "0.1" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/most;protocol=https" +SRC_URI_append_porter = " file://0001-aim-network-backport-patch-for-3.10.31-ltsi.patch" S = "${WORKDIR}/git/driver/${PN}" -SRCREV = "ad245bdd60434dd46d6461f585d49db1b3b0d75b" -#SRCREV = "${AUTOREV}" +SRCREV = "${AUTOREV}" # The inherit of module.bbclass will automatically name module packages with # "kernel-module-" prefix as required by the oe-core build environment. @@ -24,6 +22,3 @@ do_install_append () { echo "aim_network" > ${D}${sysconfdir}/modules-load.d/aim_network.conf fi } - -# These sources are currently for the porter kernel only -COMPATIBLE_MACHINE = "porter" diff --git a/recipes-kernel/aim-network/files/0001-aim-network-backport-patch-for-3.10.31-ltsi.patch b/recipes-kernel/aim-network/files/0001-aim-network-backport-patch-for-3.10.31-ltsi.patch new file mode 100644 index 000000000..41728c2db --- /dev/null +++ b/recipes-kernel/aim-network/files/0001-aim-network-backport-patch-for-3.10.31-ltsi.patch @@ -0,0 +1,45 @@ +From 4c49b7ad9e3c1e64e4e6042e6fee357b5d9b3df2 Mon Sep 17 00:00:00 2001 +From: Christian Gromm <christian.gromm@microchip.com> +Date: Mon, 23 Jan 2017 14:57:55 +0100 +Subject: [PATCH] aim-network: create backport patch for 3.10.31-ltsi + +Signed-off-by: Christian Gromm <christian.gromm@microchip.com> +--- + aim-network/networking.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/networking.c b/aim-network/networking.c +index ce1764c..e04b523 100644 +--- a/networking.c ++++ b/networking.c +@@ -362,8 +362,7 @@ static int aim_probe_channel(struct most_interface *iface, int channel_idx, + + if (nd->tx.linked || nd->rx.linked) { + struct net_device *dev = +- alloc_netdev(0, "meth%d", NET_NAME_UNKNOWN, +- most_nd_setup); ++ alloc_netdev(0, "meth%d", most_nd_setup); + + if (!dev) { + pr_err("no memory for net_device\n"); +@@ -483,7 +482,7 @@ static int aim_rx_data(struct mbo *mbo) + + if (nd->is_mamac) { + /* dest */ +- ether_addr_copy(skb_put(skb, ETH_ALEN), dev->dev_addr); ++ memcpy(skb_put(skb, ETH_ALEN), dev->dev_addr, ETH_ALEN); + + /* src */ + memcpy(skb_put(skb, 4), &zero, 4); +@@ -577,7 +576,7 @@ void most_deliver_netinfo(struct most_interface *iface, + if (!is_valid_ether_addr(dev->dev_addr)) { + netdev_info(dev, "set mac %02x-%02x-%02x-%02x-%02x-%02x\n", + m[0], m[1], m[2], m[3], m[4], m[5]); +- ether_addr_copy(dev->dev_addr, m); ++ memcpy(dev->dev_addr, m, ETH_ALEN); + complete(&nd->mac_compl); + } else if (!ether_addr_equal(dev->dev_addr, m)) { + netdev_warn(dev, "reject mac %02x-%02x-%02x-%02x-%02x-%02x\n", +-- +2.11.0 + |