aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2017-11-12 14:52:29 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2017-11-22 22:37:05 +0100
commit9cfcd497358545781e5c0e3ee169894d1d3329a8 (patch)
treeb308c2b01ea0760d8234f3d5ed1f06a98c10cca3 /package
parent06e1b90404cbad66d02aef66d81b46bd771f099c (diff)
downloadupstream-9cfcd497358545781e5c0e3ee169894d1d3329a8.tar.gz
upstream-9cfcd497358545781e5c0e3ee169894d1d3329a8.tar.bz2
upstream-9cfcd497358545781e5c0e3ee169894d1d3329a8.zip
kernel: e100: take e100 firmware from linux-firmware repository
The firmware directory in the Linux kernel was removed in kernel 4.14, take the e100 firmware files now from the linux-firmware repository instead. To do so create the new package e100-firmware. This will also work with older kernel versions. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'package')
-rw-r--r--package/firmware/linux-firmware/intel.mk9
-rw-r--r--package/kernel/linux/modules/netdevices.mk9
2 files changed, 10 insertions, 8 deletions
diff --git a/package/firmware/linux-firmware/intel.mk b/package/firmware/linux-firmware/intel.mk
index 0330335bfb..8cdbb48245 100644
--- a/package/firmware/linux-firmware/intel.mk
+++ b/package/firmware/linux-firmware/intel.mk
@@ -153,3 +153,12 @@ define Package/iwlwifi-firmware-iwl8265/install
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-8265-27.ucode $(1)/lib/firmware
endef
$(eval $(call BuildPackage,iwlwifi-firmware-iwl8265))
+
+Package/e100-firmware = $(call Package/firmware-default,Intel e100)
+define Package/e100-firmware/install
+ $(INSTALL_DIR) $(1)/lib/firmware/e100
+ $(INSTALL_DATA) $(PKG_BUILD_DIR)/e100/d101m_ucode.bin $(1)/lib/firmware/e100/
+ $(INSTALL_DATA) $(PKG_BUILD_DIR)/e100/d101s_ucode.bin $(1)/lib/firmware/e100/
+ $(INSTALL_DATA) $(PKG_BUILD_DIR)/e100/d102e_ucode.bin $(1)/lib/firmware/e100/
+endef
+$(eval $(call BuildPackage,e100-firmware))
diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk
index 2bbdb6c524..3add0fdb50 100644
--- a/package/kernel/linux/modules/netdevices.mk
+++ b/package/kernel/linux/modules/netdevices.mk
@@ -450,7 +450,7 @@ $(eval $(call KernelPackage,ne2k-pci))
define KernelPackage/e100
SUBMENU:=$(NETWORK_DEVICES_MENU)
TITLE:=Intel(R) PRO/100+ cards kernel support
- DEPENDS:=@PCI_SUPPORT +kmod-mii
+ DEPENDS:=@PCI_SUPPORT +kmod-mii +e100-firmware
KCONFIG:=CONFIG_E100
FILES:=$(LINUX_DIR)/drivers/net/ethernet/intel/e100.ko
AUTOLOAD:=$(call AutoProbe,e100)
@@ -460,13 +460,6 @@ define KernelPackage/e100/description
Kernel modules for Intel(R) PRO/100+ Ethernet adapters
endef
-define KernelPackage/e100/install
- $(INSTALL_DIR) $(1)/lib/firmware/e100
- $(INSTALL_DATA) $(LINUX_DIR)/firmware/e100/d101m_ucode.bin $(1)/lib/firmware/e100/
- $(INSTALL_DATA) $(LINUX_DIR)/firmware/e100/d101s_ucode.bin $(1)/lib/firmware/e100/
- $(INSTALL_DATA) $(LINUX_DIR)/firmware/e100/d102e_ucode.bin $(1)/lib/firmware/e100/
-endef
-
$(eval $(call KernelPackage,e100))