From 418e6d04c9996572672aa7d62bcdcc6e9344a895 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Fri, 4 Sep 2015 12:28:08 -0700 Subject: [PATCH] coreos-sources: Add wl18xx firmware patch Adds missing firmware for the Hikey developer board. Upstream patch from http://patchwork.kernerl.xyz/patch/7114261/ Signed-off-by: Geoff Levand --- ...1.ebuild => coreos-kernel-4.1.6-r2.ebuild} | 2 +- ....ebuild => coreos-sources-4.1.6-r2.ebuild} | 3 ++- ...s-wl18xx-Add-missing-MODULE_FIRMWARE.patch | 24 +++++++++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-4.1.6-r1.ebuild => coreos-kernel-4.1.6-r2.ebuild} (86%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/{coreos-sources-4.1.6-r1.ebuild => coreos-sources-4.1.6-r2.ebuild} (91%) create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.1/net-wireless-wl18xx-Add-missing-MODULE_FIRMWARE.patch diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.1.6-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.1.6-r2.ebuild similarity index 86% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.1.6-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.1.6-r2.ebuild index 4cdc6203e3..cd4500b7a3 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.1.6-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.1.6-r2.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=5 -COREOS_SOURCE_REVISION="-r1" +COREOS_SOURCE_REVISION="-r2" inherit coreos-kernel DESCRIPTION="CoreOS Linux kernel" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.1.6-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.1.6-r2.ebuild similarity index 91% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.1.6-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.1.6-r2.ebuild index b5e6c01d54..dfbd2dd5cd 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.1.6-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.1.6-r2.ebuild @@ -28,4 +28,5 @@ ${PATCH_DIR}/12-efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch \ ${PATCH_DIR}/13-efi-Add-EFI_SECURE_BOOT-bit.patch \ ${PATCH_DIR}/14-hibernate-Disable-in-a-signed-modules-environment.patch \ ${PATCH_DIR}/15-cpuset-use-trialcs-mems_allowed-as-a-temp-variable.patch \ -${PATCH_DIR}/udp-fix-dst-races-with-multicast-early-demux.patch" +${PATCH_DIR}/udp-fix-dst-races-with-multicast-early-demux.patch \ +${PATCH_DIR}/net-wireless-wl18xx-Add-missing-MODULE_FIRMWARE.patch" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.1/net-wireless-wl18xx-Add-missing-MODULE_FIRMWARE.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.1/net-wireless-wl18xx-Add-missing-MODULE_FIRMWARE.patch new file mode 100644 index 0000000000..1c0b40cd7f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.1/net-wireless-wl18xx-Add-missing-MODULE_FIRMWARE.patch @@ -0,0 +1,24 @@ +From 628cd64abeb364a53b86aa1dbbff151df536abfa Mon Sep 17 00:00:00 2001 +From: Geoff Levand +Date: Wed, 2 Sep 2015 16:08:30 -0700 +Subject: [PATCH] net/wireless/wl18xx: Add missing MODULE_FIRMWARE + +Fixes the output of 'modinfo --field firmware'. + +Signed-off-by: Geoff Levand +--- + drivers/net/wireless/ti/wl18xx/main.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c +index 49aca2c..3bbf624 100644 +--- a/drivers/net/wireless/ti/wl18xx/main.c ++++ b/drivers/net/wireless/ti/wl18xx/main.c +@@ -2062,3 +2062,4 @@ MODULE_PARM_DESC(num_rx_desc_param, + MODULE_LICENSE("GPL v2"); + MODULE_AUTHOR("Luciano Coelho "); + MODULE_FIRMWARE(WL18XX_FW_NAME); ++MODULE_FIRMWARE(WL18XX_CONF_FILE_NAME); +-- +2.1.0 +