don't enable sdk by default - assume that if they have buildroot they'll use buildroot

[openwrt.git] / package / linux / linux.mk

diff --git a/package/linux/linux.mk b/package/linux/linux.mk
index 02cc3bb..c443e65 100644 (file)
--- a/package/linux/linux.mk
+++ b/package/linux/linux.mk
@@ -25,7 +25,7 @@ LINUX_SOURCE=linux-$(LINUX_VERSION).tar.bz2
 LINUX_KCONFIG=./linux.config
 LINUX_PATCHES=./kernel-patches
 LINUX_KERNEL_SOURCE=./kernel-source
-LINUX_BINLOC=arch/$(LINUX_KARCH)/brcm-boards/bcm947xx/compressed/vmlinuz
+LINUX_BINLOC=arch/$(LINUX_KARCH)/brcm-boards/bcm947xx/compressed/piggy
 # Used by pcmcia-cs and others
 LINUX_SOURCE_DIR=$(LINUX_DIR)-$(LINUX_VERSION)
 
@@ -59,6 +59,7 @@ $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
        # copy binary drivers
        cp -a $(BUILD_DIR)/wl/*.o $(LINUX_DIR)/drivers/net/wl
        cp -a $(BUILD_DIR)/et/*.o $(LINUX_DIR)/drivers/net/et
+       $(SED) 's/@expr length/@-expr length/' $(LINUX_DIR)/Makefile 
        touch $(LINUX_DIR)/.patched
 
 $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched
@@ -76,7 +77,6 @@ $(LINUX_DIR)/.depend_done:  $(LINUX_DIR)/.configured
 
 $(LINUX_DIR)/$(LINUX_BINLOC): $(LINUX_DIR)/.depend_done
        $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) $(LINUX_FORMAT)
-       $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) modules
 
 $(LINUX_KERNEL): $(LINUX_DIR)/$(LINUX_BINLOC)
        cp -fa $(LINUX_DIR)/$(LINUX_BINLOC) $(LINUX_KERNEL)
@@ -84,6 +84,7 @@ $(LINUX_KERNEL): $(LINUX_DIR)/$(LINUX_BINLOC)
 
 $(LINUX_DIR)/.modules_done: $(LINUX_KERNEL)
        rm -rf $(BUILD_DIR)/modules
+       $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) modules
        $(MAKE) -C $(LINUX_DIR) DEPMOD=true INSTALL_MOD_PATH=$(BUILD_DIR)/modules modules_install
        touch $(LINUX_DIR)/.modules_done
 
@@ -94,8 +95,6 @@ $(STAGING_DIR)/include/linux/version.h: $(LINUX_DIR)/.configured
 
 $(TARGET_MODULES_DIR): 
        -mkdir -p $(TARGET_MODULES_DIR)
-       cp $(LINUX_DIR)/drivers/net/wl/wl.o $(TARGET_MODULES_DIR)
-       cp $(LINUX_DIR)/drivers/net/et/et.o $(TARGET_MODULES_DIR)
        cp $(LINUX_DIR)/drivers/net/diag/diag.o $(TARGET_MODULES_DIR)
 
 linux: $(LINUX_DIR)/.modules_done $(TARGET_MODULES_DIR)