add drivers-clean target when missing,

use in-package module loading instead of .modules file

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2317 3c298f89-4303-0410-b956-a3cf2f4a3e73

6 files changed, 12 insertions, 9 deletions

diff --git a/openwrt/target/linux/linux-2.4/ar7.mk b/openwrt/target/linux/linux-2.4/ar7.mk
index 8fd797bf4..85d5a7903 100644
--- a/openwrt/target/linux/linux-2.4/ar7.mk
+++ b/openwrt/target/linux/linux-2.4/ar7.mk
@@ -23,6 +23,11 @@ $(LINUX_DIR)/.drivers-unpacked: $(LINUX_DIR)/.unpacked
 	zcat $(DL_DIR)/$(ATM_FIRMWARE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 	touch $@
 
+linux-dirclean: drivers-clean
+
+drivers-clean:
+	rm -rf $(BUILD_DIR)/$(ATM_FIRMWARE_DIR)
+
 
 $(eval $(call KMOD_template,SANGAM_ATM_A,sangam-atm-annex-a,\
 	$(MODULES_DIR)/kernel/drivers/atm/tiatm.o \
@@ -37,6 +42,6 @@ $(eval $(call KMOD_template,SANGAM_ATM_B,sangam-atm-annex-b,\
 ))
 
 $(eval $(call KMOD_template,CPMAC,cpmac,\
-        $(MODULES_DIR)/kernel/drivers/net/avalanche_cpmac/avalanche_cpmac.o \
-,CONFIG_MIPS_AVALANCHE_CPMAC))
+	$(MODULES_DIR)/kernel/drivers/net/avalanche_cpmac/avalanche_cpmac.o \
+,CONFIG_MIPS_AVALANCHE_CPMAC),,10,avalanche_cpmac)
 
diff --git a/openwrt/target/linux/linux-2.4/broadcom.mk b/openwrt/target/linux/linux-2.4/broadcom.mk
index 8419c5e85..3cf8bd70a 100644
--- a/openwrt/target/linux/linux-2.4/broadcom.mk
+++ b/openwrt/target/linux/linux-2.4/broadcom.mk
@@ -6,12 +6,15 @@
 #############################################################
 
 # broadcom specific kmod packages
+
 $(eval $(call KMOD_template,BRCM_WL,brcm-wl,\
 	$(MODULES_DIR)/kernel/drivers/net/wl/wl.o \
-,CONFIG_WL))
+,CONFIG_WL),,10,wl)
+
 $(eval $(call KMOD_template,BRCM_ET,brcm-et,\
 	$(MODULES_DIR)/kernel/drivers/net/et/et.o \
-,CONFIG_ET))
+,CONFIG_ET),,10,et)
+
 $(eval $(call KMOD_template,LP,lp,\
 	$(MODULES_DIR)/kernel/drivers/parport/parport.o \
 	$(MODULES_DIR)/kernel/drivers/parport/parport_splink.o \
diff --git a/openwrt/target/linux/linux-2.4/config/ar7.modules b/openwrt/target/linux/linux-2.4/config/ar7.modules
deleted file mode 100644
index 05eed86a0..000000000
--- a/openwrt/target/linux/linux-2.4/config/ar7.modules
+++ /dev/null
@@ -1 +0,0 @@
-avalanche_cpmac
diff --git a/openwrt/target/linux/linux-2.4/config/brcm.modules b/openwrt/target/linux/linux-2.4/config/brcm.modules
deleted file mode 100644
index e717eae57..000000000
--- a/openwrt/target/linux/linux-2.4/config/brcm.modules
+++ /dev/null
@@ -1,2 +0,0 @@
-et
-wl
diff --git a/openwrt/target/linux/linux-2.4/config/x86.modules b/openwrt/target/linux/linux-2.4/config/x86.modules
deleted file mode 100644
index 8b1378917..000000000
--- a/openwrt/target/linux/linux-2.4/config/x86.modules
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/openwrt/target/linux/linux-2.6/config/brcm.modules b/openwrt/target/linux/linux-2.6/config/brcm.modules
deleted file mode 100644
index b9fcff42c..000000000
--- a/openwrt/target/linux/linux-2.6/config/brcm.modules
+++ /dev/null
@@ -1 +0,0 @@
-b44