kmod-switch: vlan parser rewrite, some api changes, minor fixes

[openwrt.git] / target / linux / linux-2.4 / broadcom.mk

diff --git a/target/linux/linux-2.4/broadcom.mk b/target/linux/linux-2.4/broadcom.mk
index 02bca3c..aea4fad 100644 (file)
--- a/target/linux/linux-2.4/broadcom.mk
+++ b/target/linux/linux-2.4/broadcom.mk
@@ -6,37 +6,42 @@
 #############################################################
 
 # broadcom specific kmod packages
 #############################################################
 
 # broadcom specific kmod packages

-$(eval $(call KMOD_template,DIAG,diag,\
-       $(MODULES_DIR)/kernel/drivers/net/diag/diag.o \
-))

 $(eval $(call KMOD_template,BRCM_WL,brcm-wl,\
        $(MODULES_DIR)/kernel/drivers/net/wl/wl.o \
 $(eval $(call KMOD_template,BRCM_WL,brcm-wl,\
        $(MODULES_DIR)/kernel/drivers/net/wl/wl.o \

-,CONFIG_WL))
+,CONFIG_WL,,20,wl))
+
+$(eval $(call KMOD_template,BRCM_WL2,brcm-wl2,\
+       $(BUILD_DIR)/wl/wl2/wl.o \
+,CONFIG_WL,,20,wl))
+

 $(eval $(call KMOD_template,BRCM_ET,brcm-et,\
        $(MODULES_DIR)/kernel/drivers/net/et/et.o \
 $(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 \
        $(MODULES_DIR)/kernel/drivers/char/lp.o \
 $(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 \

+       $(MODULES_DIR)/kernel/drivers/char/ppdev.o \

 ,CONFIG_PARPORT,,50,parport parport_splink lp))
 
 LINUX_BINARY_DRIVER_SITE=http://openwrt.org/downloads/sources
 # proprietary driver, extracted from Linksys GPL sourcetree WRT54GS 4.70.6
 ,CONFIG_PARPORT,,50,parport parport_splink lp))
 
 LINUX_BINARY_DRIVER_SITE=http://openwrt.org/downloads/sources
 # proprietary driver, extracted from Linksys GPL sourcetree WRT54GS 4.70.6

-LINUX_BINARY_WL_DRIVER=kernel-binary-wl-0.4.tar.gz
-LINUX_BINARY_WL_MD5SUM=0659fa8f1805be6ec03188ef8e1216cc
-LINUX_ET_DRIVER=kernel-source-et-0.11.tar.gz
-LINUX_ET_MD5SUM=bdc23ab59440793e35cab039457f6358
+LINUX_BINARY_WL_DRIVER=kernel-binary-wl-0.5.tar.gz
+LINUX_BINARY_WL_MD5SUM=78e839842bdc04022bb44469f92b1131
+LINUX_ET_DRIVER=kernel-source-et-0.12.tar.gz
+LINUX_ET_MD5SUM=14c6810cd3ee74b5f9f86b98fdaaeb18

 
 $(DL_DIR)/$(LINUX_BINARY_WL_DRIVER):
 
 $(DL_DIR)/$(LINUX_BINARY_WL_DRIVER):

-       $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_BINARY_WL_DRIVER) $(LINUX_BINARY_WL_MD5SUM) $(LINUX_BINARY_DRIVER_SITE)
+       $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_BINARY_WL_DRIVER) $(LINUX_BINARY_WL_MD5SUM) $(LINUX_BINARY_DRIVER_SITE) $(MAKE_TRACE)

 
 $(DL_DIR)/$(LINUX_ET_DRIVER):
 
 $(DL_DIR)/$(LINUX_ET_DRIVER):

-       $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_ET_DRIVER) $(LINUX_ET_MD5SUM) $(LINUX_BINARY_DRIVER_SITE)
+       $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_ET_DRIVER) $(LINUX_ET_MD5SUM) $(LINUX_BINARY_DRIVER_SITE) $(MAKE_TRACE)

        
 $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_BINARY_WL_DRIVER) $(DL_DIR)/$(LINUX_ET_DRIVER)
 $(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.drivers-unpacked
 $(LINUX_DIR)/.modules_done: $(LINUX_DIR)/.drivers-unpacked
        
 $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_BINARY_WL_DRIVER) $(DL_DIR)/$(LINUX_ET_DRIVER)
 $(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.drivers-unpacked
 $(LINUX_DIR)/.modules_done: $(LINUX_DIR)/.drivers-unpacked

+$(STAMP_DIR)/.linux-compile: $(LINUX_DIR)/.drivers-installed

 
 $(LINUX_DIR)/.drivers-unpacked: $(LINUX_DIR)/.unpacked
        -mkdir -p $(BUILD_DIR)
 
 $(LINUX_DIR)/.drivers-unpacked: $(LINUX_DIR)/.unpacked
        -mkdir -p $(BUILD_DIR)


@@ -44,11 +49,16 @@ $(LINUX_DIR)/.drivers-unpacked: $(LINUX_DIR)/.unpacked
        zcat $(DL_DIR)/$(LINUX_ET_DRIVER) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
        # copy binary wlan driver
        mkdir -p $(LINUX_DIR)/drivers/net/{et,wl}
        zcat $(DL_DIR)/$(LINUX_ET_DRIVER) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
        # copy binary wlan driver
        mkdir -p $(LINUX_DIR)/drivers/net/{et,wl}

-       cp -a $(BUILD_DIR)/wl/*.o $(LINUX_DIR)/drivers/net/wl
+       cp -fpR $(BUILD_DIR)/wl/*.o $(LINUX_DIR)/drivers/net/wl

        # copy proprietary et source
        # copy proprietary et source

-       cp -a $(BUILD_DIR)/et/* $(LINUX_DIR)/drivers/net/et
+       cp -fpR $(BUILD_DIR)/et/* $(LINUX_DIR)/drivers/net/et

        mkdir -p $(LINUX_DIR)/arch/mips/bcm947xx/include/
        mkdir -p $(LINUX_DIR)/arch/mips/bcm947xx/include/

-       cp -a $(BUILD_DIR)/et/*.h $(LINUX_DIR)/arch/mips/bcm947xx/include/
+       cp -fpR $(BUILD_DIR)/et/*.h $(LINUX_DIR)/arch/mips/bcm947xx/include/
+       touch $@
+
+$(LINUX_DIR)/.drivers-installed: $(LINUX_DIR)/.modules_done
+       mkdir -p $(LINUX_BUILD_DIR)/modules/lib/modules/2.4.32/kernel/drivers/net/wl
+       @-[ -f $(LINUX_BUILD_DIR)/modules/lib/modules/2.4.32/kernel/drivers/net/wl/wl.o ] || cp $(LINUX_DIR)/drivers/net/wl/wl.o $(LINUX_BUILD_DIR)/modules/lib/modules/2.4.32/kernel/drivers/net/wl/

        touch $@
 
 linux-dirclean: drivers-clean
        touch $@
 
 linux-dirclean: drivers-clean