EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

kernel: remove further obsolete kernel version switches

Browse Source 
Most of the kernel version switches below 4.14 were removed in commit
97940f8766 ("kernel: remove obsolete kernel version switches"),
but some of them still remained. Remove them now.

Signed-off-by: Sungbo Eo <mans0n@gorani.run>
This commit is contained in:
Sungbo Eo 2020-01-18 23:32:01 +09:00 committed by Adrian Schmutzler
parent 8d78354d24
commit c26b687e31
4 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/image.mk
View File

@ -157,18 +157,13 @@ endif
# Disable noisy checks by default as in upstream # Disable noisy checks by default as in upstream
ifeq ($(strip $(call kernel_patchver_ge,4.7.0)),1) DTC_FLAGS += \
DTC_FLAGS += -Wno-unit_address_vs_reg
endif
ifeq ($(strip $(call kernel_patchver_ge,4.12.0)),1)
DTC_FLAGS += \
-Wno-unit_address_vs_reg \ -Wno-unit_address_vs_reg \
-Wno-simple_bus_reg \ -Wno-simple_bus_reg \
-Wno-unit_address_format \ -Wno-unit_address_format \
-Wno-pci_bridge \ -Wno-pci_bridge \
-Wno-pci_device_bus_num \ -Wno-pci_device_bus_num \
-Wno-pci_device_reg -Wno-pci_device_reg
endif
ifeq ($(strip $(call kernel_patchver_ge,4.17.0)),1) ifeq ($(strip $(call kernel_patchver_ge,4.17.0)),1)
DTC_FLAGS += \ DTC_FLAGS += \
-Wno-avoid_unnecessary_addr_size \ -Wno-avoid_unnecessary_addr_size \

4
include/target.mk
View File

@ -51,10 +51,6 @@ else
endif endif
endif endif
ifneq ($(filter 4.9,$(KERNEL_PATCHVER)),)
DEFAULT_PACKAGES.router:=$(filter-out kmod-ipt-offload,$(DEFAULT_PACKAGES.router))
endif
# Add device specific packages (here below to allow device type set from subtarget) # Add device specific packages (here below to allow device type set from subtarget)
DEFAULT_PACKAGES += $(DEFAULT_PACKAGES.$(DEVICE_TYPE)) DEFAULT_PACKAGES += $(DEFAULT_PACKAGES.$(DEVICE_TYPE))

5
package/kernel/linux/modules/other.mk
View File

@ -53,11 +53,8 @@ define KernelPackage/bluetooth
$(LINUX_DIR)/net/bluetooth/bnep/bnep.ko \ $(LINUX_DIR)/net/bluetooth/bnep/bnep.ko \
$(LINUX_DIR)/net/bluetooth/hidp/hidp.ko \ $(LINUX_DIR)/net/bluetooth/hidp/hidp.ko \
$(LINUX_DIR)/drivers/bluetooth/hci_uart.ko \ $(LINUX_DIR)/drivers/bluetooth/hci_uart.ko \
$(LINUX_DIR)/drivers/bluetooth/btusb.ko $(LINUX_DIR)/drivers/bluetooth/btusb.ko \
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,4.1.0)),1)
FILES+= \
$(LINUX_DIR)/drivers/bluetooth/btintel.ko $(LINUX_DIR)/drivers/bluetooth/btintel.ko
endif
AUTOLOAD:=$(call AutoProbe,bluetooth rfcomm bnep hidp hci_uart btusb) AUTOLOAD:=$(call AutoProbe,bluetooth rfcomm bnep hidp hci_uart btusb)
endef endef

8
target/linux/bcm53xx/modules.mk
View File

@ -9,9 +9,7 @@ define KernelPackage/phy-bcm-ns-usb2
KCONFIG:=CONFIG_PHY_BCM_NS_USB2 KCONFIG:=CONFIG_PHY_BCM_NS_USB2
DEPENDS:=@TARGET_bcm53xx DEPENDS:=@TARGET_bcm53xx
SUBMENU:=$(USB_MENU) SUBMENU:=$(USB_MENU)
FILES:=\ FILES:=$(LINUX_DIR)/drivers/phy/broadcom/phy-bcm-ns-usb2.ko
$(LINUX_DIR)/drivers/phy/phy-bcm-ns-usb2.ko@lt4.13 \
$(LINUX_DIR)/drivers/phy/broadcom/phy-bcm-ns-usb2.ko@gt4.13
AUTOLOAD:=$(call AutoLoad,45,phy-bcm-ns-usb2,1) AUTOLOAD:=$(call AutoLoad,45,phy-bcm-ns-usb2,1)
endef endef
@ -27,9 +25,7 @@ define KernelPackage/phy-bcm-ns-usb3
KCONFIG:=CONFIG_PHY_BCM_NS_USB3 KCONFIG:=CONFIG_PHY_BCM_NS_USB3
DEPENDS:=@TARGET_bcm53xx DEPENDS:=@TARGET_bcm53xx
SUBMENU:=$(USB_MENU) SUBMENU:=$(USB_MENU)
FILES:=\ FILES:=$(LINUX_DIR)/drivers/phy/broadcom/phy-bcm-ns-usb3.ko
$(LINUX_DIR)/drivers/phy/phy-bcm-ns-usb3.ko@lt4.13 \
$(LINUX_DIR)/drivers/phy/broadcom/phy-bcm-ns-usb3.ko@ge4.13
AUTOLOAD:=$(call AutoLoad,45,phy-bcm-ns-usb3,1) AUTOLOAD:=$(call AutoLoad,45,phy-bcm-ns-usb3,1)
endef endef