KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

remove handling of older unsupported kernels

Browse source 
SVN-Revision: 18955
This commit is contained in:
Imre Kaloz 2009-12-27 21:54:09 +00:00
parent 4e71b48c2a
commit 29a020ffb3
11 changed files with 12 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Config.in
View file

@ -25,8 +25,6 @@ menu "Target Images"
depends TARGET_ROOTFS_INITRAMFS depends TARGET_ROOTFS_INITRAMFS
depends !LINUX_2_6_21 depends !LINUX_2_6_21
depends !LINUX_2_6_25 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_LZMA if TARGET_ar71xx
default TARGET_INITRAMFS_COMPRESSION_NONE default TARGET_INITRAMFS_COMPRESSION_NONE
help help

10
package/kernel/modules/crypto.mk
View file

@ -14,20 +14,10 @@ CRYPTO_MENU:=Cryptographic API modules
# - sha1 > sha1_generic (2.6.24) # - sha1 > sha1_generic (2.6.24)
# - sha256 > sha256_generic (2.6.24) # - sha256 > sha256_generic (2.6.24)
# - sha512 > sha512_generic (2.6.26) # - 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) ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.25)),1)
CRYPTO_PREFIX:=crypto_ CRYPTO_PREFIX:=crypto_
BLKCIPHER_PREFIX:=$(CRYPTO_PREFIX) BLKCIPHER_PREFIX:=$(CRYPTO_PREFIX)
endif endif
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.26)),1)
SHA512_SUFFIX:=$(CRYPTO_GENERIC)
endif
AEAD_CONF:=AEAD AEAD_CONF:=AEAD
MANAGER_CONF:=MANAGER MANAGER_CONF:=MANAGER
BLKCIPHER_CONF:=BLKCIPHER BLKCIPHER_CONF:=BLKCIPHER

2
package/kernel/modules/fs.mk
View file

@ -348,7 +348,7 @@ define KernelPackage/fs-btrfs
CONFIG_BTRFS_FS \ CONFIG_BTRFS_FS \
CONFIG_BTRFS_FS_POSIX_ACL=n CONFIG_BTRFS_FS_POSIX_ACL=n
# for crc32c # 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:=\ FILES:=\
$(LINUX_DIR)/crypto/crc32c.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/crypto/crc32c.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/lib/libcrc32c.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/lib/libcrc32c.$(LINUX_KMOD_SUFFIX) \

2
package/kernel/modules/netdevices.mk
View file

@ -290,7 +290,7 @@ define KernelPackage/tg3
TITLE:=Broadcom Tigon3 Gigabit Ethernet TITLE:=Broadcom Tigon3 Gigabit Ethernet
FILES:=$(LINUX_DIR)/drivers/net/tg3.$(LINUX_KMOD_SUFFIX) FILES:=$(LINUX_DIR)/drivers/net/tg3.$(LINUX_KMOD_SUFFIX)
KCONFIG:=CONFIG_TIGON3 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) SUBMENU:=$(NETWORK_DEVICES_MENU)
AUTOLOAD:=$(call AutoLoad,50,tg3) AUTOLOAD:=$(call AutoLoad,50,tg3)
endef endef

16
package/kernel/modules/other.mk
View file

@ -305,18 +305,6 @@ define KernelPackage/bluetooth/2.6
# CONFIG_BT_BNEP \ # CONFIG_BT_BNEP \
# CONFIG_BT_HCIUSB \ # CONFIG_BT_HCIUSB \
# CONFIG_BT_HCIUART # 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:= \ FILES:= \
$(LINUX_DIR)/net/bluetooth/bluetooth.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/net/bluetooth/bluetooth.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/net/bluetooth/l2cap.$(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_uart.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/drivers/bluetooth/hci_usb.$(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) AUTOLOAD:=$(call AutoLoad,90,bluetooth l2cap sco rfcomm bnep hidp hci_uart hci_usb)
endif
endef endef
define KernelPackage/bluetooth/description define KernelPackage/bluetooth/description
@ -384,9 +371,6 @@ $(eval $(call KernelPackage,mmc-at91))
ifeq ($(KERNEL),2.4) ifeq ($(KERNEL),2.4)
WATCHDOG_DIR=char WATCHDOG_DIR=char
endif endif
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.24)),1)
WATCHDOG_DIR=watchdog
endif
WATCHDOG_DIR?=char/watchdog WATCHDOG_DIR?=char/watchdog
define KernelPackage/atmel-wdt define KernelPackage/atmel-wdt

