--- 2008_0718_RT2870_Linux_STA_v1.3.1.0/Makefile.orig	2008-09-22 16:07:37.000000000 +0200
+++ 2008_0718_RT2870_Linux_STA_v1.3.1.0/Makefile	2008-09-22 16:08:23.000000000 +0200
@@ -81,11 +81,7 @@
 
 export RT28xx_DIR RT28xx_MODE LINUX_SRC CROSS_COMPILE PLATFORM RELEASE CHIPSET RTMP_SRC_DIR LINUX_SRC_MODULE
 
-all: build_tools $(TARGET)
-
-build_tools:
-	make -C tools
-	$(RT28xx_DIR)/tools/bin2h
+all: $(TARGET)
 
 UCOS:
 	make -C os/ucos/ MODE=$(RT28xx_MODE)
--- 2008_0718_RT2870_Linux_STA_v1.3.1.0/common/rtmp_init.c.orig	2008-05-06 08:19:22.000000000 +0200
+++ 2008_0718_RT2870_Linux_STA_v1.3.1.0/common/rtmp_init.c	2008-09-22 17:58:00.000000000 +0200
@@ -38,9 +38,8 @@
     Jan Lee  2006-09-15    RT2860. Change for 802.11n , EEPROM, Led, BA, HT.
 */
 #include	"rt_config.h"
-#include 	"firmware.h"
 
-//#define BIN_IN_FILE /* use *.bin firmware */
+#define BIN_IN_FILE /* use *.bin firmware */
 
 UCHAR    BIT8[] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80};
 ULONG    BIT32[] = {0x00000001, 0x00000002, 0x00000004, 0x00000008,
@@ -205,7 +204,6 @@
 
 #endif // RT2870 //
 
-#define FIRMWAREIMAGE_LENGTH		(sizeof (FirmwareImage) / sizeof(UCHAR))
 #define FIRMWARE_MAJOR_VERSION	0
 
 
@@ -2490,7 +2488,7 @@
 
 	/* init */
 	pFirmwareImage = NULL;
-	src = RTMP_FIRMWARE_FILE_NAME;
+	src = STA_RT2870_IMAGE_FILE_NAME;
 
 	/* save uid and gid used for filesystem access.
 	   set user and group to 0 (root) */
@@ -2631,9 +2629,10 @@
 			kfree(pFirmwareImage);
 		/* End of if */
 
-		/* use default *.bin array */
-		pFirmwareImage = FirmwareImage;
-		FileLength = sizeof(FirmwareImage);
+		Status = NDIS_STATUS_FAILURE;
+		DBGPRINT(RT_DEBUG_ERROR, ("NICLoadFirmware: failed to load firmware\n"));
+		goto NICLoadFirmware_out;
+
 	} /* End of if */
 
 	/* enable Host program ram write selection */
@@ -2656,13 +2655,9 @@
 	RTMP_IO_WRITE32(pAd, H2M_BBP_AGENT, 0);
 	RTMP_IO_WRITE32(pAd, H2M_MAILBOX_CSR, 0);
 
-	if (flg_default_firm_use == FALSE)
-	{
-		/* use file firmware, free allocated buffer */
-		if (pFirmwareImage != NULL)
-			kfree(pFirmwareImage);
-		/* End of if */
-	} /* End of if */
+	/* use file firmware, free allocated buffer */
+	if (pFirmwareImage != NULL)
+		kfree(pFirmwareImage);
 
 	set_fs(orgfs);
 	current->fsuid = orgfsuid;
@@ -2722,6 +2717,7 @@
     DBGPRINT(RT_DEBUG_TRACE,
 			 ("<=== %s (src=%s, status=%d)\n", __FUNCTION__, src, Status));
 #else
+NICLoadFirmware_out:
     DBGPRINT(RT_DEBUG_TRACE,
 			 ("<=== %s (status=%d)\n", __FUNCTION__, Status));
 #endif