From 29a020ffb341de09bd2eaf195b7a194990a97ab6 Mon Sep 17 00:00:00 2001 From: Imre Kaloz Date: Sun, 27 Dec 2009 21:54:09 +0000 Subject: [PATCH] remove handling of older unsupported kernels SVN-Revision: 18955 --- Config.in | 2 -- package/kernel/modules/crypto.mk | 10 ---------- package/kernel/modules/fs.mk | 2 +- package/kernel/modules/netdevices.mk | 2 +- package/kernel/modules/other.mk | 16 ---------------- package/kernel/modules/usb.mk | 4 ++-- package/kernel/modules/video.mk | 12 ++++++------ package/kernel/modules/wireless.mk | 2 +- target/linux/s3c24xx/todo.txt | 2 -- target/linux/x86/image/Config.in | 1 - tools/Makefile | 2 +- 11 files changed, 12 insertions(+), 43 deletions(-) delete mode 100644 target/linux/s3c24xx/todo.txt diff --git a/Config.in b/Config.in index 704ba3dd24..e80d90c03e 100644 --- a/Config.in +++ b/Config.in @@ -25,8 +25,6 @@ menu "Target Images" depends TARGET_ROOTFS_INITRAMFS depends !LINUX_2_6_21 depends !LINUX_2_6_25 - depends !LINUX_2_6_27 - depends !LINUX_2_6_28 default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ar71xx default TARGET_INITRAMFS_COMPRESSION_NONE help diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk index 012b68befa..ee88eee343 100644 --- a/package/kernel/modules/crypto.mk +++ b/package/kernel/modules/crypto.mk @@ -14,20 +14,10 @@ CRYPTO_MENU:=Cryptographic API modules # - sha1 > sha1_generic (2.6.24) # - sha256 > sha256_generic (2.6.24) # - sha512 > sha512_generic (2.6.26) -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.24)),1) - CRYPTO_GENERIC:=_generic - AES_SUFFIX:=$(CRYPTO_GENERIC) - DES_SUFFIX:=$(CRYPTO_GENERIC) - SHA1_SUFFIX:=$(CRYPTO_GENERIC) - SHA256_SUFFIX:=$(CRYPTO_GENERIC) -endif ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.25)),1) CRYPTO_PREFIX:=crypto_ BLKCIPHER_PREFIX:=$(CRYPTO_PREFIX) endif -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.26)),1) - SHA512_SUFFIX:=$(CRYPTO_GENERIC) -endif AEAD_CONF:=AEAD MANAGER_CONF:=MANAGER BLKCIPHER_CONF:=BLKCIPHER diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk index 5ff914ecdd..1ff47a0e89 100644 --- a/package/kernel/modules/fs.mk +++ b/package/kernel/modules/fs.mk @@ -348,7 +348,7 @@ define KernelPackage/fs-btrfs CONFIG_BTRFS_FS \ CONFIG_BTRFS_FS_POSIX_ACL=n # for crc32c - DEPENDS:=+kmod-crypto-core @!LINUX_2_6_21&&!LINUX_2_6_25&&!LINUX_2_6_28 + DEPENDS:=+kmod-crypto-core @!LINUX_2_6_21&&!LINUX_2_6_25 FILES:=\ $(LINUX_DIR)/crypto/crc32c.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/lib/libcrc32c.$(LINUX_KMOD_SUFFIX) \ diff --git a/package/kernel/modules/netdevices.mk b/package/kernel/modules/netdevices.mk index f270c7f8ed..1701fa2a9b 100644 --- a/package/kernel/modules/netdevices.mk +++ b/package/kernel/modules/netdevices.mk @@ -290,7 +290,7 @@ define KernelPackage/tg3 TITLE:=Broadcom Tigon3 Gigabit Ethernet FILES:=$(LINUX_DIR)/drivers/net/tg3.$(LINUX_KMOD_SUFFIX) KCONFIG:=CONFIG_TIGON3 - DEPENDS:=@LINUX_2_6 +LINUX_2_6_28||LINUX_2_6_30||LINUX_2_6_31:kmod-libphy @!TARGET_ubicom32 + DEPENDS:=@LINUX_2_6 +LINUX_2_6_30||LINUX_2_6_31:kmod-libphy @!TARGET_ubicom32 SUBMENU:=$(NETWORK_DEVICES_MENU) AUTOLOAD:=$(call AutoLoad,50,tg3) endef diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index 86b02a40f0..cc45667fa5 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -305,18 +305,6 @@ define KernelPackage/bluetooth/2.6 # CONFIG_BT_BNEP \ # CONFIG_BT_HCIUSB \ # CONFIG_BT_HCIUART -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.27)),1) - FILES:= \ - $(LINUX_DIR)/net/bluetooth/bluetooth.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/net/bluetooth/l2cap.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/net/bluetooth/sco.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/net/bluetooth/rfcomm/rfcomm.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/net/bluetooth/bnep/bnep.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/net/bluetooth/hidp/hidp.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/bluetooth/hci_uart.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/bluetooth/btusb.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,90,bluetooth l2cap sco rfcomm bnep hidp hci_uart btusb) -else FILES:= \ $(LINUX_DIR)/net/bluetooth/bluetooth.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/net/bluetooth/l2cap.$(LINUX_KMOD_SUFFIX) \ @@ -327,7 +315,6 @@ else $(LINUX_DIR)/drivers/bluetooth/hci_uart.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/drivers/bluetooth/hci_usb.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,90,bluetooth l2cap sco rfcomm bnep hidp hci_uart hci_usb) -endif endef define KernelPackage/bluetooth/description @@ -384,9 +371,6 @@ $(eval $(call KernelPackage,mmc-at91)) ifeq ($(KERNEL),2.4) WATCHDOG_DIR=char endif -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.24)),1) - WATCHDOG_DIR=watchdog -endif WATCHDOG_DIR?=char/watchdog define KernelPackage/atmel-wdt diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk index 60761e3f26..2aaed3ca5a 100644 --- a/package/kernel/modules/usb.mk +++ b/package/kernel/modules/usb.mk @@ -301,7 +301,7 @@ $(eval $(call KernelPackage,usb-serial-belkin)) define KernelPackage/usb-serial-ch341 - $(call usbdep,kmod-usb-serial @LINUX_2_6&&@!LINUX_2_6_23) + $(call usbdep,kmod-usb-serial @LINUX_2_6) TITLE:=Support for CH341 devices KCONFIG:=CONFIG_USB_SERIAL_CH341 FILES:=$(LINUX_DIR)/drivers/usb/serial/ch341.$(LINUX_KMOD_SUFFIX) @@ -621,7 +621,7 @@ $(eval $(call KernelPackage,usb-net-asix)) define KernelPackage/usb-net-hso - $(call usbdep,kmod-usb-net @LINUX_2_6 @!LINUX_2_6_21 @!LINUX_2_6_23 @!LINUX_2_6_24 @!LINUX_2_6_25 +!TARGET_rb532||!TARGET_avr32||!TARGET_brcm47xx||!TARGET_s3c24xx||!TARGET_ifxmips||!TARGET_atheros||!TARGET_adm5120||!TARGET_ar7||!TARGET_ppc40x||!TARGET_ixp4xx||!TARGET_rdc:kmod-rfkill) + $(call usbdep,kmod-usb-net @LINUX_2_6 @!LINUX_2_6_21 @!LINUX_2_6_25 +!TARGET_rb532||!TARGET_avr32||!TARGET_brcm47xx||!TARGET_s3c24xx||!TARGET_ifxmips||!TARGET_atheros||!TARGET_adm5120||!TARGET_ar7||!TARGET_ppc40x||!TARGET_ixp4xx||!TARGET_rdc:kmod-rfkill) TITLE:=Kernel module for Option USB High Speed Mobile Devices KCONFIG:=CONFIG_USB_HSO FILES:= \ diff --git a/package/kernel/modules/video.mk b/package/kernel/modules/video.mk index 3eb9fe99c0..e12f6621e0 100644 --- a/package/kernel/modules/video.mk +++ b/package/kernel/modules/video.mk @@ -168,7 +168,7 @@ $(eval $(call KernelPackage,video-pwc)) define KernelPackage/video-uvc SUBMENU:=$(VIDEO_MENU) TITLE:=USB Video Class (UVC) support - DEPENDS:=@LINUX_2_6 @!LINUX_2_6_25 @!LINUX_2_6_24 @!LINUX_2_6_23 @USB_SUPPORT +kmod-usb-core +kmod-video-core + DEPENDS:=@LINUX_2_6 @!LINUX_2_6_25 @USB_SUPPORT +kmod-usb-core +kmod-video-core KCONFIG:= CONFIG_USB_VIDEO_CLASS FILES:=$(LINUX_DIR)/drivers/media/video/uvc/uvcvideo.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,90,uvcvideo) @@ -267,7 +267,7 @@ $(eval $(call KernelPackage,video-gspca-mars)) define KernelPackage/video-gspca-mr97310a SUBMENU:=$(VIDEO_MENU) TITLE:=mr97310a webcam support - DEPENDS:=kmod-video-gspca-core @!LINUX_2_6_28 + DEPENDS:=kmod-video-gspca-core KCONFIG:=CONFIG_USB_GSPCA_MR97310A FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_mr97310a.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_mr97310a) @@ -299,7 +299,7 @@ $(eval $(call KernelPackage,video-gspca-ov519)) define KernelPackage/video-gspca-ov534 SUBMENU:=$(VIDEO_MENU) TITLE:=ov534 webcam support - DEPENDS:=kmod-video-gspca-core @!LINUX_2_6_28 + DEPENDS:=kmod-video-gspca-core KCONFIG:=CONFIG_USB_GSPCA_OV534 FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_ov534.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_ov534) @@ -475,7 +475,7 @@ $(eval $(call KernelPackage,video-gspca-spca561)) define KernelPackage/video-gspca-sq905 SUBMENU:=$(VIDEO_MENU) TITLE:=sq905 webcam support - DEPENDS:=kmod-video-gspca-core @!LINUX_2_6_28 + DEPENDS:=kmod-video-gspca-core KCONFIG:=CONFIG_USB_GSPCA_SQ905 FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_sq905.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_sq905) @@ -491,7 +491,7 @@ $(eval $(call KernelPackage,video-gspca-sq905)) define KernelPackage/video-gspca-sq905c SUBMENU:=$(VIDEO_MENU) TITLE:=sq905c webcam support - DEPENDS:=kmod-video-gspca-core @!LINUX_2_6_28 + DEPENDS:=kmod-video-gspca-core KCONFIG:=CONFIG_USB_GSPCA_SQ905C FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_sq905c.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_sq905c) @@ -619,7 +619,7 @@ $(eval $(call KernelPackage,video-gspca-m5602)) define KernelPackage/video-gspca-stv06xx SUBMENU:=$(VIDEO_MENU) TITLE:=stv06xx webcam support - DEPENDS:=kmod-video-gspca-core @!LINUX_2_6_28 + DEPENDS:=kmod-video-gspca-core KCONFIG:=CONFIG_USB_STV06XX FILES:=$(LINUX_DIR)/drivers/media/video/gspca/stv06xx/gspca_stv06xx.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_stv06xx) diff --git a/package/kernel/modules/wireless.mk b/package/kernel/modules/wireless.mk index 7985a20786..363bd16694 100644 --- a/package/kernel/modules/wireless.mk +++ b/package/kernel/modules/wireless.mk @@ -12,7 +12,7 @@ WIRELESS_MENU:=Wireless Drivers define KernelPackage/ieee80211 SUBMENU:=$(WIRELESS_MENU) TITLE:=802.11 Networking stack - DEPENDS:=+kmod-crypto-arc4 +kmod-crypto-aes +kmod-crypto-michael-mic @LINUX_2_4||@LINUX_2_6_21||LINUX_2_6_23||LINUX_2_6_24||LINUX_2_6_25||LINUX_2_6_26||LINUX_2_6_28 + DEPENDS:=+kmod-crypto-arc4 +kmod-crypto-aes +kmod-crypto-michael-mic @LINUX_2_4||@LINUX_2_6_21||LINUX_2_6_25 KCONFIG:= \ CONFIG_IEEE80211 \ CONFIG_IEEE80211_CRYPT_WEP \ diff --git a/target/linux/s3c24xx/todo.txt b/target/linux/s3c24xx/todo.txt deleted file mode 100644 index b127f4e610..0000000000 --- a/target/linux/s3c24xx/todo.txt +++ /dev/null @@ -1,2 +0,0 @@ - - patch kernel to run preinit instead of init per default to avoid patching of bootloader - - get the kernel starting after new openwrt-2.6.26-patchset diff --git a/target/linux/x86/image/Config.in b/target/linux/x86/image/Config.in index 3883f89007..e5a82da791 100644 --- a/target/linux/x86/image/Config.in +++ b/target/linux/x86/image/Config.in @@ -22,7 +22,6 @@ config X86_GRUB_KERNELPART config X86_GRUB_ROOTPART string prompt "Root partition on target device" if X86_GRUB_IMAGES - default "/dev/hda2" if LINUX_2_6_28 default "/dev/sda2" help The root partition on the final device. If you don't know, diff --git a/tools/Makefile b/tools/Makefile index 276233ef57..e965370198 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -17,7 +17,7 @@ tools-y += m4 autoconf automake bison pkg-config sed mklibs tools-y += sstrip ipkg-utils genext2fs mtd-utils mkimage tools-y += firmware-utils patch-cmdline quilt yaffs2 tools-$(CONFIG_TARGET_orion) += wrt350nv2-builder upslug2 -ifneq ($(CONFIG_LINUX_2_4)$(CONFIG_LINUX_2_6_21)$(CONFIG_LINUX_2_6_25)$(CONFIG_LINUX_2_6_28),) +ifneq ($(CONFIG_LINUX_2_4)$(CONFIG_LINUX_2_6_21)$(CONFIG_LINUX_2_6_25),) tools-y += squashfs lzma-old else ifneq ($(CONFIG_TARGET_ar71xx),) -- 2.30.2