From 33a62847ba0aac98093eb5d2237ed8fe82d2153a Mon Sep 17 00:00:00 2001 From: RISCi_ATOM Date: Sat, 14 Jan 2017 09:54:46 -0500 Subject: [PATCH] Fixed 3.18.43 kernel hash; uboot-xburst name, removed x86 nic dep. ; fixed up missing rt2800-soc deps. --- include/kernel-version.mk | 2 +- package/boot/uboot-xburst/Makefile | 2 +- package/kernel/mac80211/Makefile | 41 +++++++++++++++++++ target/linux/x86/64/target.mk | 2 +- .../linux/x86/generic/profiles/000-Generic.mk | 2 +- .../linux/x86/legacy/profiles/000-Generic.mk | 2 +- 6 files changed, 46 insertions(+), 5 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 5008ea8f98..0f9b5893fd 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -5,7 +5,7 @@ LINUX_RELEASE?=1 LINUX_VERSION-3.18 = .43 LINUX_VERSION-4.4 = .40 -LINUX_KERNEL_HASH-3.18.43 = 1236e8123a6ce537d5029232560966feed054ae31776fe8481dd7d18cdd5492c +LINUX_KERNEL_HASH-3.18.43 = 648a61fb3b1d09a14f50a9ced13977302d57b32e2826877950071dc70541f918 LINUX_KERNEL_HASH-4.4.40 = c381411888dd3a78ed86eefabc7b1e63f5c26aaa803184f3325ef4570d14c94e ifdef KERNEL_PATCHVER diff --git a/package/boot/uboot-xburst/Makefile b/package/boot/uboot-xburst/Makefile index 967780c3d8..39d0ee213f 100644 --- a/package/boot/uboot-xburst/Makefile +++ b/package/boot/uboot-xburst/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=u-boot -PKG_VERSION:=2012.10-rc2 +PKG_VERSION:=2012.10-rc2-libre PKG_RELEASE:=1 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile index 9f04c4b73a..57e13706e9 100644 --- a/package/kernel/mac80211/Makefile +++ b/package/kernel/mac80211/Makefile @@ -27,6 +27,7 @@ PKG_DRIVERS = \ carl9170 \ lib80211 \ mac80211-hwsim \ + rt2x00-lib \ rt2800-lib rt2800-mmio rt2800-soc \ PKG_CONFIG_DEPENDS:= \ @@ -281,6 +282,32 @@ define KernelPackage/mac80211-hwsim FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/mac80211_hwsim.ko AUTOLOAD:=$(call AutoProbe,mac80211_hwsim) endef +define KernelPackage/rt2x00-lib +$(call KernelPackage/rt2x00/Default) + DEPENDS+= @(PCI_SUPPORT||USB_SUPPORT||TARGET_ramips) +kmod-mac80211 +kmod-lib-crc-itu-t + TITLE+= (LIB) + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ralink/rt2x00/rt2x00lib.ko + MENU:=1 +endef + +define KernelPackage/rt2x00-lib/config + if PACKAGE_kmod-rt2x00-lib + + config PACKAGE_RT2X00_LIB_DEBUGFS + bool "Enable rt2x00 debugfs support" + depends on PACKAGE_MAC80211_DEBUGFS + help + Enable creation of debugfs files for the rt2x00 drivers. + These debugfs files support both reading and writing of the + most important register types of the rt2x00 hardware. + + config PACKAGE_RT2X00_DEBUG + bool "Enable rt2x00 debug output" + help + Enable debugging output for all rt2x00 modules + + endif +endef define KernelPackage/rt2800-lib $(call KernelPackage/rt2x00/Default) @@ -290,6 +317,14 @@ $(call KernelPackage/rt2x00/Default) FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ralink/rt2x00/rt2800lib.ko endef +define KernelPackage/rt2x00-mmio +$(call KernelPackage/rt2x00/Default) + DEPENDS+= @(PCI_SUPPORT||TARGET_ramips) +kmod-rt2x00-lib +kmod-eeprom-93cx6 + HIDDEN:=1 + TITLE+= (MMIO) + FILES:= $(PKG_BUILD_DIR)/drivers/net/wireless/ralink/rt2x00/rt2x00mmio.ko +endef + define KernelPackage/rt2800-mmio $(call KernelPackage/rt2x00/Default) TITLE += (RT28xx/RT3xxx MMIO) @@ -387,6 +422,10 @@ config-$(call config_package,carl9170) += CARL9170 config-$(call config_package,mac80211-hwsim) += MAC80211_HWSIM +config-$(call config_package,rt2x00-lib) += RT2X00 RT2X00_LIB + +config-$(call config_package,rt2x00-mmio) += RT2X00_LIB_MMIO + config-$(call config_package,rt2800-lib) += RT2800_LIB config-$(call config_package,rt2800-soc) += RT2800SOC @@ -491,6 +530,8 @@ $(eval $(call KernelPackage,cfg80211)) $(eval $(call KernelPackage,lib80211)) $(eval $(call KernelPackage,mac80211)) $(eval $(call KernelPackage,mac80211-hwsim)) +$(eval $(call KernelPackage,rt2x00-lib)) +$(eval $(call KernelPackage,rt2x00-mmio)) $(eval $(call KernelPackage,rt2800-lib)) $(eval $(call KernelPackage,rt2800-mmio)) $(eval $(call KernelPackage,rt2800-soc)) diff --git a/target/linux/x86/64/target.mk b/target/linux/x86/64/target.mk index a3420b89b2..b4172de6cc 100644 --- a/target/linux/x86/64/target.mk +++ b/target/linux/x86/64/target.mk @@ -1,6 +1,6 @@ ARCH:=x86_64 BOARDNAME:=x86_64 -DEFAULT_PACKAGES += kmod-button-hotplug kmod-e1000e kmod-e1000 kmod-r8169 kmod-igb +DEFAULT_PACKAGES += kmod-button-hotplug kmod-e1000e kmod-e1000 kmod-igb define Target/Description Build images for 64 bit systems including virtualized guests. diff --git a/target/linux/x86/generic/profiles/000-Generic.mk b/target/linux/x86/generic/profiles/000-Generic.mk index 90f989a91d..0d0e8ede86 100644 --- a/target/linux/x86/generic/profiles/000-Generic.mk +++ b/target/linux/x86/generic/profiles/000-Generic.mk @@ -8,7 +8,7 @@ define Profile/Generic NAME:=Generic PACKAGES:=kmod-3c59x kmod-e100 kmod-e1000 kmod-natsemi kmod-ne2k-pci \ - kmod-pcnet32 kmod-8139too kmod-r8169 kmod-sis900 kmod-tg3 \ + kmod-pcnet32 kmod-sis900 kmod-tg3 \ kmod-via-rhine kmod-via-velocity endef diff --git a/target/linux/x86/legacy/profiles/000-Generic.mk b/target/linux/x86/legacy/profiles/000-Generic.mk index 90f989a91d..0d0e8ede86 100644 --- a/target/linux/x86/legacy/profiles/000-Generic.mk +++ b/target/linux/x86/legacy/profiles/000-Generic.mk @@ -8,7 +8,7 @@ define Profile/Generic NAME:=Generic PACKAGES:=kmod-3c59x kmod-e100 kmod-e1000 kmod-natsemi kmod-ne2k-pci \ - kmod-pcnet32 kmod-8139too kmod-r8169 kmod-sis900 kmod-tg3 \ + kmod-pcnet32 kmod-sis900 kmod-tg3 \ kmod-via-rhine kmod-via-velocity endef -- 2.25.1