From c26b687e31b788433091a98b65ddc984e2d227c8 Mon Sep 17 00:00:00 2001 From: Sungbo Eo Date: Sat, 18 Jan 2020 23:32:01 +0900 Subject: kernel: remove further obsolete kernel version switches Most of the kernel version switches below 4.14 were removed in commit 97940f876616 ("kernel: remove obsolete kernel version switches"), but some of them still remained. Remove them now. Signed-off-by: Sungbo Eo --- include/image.mk | 19 +++++++------------ include/target.mk | 4 ---- 2 files changed, 7 insertions(+), 16 deletions(-) (limited to 'include') diff --git a/include/image.mk b/include/image.mk index 26da4d6819..46d592e8dc 100644 --- a/include/image.mk +++ b/include/image.mk @@ -157,18 +157,13 @@ endif # Disable noisy checks by default as in upstream -ifeq ($(strip $(call kernel_patchver_ge,4.7.0)),1) - 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-simple_bus_reg \ - -Wno-unit_address_format \ - -Wno-pci_bridge \ - -Wno-pci_device_bus_num \ - -Wno-pci_device_reg -endif +DTC_FLAGS += \ + -Wno-unit_address_vs_reg \ + -Wno-simple_bus_reg \ + -Wno-unit_address_format \ + -Wno-pci_bridge \ + -Wno-pci_device_bus_num \ + -Wno-pci_device_reg ifeq ($(strip $(call kernel_patchver_ge,4.17.0)),1) DTC_FLAGS += \ -Wno-avoid_unnecessary_addr_size \ diff --git a/include/target.mk b/include/target.mk index a813ba2d2d..9bd4c14936 100644 --- a/include/target.mk +++ b/include/target.mk @@ -51,10 +51,6 @@ else 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) DEFAULT_PACKAGES += $(DEFAULT_PACKAGES.$(DEVICE_TYPE)) -- cgit v1.2.3