diff options
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/linux-2.4/Makefile | 36 | ||||
| -rw-r--r-- | target/linux/linux-2.4/ar7.mk | 2 | ||||
| -rw-r--r-- | target/linux/linux-2.4/broadcom.mk | 2 | ||||
| -rw-r--r-- | target/linux/linux-2.4/config/ar7.modules | 1 | ||||
| -rw-r--r-- | target/linux/linux-2.4/config/brcm | 2 | ||||
| -rw-r--r-- | target/linux/rules.mk | 8 |
6 files changed, 29 insertions, 22 deletions
diff --git a/target/linux/linux-2.4/Makefile b/target/linux/linux-2.4/Makefile index 6247203d9d..0d1847319f 100644 --- a/target/linux/linux-2.4/Makefile +++ b/target/linux/linux-2.4/Makefile @@ -59,7 +59,7 @@ endif $(eval $(call KMOD_template,ATM,atm,\ $(MODULES_DIR)/kernel/net/atm/atm.o \ $(MODULES_DIR)/kernel/net/atm/br2684.o \ -,CONFIG_ATM)) +,CONFIG_ATM,,50,atm)) $(eval $(call KMOD_template,PPPOATM,pppoatm,\ $(MODULES_DIR)/kernel/net/atm/pppoatm.o \ ,CONFIG_PPPOATM)) @@ -87,58 +87,58 @@ $(eval $(call KMOD_template,IPTABLES_V6,ip6tables,\ ,CONFIG_IP6_NF_IPTABLES,kmod-ipv6)) $(eval $(call KMOD_template,IPV6,ipv6,\ $(MODULES_DIR)/kernel/net/ipv6/ipv6.o \ -,CONFIG_IPV6)) +,CONFIG_IPV6,,20,ipv6)) $(eval $(call KMOD_template,CIFS,cifs,\ $(MODULES_DIR)/kernel/fs/cifs/cifs.o \ -,CONFIG_CIFS)) +,CONFIG_CIFS,,30,cifs)) $(eval $(call KMOD_template,NFS,nfs,\ $(MODULES_DIR)/kernel/fs/lockd/*.o \ $(MODULES_DIR)/kernel/fs/nfs/*.o \ $(MODULES_DIR)/kernel/net/sunrpc/*.o \ -,CONFIG_NFS_FS)) +,CONFIG_NFS_FS,,30,sunrpc lockd nfs)) $(eval $(call KMOD_template,USB,usb-core,\ $(MODULES_DIR)/kernel/drivers/usb/usbcore.o \ -,CONFIG_USB)) +,CONFIG_USB,,50,usbcore)) $(eval $(call KMOD_template,USB_UHCI,usb-uhci,\ $(MODULES_DIR)/kernel/drivers/usb/host/uhci.o \ -,CONFIG_USB_UHCI_ALT,kmod-usb-core)) +,CONFIG_USB_UHCI_ALT,kmod-usb-core,60,uhci)) $(eval $(call KMOD_template,USB_OHCI,usb-ohci,\ $(MODULES_DIR)/kernel/drivers/usb/host/usb-ohci.o \ -,CONFIG_USB_OHCI,kmod-usb-core)) +,CONFIG_USB_OHCI,kmod-usb-core,60,ohci)) $(eval $(call KMOD_template,USB2,usb2,\ $(MODULES_DIR)/kernel/drivers/usb/host/ehci-hcd.o \ -,CONFIG_USB_EHCI_HCD,kmod-usb-core)) +,CONFIG_USB_EHCI_HCD,kmod-usb-core,60,ehci-hcd)) $(eval $(call KMOD_template,USB_STORAGE,usb-storage,\ $(MODULES_DIR)/kernel/drivers/scsi/*.o \ $(MODULES_DIR)/kernel/drivers/usb/storage/*.o \ -,CONFIG_USB_STORAGE)) +,CONFIG_USB_STORAGE,kmod-usb-core,60,scsi_mod sd_mod usb-storage)) $(eval $(call KMOD_template,USB_PRINTER,usb-printer,\ $(MODULES_DIR)/kernel/drivers/usb/printer.o \ -,CONFIG_USB_PRINTER)) +,CONFIG_USB_PRINTER,kmod-usb-core,60,printer)) $(eval $(call KMOD_template,IDE,ide,\ $(MODULES_DIR)/kernel/drivers/ide/*.o \ $(MODULES_DIR)/kernel/drivers/ide/*/*.o \ ,CONFIG_IDE)) $(eval $(call KMOD_template,LOOP,loop,\ $(MODULES_DIR)/kernel/drivers/block/loop.o \ -,CONFIG_BLK_DEV_LOOP)) +,CONFIG_BLK_DEV_LOOP,,20,loop)) $(eval $(call KMOD_template,EXT2,ext2,\ $(MODULES_DIR)/kernel/fs/ext2/*.o \ -,CONFIG_EXT2_FS)) +,CONFIG_EXT2_FS,,30,ext2)) $(eval $(call KMOD_template,EXT3,ext3,\ $(MODULES_DIR)/kernel/fs/ext3/*.o \ $(MODULES_DIR)/kernel/fs/jbd/*.o \ -,CONFIG_EXT3_FS)) +,CONFIG_EXT3_FS,,30,jbd ext3)) $(eval $(call KMOD_template,XFS,xfs,\ $(MODULES_DIR)/kernel/fs/xfs/*.o \ -,CONFIG_XFS_FS)) +,CONFIG_XFS_FS,,30,xfs)) $(eval $(call KMOD_template,HFSPLUS,hfsplus,\ $(MODULES_DIR)/kernel/fs/hfsplus/*.o \ -,CONFIG_HFSPLUS_FS)) +,CONFIG_HFSPLUS_FS,,30,hfsplus)) $(eval $(call KMOD_template,VFAT,vfat,\ $(MODULES_DIR)/kernel/fs/vfat/vfat.o \ $(MODULES_DIR)/kernel/fs/fat/fat.o \ -,CONFIG_VFAT_FS)) +,CONFIG_VFAT_FS,,30,fat vfat)) $(eval $(call KMOD_template,CRYPTO,crypto,\ $(MODULES_DIR)/kernel/crypto/*.o \ )) @@ -156,10 +156,10 @@ $(eval $(call KMOD_template,PPPOE,pppoe,\ ,CONFIG_PPPOE)) $(eval $(call KMOD_template,TUN,tun,\ $(MODULES_DIR)/kernel/drivers/net/tun.o \ -,CONFIG_TUN)) +,CONFIG_TUN,,20,tun)) $(eval $(call KMOD_template,GRE,gre,\ $(MODULES_DIR)/kernel/net/ipv4/ip_gre.o \ -,CONFIG_NET_IPGRE)) +,CONFIG_NET_IPGRE,,30,ip_gre)) $(eval $(call KMOD_template,SCHED,sched,\ $(MODULES_DIR)/kernel/net/sched/*.o \ )) diff --git a/target/linux/linux-2.4/ar7.mk b/target/linux/linux-2.4/ar7.mk index c5e4b32ed4..a4aa76fd47 100644 --- a/target/linux/linux-2.4/ar7.mk +++ b/target/linux/linux-2.4/ar7.mk @@ -26,7 +26,7 @@ $(LINUX_DIR)/.drivers-unpacked: $(LINUX_DIR)/.unpacked $(eval $(call KMOD_template,SANGAM_ATM,sangam-atm,\ $(MODULES_DIR)/kernel/drivers/atm/tiatm.o \ -,CONFIG_MIPS_SANGAM_ATM,, \ +,CONFIG_MIPS_SANGAM_ATM,kmod-atm,60,tiatm, \ cp $(BUILD_DIR)/$(ATM_FIRMWARE_DIR)/*.bin $$(I_SANGAM_ATM)/lib/modules/ \ )) diff --git a/target/linux/linux-2.4/broadcom.mk b/target/linux/linux-2.4/broadcom.mk index 521c0aff25..5312bbe75a 100644 --- a/target/linux/linux-2.4/broadcom.mk +++ b/target/linux/linux-2.4/broadcom.mk @@ -19,7 +19,7 @@ $(eval $(call KMOD_template,LP,lp,\ $(MODULES_DIR)/kernel/drivers/parport/parport.o \ $(MODULES_DIR)/kernel/drivers/parport/parport_splink.o \ $(MODULES_DIR)/kernel/drivers/char/lp.o \ -,CONFIG_PARPORT)) +,CONFIG_PARPORT,,50,parport parport_splink lp)) LINUX_BINARY_DRIVER_SITE=http://openwrt.org/downloads/sources # proprietary driver, extracted from asus GPL sourcetree GPL_1941.zip diff --git a/target/linux/linux-2.4/config/ar7.modules b/target/linux/linux-2.4/config/ar7.modules index e69de29bb2..05eed86a02 100644 --- a/target/linux/linux-2.4/config/ar7.modules +++ b/target/linux/linux-2.4/config/ar7.modules @@ -0,0 +1 @@ +avalanche_cpmac diff --git a/target/linux/linux-2.4/config/brcm b/target/linux/linux-2.4/config/brcm index 648ca2ad6b..6afe1bb6c0 100644 --- a/target/linux/linux-2.4/config/brcm +++ b/target/linux/linux-2.4/config/brcm @@ -837,7 +837,7 @@ CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=128 CONFIG_PRINTER=m # CONFIG_LP_CONSOLE is not set -# CONFIG_PPDEV is not set +CONFIG_PPDEV=m # CONFIG_TIPAR is not set # diff --git a/target/linux/rules.mk b/target/linux/rules.mk index 82ac46d58f..39afadb341 100644 --- a/target/linux/rules.mk +++ b/target/linux/rules.mk @@ -29,7 +29,13 @@ $$(PKG_$(1)): $(LINUX_DIR)/.modules_done $(SCRIPT_DIR)/make-ipkg-dir.sh $$(I_$(1)) ../control/kmod-$(2).control $(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE) $(ARCH) echo "Depends: $$(IDEPEND_$(1))" >> $$(I_$(1))/CONTROL/control cp $(3) $$(I_$(1))/lib/modules/$(LINUX_VERSION) - $(6) +ifneq ($(6),) + mkdir -p $$(I_$(1))/etc/modules.d + for module in $(7); do \ + echo $$$$module >> $$(I_$(1))/etc/modules.d/$(6)-$(2); \ + done +endif + $(8) $(IPKG_BUILD) $$(I_$(1)) $(PACKAGE_DIR) endef |