X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/f4161bd95531c2110625ec18ba901c414c921a3b..0001d67471ae603cc44ff67aa0ec466bcfc08754:/openwrt/package/linux/linux.mk?ds=inline

diff --git a/openwrt/package/linux/linux.mk b/openwrt/package/linux/linux.mk
index 8610bb2c1..1cfd69988 100644
--- a/openwrt/package/linux/linux.mk
+++ b/openwrt/package/linux/linux.mk
@@ -32,8 +32,8 @@ LINUX_SOURCE_DIR=$(LINUX_DIR)-$(LINUX_VERSION)
 # proprietary driver extracted from linksys firmware GPL sourcetree WRT54GS_3_37_2_1109_US 
 LINUX_BINARY_WL_DRIVER=kernel-binary-wl-0.2.tar.gz
 LINUX_BINARY_WL_MD5SUM=ab2a6d39ccb550e494bbeccf1b0e228f
-LINUX_ET_DRIVER=kernel-source-et-0.5.tar.gz
-LINUX_ET_MD5SUM=93402cd0cbb1cf81d6df204bb7de343d
+LINUX_ET_DRIVER=kernel-source-et-0.6.tar.gz
+LINUX_ET_MD5SUM=b7883403d3c1ce7b73c362db621c6f00
 
 TARGET_MODULES_DIR=$(TARGET_DIR)/lib/modules/$(LINUX_VERSION)
 
@@ -52,7 +52,6 @@ $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE) $(DL_DIR)/$(LINUX_BINARY_WL_DR
 	touch $(LINUX_DIR)/.unpacked
 
 $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
-	$(PATCH) $(LINUX_DIR) $(LINUX_PATCHES)
 	# copy kernel source which is maintained in openwrt via cvs
 	cp -a $(LINUX_KERNEL_SOURCE)/* $(LINUX_DIR)
 	# copy binary wlan driver
@@ -60,6 +59,7 @@ $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
 	# copy proprietary et source
 	cp -a $(BUILD_DIR)/et/* $(LINUX_DIR)/drivers/net/et
 	cp -a $(BUILD_DIR)/et/*.h $(LINUX_DIR)/include/
+	$(PATCH) $(LINUX_DIR) $(LINUX_PATCHES)
 	$(SED) 's/@expr length/@-expr length/' $(LINUX_DIR)/Makefile 
 	touch $(LINUX_DIR)/.patched
 
@@ -77,7 +77,7 @@ $(LINUX_DIR)/.depend_done:  $(LINUX_DIR)/.configured
 	touch $(LINUX_DIR)/.depend_done
 
 $(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) CFLAGS_KERNEL="-fno-delayed-branch " $(LINUX_FORMAT)
 
 $(LINUX_KERNEL): $(LINUX_DIR)/$(LINUX_BINLOC)
 	cp -fa $< $@ 
@@ -88,7 +88,7 @@ $(LINUX_IMAGE): $(LINUX_KERNEL)
 
 $(LINUX_DIR)/.modules_done: $(LINUX_KERNEL) $(LINUX_IMAGE)
 	rm -rf $(BUILD_DIR)/modules
-	$(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) modules
+	$(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) CFLAGS_KERNEL="-fno-delayed-branch " modules
 	$(MAKE) -C $(LINUX_DIR) DEPMOD=true INSTALL_MOD_PATH=$(BUILD_DIR)/modules modules_install
 	touch $(LINUX_DIR)/.modules_done