4
package/kernel/modules/usb.mk
View file

@ -301,7 +301,7 @@ $(eval $(call KernelPackage,usb-serial-belkin))
define KernelPackage/usb-serial-ch341 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 TITLE:=Support for CH341 devices
KCONFIG:=CONFIG_USB_SERIAL_CH341 KCONFIG:=CONFIG_USB_SERIAL_CH341
FILES:=$(LINUX_DIR)/drivers/usb/serial/ch341.$(LINUX_KMOD_SUFFIX) 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 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 TITLE:=Kernel module for Option USB High Speed Mobile Devices
KCONFIG:=CONFIG_USB_HSO KCONFIG:=CONFIG_USB_HSO
FILES:= \ FILES:= \

12
package/kernel/modules/video.mk
View file

@ -168,7 +168,7 @@ $(eval $(call KernelPackage,video-pwc))
define KernelPackage/video-uvc define KernelPackage/video-uvc
SUBMENU:=$(VIDEO_MENU) SUBMENU:=$(VIDEO_MENU)
TITLE:=USB Video Class (UVC) support 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 KCONFIG:= CONFIG_USB_VIDEO_CLASS
FILES:=$(LINUX_DIR)/drivers/media/video/uvc/uvcvideo.$(LINUX_KMOD_SUFFIX) FILES:=$(LINUX_DIR)/drivers/media/video/uvc/uvcvideo.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,90,uvcvideo) AUTOLOAD:=$(call AutoLoad,90,uvcvideo)
@ -267,7 +267,7 @@ $(eval $(call KernelPackage,video-gspca-mars))
define KernelPackage/video-gspca-mr97310a define KernelPackage/video-gspca-mr97310a
SUBMENU:=$(VIDEO_MENU) SUBMENU:=$(VIDEO_MENU)
TITLE:=mr97310a webcam support TITLE:=mr97310a webcam support
DEPENDS:=kmod-video-gspca-core @!LINUX_2_6_28 DEPENDS:=kmod-video-gspca-core
KCONFIG:=CONFIG_USB_GSPCA_MR97310A KCONFIG:=CONFIG_USB_GSPCA_MR97310A
FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_mr97310a.$(LINUX_KMOD_SUFFIX) FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_mr97310a.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,75,gspca_mr97310a) AUTOLOAD:=$(call AutoLoad,75,gspca_mr97310a)
@ -299,7 +299,7 @@ $(eval $(call KernelPackage,video-gspca-ov519))
define KernelPackage/video-gspca-ov534 define KernelPackage/video-gspca-ov534
SUBMENU:=$(VIDEO_MENU) SUBMENU:=$(VIDEO_MENU)
TITLE:=ov534 webcam support TITLE:=ov534 webcam support
DEPENDS:=kmod-video-gspca-core @!LINUX_2_6_28 DEPENDS:=kmod-video-gspca-core
KCONFIG:=CONFIG_USB_GSPCA_OV534 KCONFIG:=CONFIG_USB_GSPCA_OV534
FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_ov534.$(LINUX_KMOD_SUFFIX) FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_ov534.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,75,gspca_ov534) AUTOLOAD:=$(call AutoLoad,75,gspca_ov534)
@ -475,7 +475,7 @@ $(eval $(call KernelPackage,video-gspca-spca561))
define KernelPackage/video-gspca-sq905 define KernelPackage/video-gspca-sq905
SUBMENU:=$(VIDEO_MENU) SUBMENU:=$(VIDEO_MENU)
TITLE:=sq905 webcam support TITLE:=sq905 webcam support
DEPENDS:=kmod-video-gspca-core @!LINUX_2_6_28 DEPENDS:=kmod-video-gspca-core
KCONFIG:=CONFIG_USB_GSPCA_SQ905 KCONFIG:=CONFIG_USB_GSPCA_SQ905
FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_sq905.$(LINUX_KMOD_SUFFIX) FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_sq905.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,75,gspca_sq905) AUTOLOAD:=$(call AutoLoad,75,gspca_sq905)
@ -491,7 +491,7 @@ $(eval $(call KernelPackage,video-gspca-sq905))
define KernelPackage/video-gspca-sq905c define KernelPackage/video-gspca-sq905c
SUBMENU:=$(VIDEO_MENU) SUBMENU:=$(VIDEO_MENU)
TITLE:=sq905c webcam support TITLE:=sq905c webcam support
DEPENDS:=kmod-video-gspca-core @!LINUX_2_6_28 DEPENDS:=kmod-video-gspca-core
KCONFIG:=CONFIG_USB_GSPCA_SQ905C KCONFIG:=CONFIG_USB_GSPCA_SQ905C
FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_sq905c.$(LINUX_KMOD_SUFFIX) FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_sq905c.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,75,gspca_sq905c) AUTOLOAD:=$(call AutoLoad,75,gspca_sq905c)
@ -619,7 +619,7 @@ $(eval $(call KernelPackage,video-gspca-m5602))
define KernelPackage/video-gspca-stv06xx define KernelPackage/video-gspca-stv06xx
SUBMENU:=$(VIDEO_MENU) SUBMENU:=$(VIDEO_MENU)
TITLE:=stv06xx webcam support TITLE:=stv06xx webcam support
DEPENDS:=kmod-video-gspca-core @!LINUX_2_6_28 DEPENDS:=kmod-video-gspca-core
KCONFIG:=CONFIG_USB_STV06XX KCONFIG:=CONFIG_USB_STV06XX
FILES:=$(LINUX_DIR)/drivers/media/video/gspca/stv06xx/gspca_stv06xx.$(LINUX_KMOD_SUFFIX) FILES:=$(LINUX_DIR)/drivers/media/video/gspca/stv06xx/gspca_stv06xx.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,75,gspca_stv06xx) AUTOLOAD:=$(call AutoLoad,75,gspca_stv06xx)

