Changeset 2801


Ignore:
Timestamp:
2006-01-02T03:38:07+01:00 (12 years ago)
Author:
wbx
Message:

software watchdog as kernel modul, pf ring as kernel module. saves some bytes in the default images, ideas from 22c3 talking with nbd and sven-ola

Location:
trunk/openwrt/target/linux
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/openwrt/target/linux/Config.in

    r2785 r2801  
    177177        help 
    178178          Support for PPP over Ethernet 
     179 
     180config BR2_PACKAGE_KMOD_RING 
     181        prompt "kmod-ring......................... PF Ring" 
     182        tristate 
     183        default m 
     184        help 
     185          PF Ring 
    179186 
    180187config BR2_PACKAGE_KMOD_SCHED 
     
    774781          Kernel modules for line printer and parallel port support 
    775782 
     783config BR2_PACKAGE_KMOD_SOFTDOG 
     784        prompt "kmod-softdog..................... software watchdog" 
     785        tristate 
     786        default m 
     787        help 
     788          Kernel modules for software watchdog driver 
     789 
    776790config BR2_PACKAGE_KMOD_WD1100 
    777791        prompt "kmod-wd1100....................... Soekris net4801 watchdog" 
  • trunk/openwrt/target/linux/linux-2.4/Makefile

    r2585 r2801  
    103103,CONFIG_TUN,,20,tun)) 
    104104 
     105$(eval $(call KMOD_template,RING,ring,\ 
     106        $(MODULES_DIR)/kernel/net/ring/ring.o \ 
     107,CONFIG_RING,,20,ring)) 
     108 
    105109 
    106110# Filtering / Firewalling 
     
    361365        $(MODULES_DIR)/kernel/drivers/bluetooth/*.o \ 
    362366,CONFIG_BLUEZ)) 
     367 
     368$(eval $(call KMOD_template,SOFTDOG,softdog,\ 
     369        $(MODULES_DIR)/kernel/drivers/char/softdog.o \ 
     370,CONFIG_SOFT_WATCHDOG,,95,softdog)) 
    363371 
    364372 
  • trunk/openwrt/target/linux/linux-2.4/config/ar531x

    r2794 r2801  
    311311# CONFIG_NETFILTER_DEBUG is not set 
    312312CONFIG_FILTER=y 
    313 CONFIG_RING=y 
     313CONFIG_RING=m 
    314314CONFIG_UNIX=y 
    315315CONFIG_INET=y 
     
    765765# CONFIG_SC1200_WDT is not set 
    766766# CONFIG_SCx200_WDT is not set 
    767 CONFIG_SOFT_WATCHDOG=y 
     767CONFIG_SOFT_WATCHDOG=m 
    768768# CONFIG_W83877F_WDT is not set 
    769769# CONFIG_WDT is not set 
  • trunk/openwrt/target/linux/linux-2.4/config/ar7

    r2794 r2801  
    802802CONFIG_WATCHDOG_NOWAYOUT=y 
    803803CONFIG_AR7_WDT=y 
    804 # CONFIG_SOFT_WATCHDOG is not set 
     804CONFIG_SOFT_WATCHDOG=m  
    805805# CONFIG_SCx200 is not set 
    806806# CONFIG_SCx200_GPIO is not set 
  • trunk/openwrt/target/linux/linux-2.4/config/brcm

    r2795 r2801  
    11# 
    2 # Automatically generated make config: don't edit 
     2# Automatically generated by make menuconfig: don't edit 
    33# 
    44CONFIG_MIPS=y 
     
    187187# CONFIG_MTD_REDBOOT_PARTS is not set 
    188188# CONFIG_MTD_CMDLINE_PARTS is not set 
    189  
    190 # 
    191 # User Modules And Translation Layers 
    192 # 
    193189CONFIG_MTD_CHAR=y 
    194190CONFIG_MTD_BLOCK=y 
     
    255251# CONFIG_MTD_MTDRAM is not set 
    256252# CONFIG_MTD_BLKMTD is not set 
    257  
    258 # 
    259 # Disk-On-Chip Device Drivers 
    260 # 
    261253# CONFIG_MTD_DOC1000 is not set 
    262254# CONFIG_MTD_DOC2000 is not set 
     
    330322# CONFIG_NETFILTER_DEBUG is not set 
    331323CONFIG_FILTER=y 
    332 CONFIG_RING=y 
     324CONFIG_RING=m 
    333325CONFIG_UNIX=y 
    334326CONFIG_INET=y 
     
    415407CONFIG_IP_NF_TARGET_NETMAP=m 
    416408CONFIG_IP_NF_NAT_PPTP=m 
     409CONFIG_IP_NF_NAT_PROTO_GRE=m 
    417410CONFIG_IP_NF_NAT_SIP=m 
    418411CONFIG_IP_NF_NAT_H323=m 
    419412CONFIG_IP_NF_NAT_MMS=m 
    420413CONFIG_IP_NF_NAT_RTSP=m 
    421 CONFIG_IP_NF_NAT_PROTO_GRE=m 
    422414CONFIG_IP_NF_NAT_AMANDA=m 
    423415CONFIG_IP_NF_NAT_SNMP_BASIC=m 
     
    446438# CONFIG_IP_VS_DEBUG is not set 
    447439CONFIG_IP_VS_TAB_BITS=12 
    448  
    449 # 
    450 # IPVS scheduler 
    451 # 
    452440CONFIG_IP_VS_RR=m 
    453441CONFIG_IP_VS_WRR=m 
     
    460448CONFIG_IP_VS_SED=m 
    461449CONFIG_IP_VS_NQ=m 
    462  
    463 # 
    464 # IPVS application helper 
    465 # 
    466450CONFIG_IP_VS_FTP=m 
    467 CONFIG_IP_VS_NFCT=y 
    468451CONFIG_IPV6=m 
    469452 
     
    500483# CONFIG_ATM is not set 
    501484CONFIG_VLAN_8021Q=y 
    502  
    503 # 
    504  
    505 # 
    506485# CONFIG_IPX is not set 
    507486# CONFIG_ATALK is not set 
     
    568547# 
    569548CONFIG_BLK_DEV_IDE=m 
    570  
    571 # 
    572 # Please see Documentation/ide.txt for help/info on IDE drives 
    573 # 
    574549# CONFIG_BLK_DEV_HD_IDE is not set 
    575550# CONFIG_BLK_DEV_HD is not set 
     
    585560# CONFIG_BLK_DEV_IDESCSI is not set 
    586561# CONFIG_IDE_TASK_IOCTL is not set 
    587  
    588 # 
    589 # IDE chipset support/bugfixes 
    590 # 
    591562# CONFIG_BLK_DEV_CMD640 is not set 
    592563# CONFIG_BLK_DEV_CMD640_ENHANCED is not set 
     
    646617# 
    647618CONFIG_SCSI=m 
    648  
    649 # 
    650 # SCSI support type (disk, tape, CD-ROM) 
    651 # 
    652619CONFIG_BLK_DEV_SD=m 
    653620CONFIG_SD_EXTRA_DEVS=5 
     
    656623# CONFIG_BLK_DEV_SR is not set 
    657624CONFIG_CHR_DEV_SG=m 
    658  
    659 # 
    660 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs 
    661 # 
    662625# CONFIG_SCSI_DEBUG_QUEUES is not set 
    663626CONFIG_SCSI_MULTI_LUN=y 
     
    876839# CONFIG_TMD_HERMES is not set 
    877840# CONFIG_PCI_HERMES is not set 
    878  
    879 # 
    880 # Wireless Pcmcia cards support 
    881 # 
    882841# CONFIG_PCMCIA_HERMES is not set 
    883842# CONFIG_AIRO_CS is not set 
    884843# CONFIG_PCMCIA_ATMEL is not set 
    885  
    886 # 
    887 # Prism54 PCI/PCMCIA GT/Duette Driver - 802.11(a/b/g) 
    888 # 
    889844# CONFIG_PRISM54 is not set 
    890845CONFIG_NET_WIRELESS=y 
     
    912867# 
    913868CONFIG_HAMRADIO=y 
    914  
    915 # 
    916 # Packet Radio protocols 
    917 # 
    918869CONFIG_AX25=m 
    919870# CONFIG_AX25_DAMA_SLAVE is not set 
    920871# CONFIG_NETROM is not set 
    921872# CONFIG_ROSE is not set 
    922  
    923 # 
    924 # AX.25 network device drivers 
    925 # 
    926873 
    927874# 
     
    990937# 
    991938# CONFIG_INPUT_GAMEPORT is not set 
    992  
    993 # 
    994 # Input core support is needed for gameports 
    995 # 
    996  
    997 # 
    998 # Input core support is needed for joysticks 
    999 # 
    1000939# CONFIG_QIC02_TAPE is not set 
    1001940# CONFIG_IPMI_HANDLER is not set 
     
    1024963# CONFIG_SC1200_WDT is not set 
    1025964# CONFIG_SCx200_WDT is not set 
    1026 CONFIG_SOFT_WATCHDOG=y 
     965CONFIG_SOFT_WATCHDOG=m 
    1027966# CONFIG_W83877F_WDT is not set 
    1028967# CONFIG_WDT is not set 
     
    12291168CONFIG_VIDEO_PROC_FS=y 
    12301169# CONFIG_I2C_PARPORT is not set 
    1231  
    1232 # 
    1233 # Video Adapters 
    1234 # 
    12351170# CONFIG_VIDEO_BT848 is not set 
    12361171# CONFIG_VIDEO_PMS is not set 
     
    12911226CONFIG_USB=m 
    12921227# CONFIG_USB_DEBUG is not set 
    1293  
    1294 # 
    1295 # Miscellaneous USB options 
    1296 # 
    12971228CONFIG_USB_DEVICEFS=y 
    12981229# CONFIG_USB_BANDWIDTH is not set 
    1299  
    1300 # 
    1301 # USB Host Controller Drivers 
    1302 # 
    13031230CONFIG_USB_EHCI_HCD=m 
    13041231# CONFIG_USB_UHCI is not set 
    13051232CONFIG_USB_UHCI_ALT=m 
    13061233CONFIG_USB_OHCI=m 
    1307  
    1308 # 
    1309 # USB Device Class drivers 
    1310 # 
    13111234CONFIG_USB_AUDIO=m 
    13121235# CONFIG_USB_EMI26 is not set 
    1313  
    1314 # 
    1315 #   USB Bluetooth can only be used with disabled Bluetooth subsystem 
    1316 # 
    13171236# CONFIG_USB_MIDI is not set 
    13181237CONFIG_USB_STORAGE=m 
     
    13281247CONFIG_USB_ACM=m 
    13291248CONFIG_USB_PRINTER=m 
    1330  
    1331 # 
    1332 # USB Human Interface Devices (HID) 
    1333 # 
    13341249# CONFIG_USB_HID is not set 
    1335  
    1336 # 
    1337 #     Input core support is needed for USB HID input layer or HIDBP support 
    1338 # 
    13391250# CONFIG_USB_HIDINPUT is not set 
    13401251# CONFIG_USB_HIDDEV is not set 
     
    13451256# CONFIG_USB_KBTAB is not set 
    13461257# CONFIG_USB_POWERMATE is not set 
    1347  
    1348 # 
    1349 # USB Imaging devices 
    1350 # 
    13511258# CONFIG_USB_DC2XX is not set 
    13521259# CONFIG_USB_MDC800 is not set 
     
    13541261# CONFIG_USB_MICROTEK is not set 
    13551262# CONFIG_USB_HPUSBSCSI is not set 
    1356  
    1357 # 
    1358 # USB Multimedia devices 
    1359 # 
    13601263# CONFIG_USB_IBMCAM is not set 
    13611264# CONFIG_USB_KONICAWC is not set 
     
    13681271# CONFIG_USB_DSBR is not set 
    13691272# CONFIG_USB_DABUSB is not set 
    1370  
    1371 # 
    1372 # USB Network adaptors 
    1373 # 
    13741273# CONFIG_USB_PEGASUS is not set 
    13751274# CONFIG_USB_RTL8150 is not set 
     
    13781277# CONFIG_USB_CDCETHER is not set 
    13791278# CONFIG_USB_USBNET is not set 
    1380  
    1381 # 
    1382 # USB port drivers 
    1383 # 
    13841279# CONFIG_USB_USS720 is not set 
    13851280 
     
    14091304# CONFIG_USB_SERIAL_XIRCOM is not set 
    14101305# CONFIG_USB_SERIAL_OMNINET is not set 
    1411  
    1412 # 
    1413 # USB Miscellaneous drivers 
    1414 # 
    14151306# CONFIG_USB_RIO500 is not set 
    14161307# CONFIG_USB_AUERSWALD is not set 
  • trunk/openwrt/target/linux/linux-2.4/config/x86

    r2794 r2801  
    943943CONFIG_SC1200_WDT=m 
    944944CONFIG_SCx200_WDT=m 
    945 CONFIG_SOFT_WATCHDOG=y 
     945CONFIG_SOFT_WATCHDOG=m 
    946946# CONFIG_W83877F_WDT is not set 
    947947# CONFIG_WDT is not set 
Note: See TracChangeset for help on using the changeset viewer.