2
package/kernel/modules/wireless.mk
View file

@ -12,7 +12,7 @@ WIRELESS_MENU:=Wireless Drivers
define KernelPackage/ieee80211 define KernelPackage/ieee80211
SUBMENU:=$(WIRELESS_MENU) SUBMENU:=$(WIRELESS_MENU)
TITLE:=802.11 Networking stack 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:= \ KCONFIG:= \
CONFIG_IEEE80211 \ CONFIG_IEEE80211 \
CONFIG_IEEE80211_CRYPT_WEP \ CONFIG_IEEE80211_CRYPT_WEP \

2
target/linux/s3c24xx/todo.txt
View file

@ -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

1
target/linux/x86/image/Config.in
View file

@ -22,7 +22,6 @@ config X86_GRUB_KERNELPART
config X86_GRUB_ROOTPART config X86_GRUB_ROOTPART
string string
prompt "Root partition on target device" if X86_GRUB_IMAGES prompt "Root partition on target device" if X86_GRUB_IMAGES
default "/dev/hda2" if LINUX_2_6_28
default "/dev/sda2" default "/dev/sda2"
help help
The root partition on the final device. If you don't know, The root partition on the final device. If you don't know,

2
tools/Makefile
View file

@ -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 += sstrip ipkg-utils genext2fs mtd-utils mkimage
tools-y += firmware-utils patch-cmdline quilt yaffs2 tools-y += firmware-utils patch-cmdline quilt yaffs2
tools-$(CONFIG_TARGET_orion) += wrt350nv2-builder upslug2 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 tools-y += squashfs lzma-old
else else
ifneq ($(CONFIG_TARGET_ar71xx),) ifneq ($(CONFIG_TARGET_ar71xx),)