diff --git a/Makefile b/Makefile
index 40ccb36..1060f82 100644
--- a/Makefile
+++ b/Makefile
@@ -21,11 +21,11 @@ MODULE = $(word 1, $(CHIPSET))
 #OS ABL - YES or NO
 OSABL = NO
 
-RT28xx_DIR = $(shell pwd)
+PWD = $(shell pwd)
 
-include $(RT28xx_DIR)/os/linux/config.mk
+include $(PWD)/os/linux/config.mk
 
-RTMP_SRC_DIR = $(RT28xx_DIR)/RT$(MODULE)
+RTMP_SRC_DIR = $(PWD)/RT$(MODULE)
 
 #PLATFORM: Target platform
 PLATFORM = PC
@@ -47,7 +47,7 @@ LINUX_SRC_MODULE = /lib/modules/$(shell uname -r)/kernel/drivers/net/wireless/
 CROSS_COMPILE = 
 endif
 
-export OSABL RT28xx_DIR RT28xx_MODE LINUX_SRC CROSS_COMPILE CROSS_COMPILE_INCLUDE PLATFORM RELEASE CHIPSET MODULE RTMP_SRC_DIR LINUX_SRC_MODULE TARGET HAS_WOW_SUPPORT
+export OSABL PWD RT28xx_MODE LINUX_SRC CROSS_COMPILE CROSS_COMPILE_INCLUDE PLATFORM RELEASE CHIPSET MODULE RTMP_SRC_DIR LINUX_SRC_MODULE TARGET HAS_WOW_SUPPORT
 
 # The targets that may be used.
 PHONY += all build_tools test UCOS THREADX LINUX release prerelease clean uninstall install libwapi osabl
@@ -56,52 +56,52 @@ all: build_tools $(TARGET)
 
 build_tools:
 	$(MAKE) -C tools
-	$(RT28xx_DIR)/tools/bin2h
+	$(PWD)/tools/bin2h
 
 test:
 	$(MAKE) -C tools test
 
 LINUX:
 ifeq ($(OSABL),YES)
-	cp -f os/linux/Makefile.6.util $(RT28xx_DIR)/os/linux/Makefile
-	$(MAKE) -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules
+	cp -f os/linux/Makefile.6.util $(PWD)/os/linux/Makefile
+	$(MAKE) -C $(LINUX_SRC) SUBDIRS=$(PWD)/os/linux modules
 endif
-	cp -f os/linux/Makefile.6 $(RT28xx_DIR)/os/linux/Makefile
-	$(MAKE) -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules
+	cp -f os/linux/Makefile.6 $(PWD)/os/linux/Makefile
+	$(MAKE) -C $(LINUX_SRC) SUBDIRS=$(PWD)/os/linux modules
 
 ifeq ($(OSABL),YES)
-	cp -f os/linux/Makefile.6.netif $(RT28xx_DIR)/os/linux/Makefile
-	$(MAKE) -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules
+	cp -f os/linux/Makefile.6.netif $(PWD)/os/linux/Makefile
+	$(MAKE) -C $(LINUX_SRC) SUBDIRS=$(PWD)/os/linux modules
 endif
 
 ifeq ($(RT28xx_MODE),AP)
-	cp -f $(RT28xx_DIR)/os/linux/$(MODULE)_ap.ko /tftpboot
+	cp -f $(PWD)/os/linux/$(MODULE)_ap.ko /tftpboot
 ifeq ($(OSABL),YES)
-	cp -f $(RT28xx_DIR)/os/linux/$(MODULE)_ap_util.ko /tftpboot
-	cp -f $(RT28xx_DIR)/os/linux/$(MODULE)_ap_net.ko /tftpboot
+	cp -f $(PWD)/os/linux/$(MODULE)_ap_util.ko /tftpboot
+	cp -f $(PWD)/os/linux/$(MODULE)_ap_net.ko /tftpboot
 endif
 	rm -f os/linux/$(MODULE)_ap.ko.lzma
 	/root/bin/lzma e os/linux/$(MODULE)_ap.ko os/linux/$(MODULE)_ap.ko.lzma
 else	
 ifeq ($(RT28xx_MODE),APSTA)
-	cp -f $(RT28xx_DIR)/os/linux/$(MODULE)_apsta.ko /tftpboot
+	cp -f $(PWD)/os/linux/$(MODULE)_apsta.ko /tftpboot
 ifeq ($(OSABL),YES)
-	cp -f $(RT28xx_DIR)/os/linux/$(MODULE)_apsta_util.ko /tftpboot
-	cp -f $(RT28xx_DIR)/os/linux/$(MODULE)_apsta_net.ko /tftpboot
+	cp -f $(PWD)/os/linux/$(MODULE)_apsta_util.ko /tftpboot
+	cp -f $(PWD)/os/linux/$(MODULE)_apsta_net.ko /tftpboot
 endif
 else
-	cp -f $(RT28xx_DIR)/os/linux/$(MODULE)_sta.ko /tftpboot 2>/dev/null || :
+	cp -f $(PWD)/os/linux/$(MODULE)_sta.ko /tftpboot 2>/dev/null || :
 ifeq ($(OSABL),YES)
-	cp -f $(RT28xx_DIR)/os/linux/$(MODULE)_sta_util.ko /tftpboot 2>/dev/null || :
-	cp -f $(RT28xx_DIR)/os/linux/$(MODULE)_sta_net.ko /tftpboot 2>/dev/null || :
+	cp -f $(PWD)/os/linux/$(MODULE)_sta_util.ko /tftpboot 2>/dev/null || :
+	cp -f $(PWD)/os/linux/$(MODULE)_sta_net.ko /tftpboot 2>/dev/null || :
 endif
 endif
 endif
 
 
 release: build_tools
-	$(MAKE) -C $(RT28xx_DIR)/striptool -f Makefile.release clean
-	$(MAKE) -C $(RT28xx_DIR)/striptool -f Makefile.release
+	$(MAKE) -C $(PWD)/striptool -f Makefile.release clean
+	$(MAKE) -C $(PWD)/striptool -f Makefile.release
 	striptool/striptool.out
 ifeq ($(RELEASE), DPO)
 	gcc -o striptool/banner striptool/banner.c
@@ -111,16 +111,16 @@ endif
 
 prerelease:
 ifeq ($(MODULE), 2880)
-	$(MAKE) -C $(RT28xx_DIR)/os/linux -f Makefile.release.2880 prerelease
+	$(MAKE) -C $(PWD)/os/linux -f Makefile.release.2880 prerelease
 else
-	$(MAKE) -C $(RT28xx_DIR)/os/linux -f Makefile.release prerelease
+	$(MAKE) -C $(PWD)/os/linux -f Makefile.release prerelease
 endif
-	cp $(RT28xx_DIR)/os/linux/Makefile.DPB $(RTMP_SRC_DIR)/os/linux/.
-	cp $(RT28xx_DIR)/os/linux/Makefile.DPA $(RTMP_SRC_DIR)/os/linux/.
-	cp $(RT28xx_DIR)/os/linux/Makefile.DPC $(RTMP_SRC_DIR)/os/linux/.
+	cp $(PWD)/os/linux/Makefile.DPB $(RTMP_SRC_DIR)/os/linux/.
+	cp $(PWD)/os/linux/Makefile.DPA $(RTMP_SRC_DIR)/os/linux/.
+	cp $(PWD)/os/linux/Makefile.DPC $(RTMP_SRC_DIR)/os/linux/.
 ifeq ($(RT28xx_MODE),STA)
-	cp $(RT28xx_DIR)/os/linux/Makefile.DPD $(RTMP_SRC_DIR)/os/linux/.
-	cp $(RT28xx_DIR)/os/linux/Makefile.DPO $(RTMP_SRC_DIR)/os/linux/.
+	cp $(PWD)/os/linux/Makefile.DPD $(RTMP_SRC_DIR)/os/linux/.
+	cp $(PWD)/os/linux/Makefile.DPO $(RTMP_SRC_DIR)/os/linux/.
 endif	
 
 clean:
@@ -132,61 +132,33 @@ endif
 
 uninstall:
 ifeq ($(TARGET), LINUX)
-ifneq (,$(findstring 2.4,$(LINUX_SRC)))
-	$(MAKE) -C $(RT28xx_DIR)/os/linux -f Makefile.4 uninstall
-else
-	$(MAKE) -C $(RT28xx_DIR)/os/linux -f Makefile.6 uninstall
-endif
+	$(MAKE) -C $(PWD)/os/linux -f Makefile.6 uninstall
 endif
 
 install:
 ifeq ($(TARGET), LINUX)
-ifneq (,$(findstring 2.4,$(LINUX_SRC)))
-	$(MAKE) -C $(RT28xx_DIR)/os/linux -f Makefile.4 install
-else
-	$(MAKE) -C $(RT28xx_DIR)/os/linux -f Makefile.6 install
-endif
+	$(MAKE) -C $(PWD)/os/linux -f Makefile.6 install
 endif
 
 libwapi:
-ifneq (,$(findstring 2.4,$(LINUX_SRC)))
-	cp -f os/linux/Makefile.libwapi.4 $(RT28xx_DIR)/os/linux/Makefile
-	$(MAKE) -C $(RT28xx_DIR)/os/linux/
-else
-	cp -f os/linux/Makefile.libwapi.6 $(RT28xx_DIR)/os/linux/Makefile	
-	$(MAKE) -C  $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules	
-endif	
+	cp -f os/linux/Makefile.libwapi.6 $(PWD)/os/linux/Makefile	
+	$(MAKE) -C  $(LINUX_SRC) SUBDIRS=$(PWD)/os/linux modules
 
 osutil:
 ifeq ($(OSABL),YES)
-ifneq (,$(findstring 2.4,$(LINUX_SRC)))
-	cp -f os/linux/Makefile.4.util $(RT28xx_DIR)/os/linux/Makefile
-	$(MAKE) -C $(RT28xx_DIR)/os/linux/
-else
-	cp -f os/linux/Makefile.6.util $(RT28xx_DIR)/os/linux/Makefile
-	$(MAKE) -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules
-endif
+	cp -f os/linux/Makefile.6.util $(PWD)/os/linux/Makefile
+	$(MAKE) -C $(LINUX_SRC) SUBDIRS=$(PWD)/os/linux modules
 endif
 
 osnet:
 ifeq ($(OSABL),YES)
-ifneq (,$(findstring 2.4,$(LINUX_SRC)))
-	cp -f os/linux/Makefile.4.netif $(RT28xx_DIR)/os/linux/Makefile
-	$(MAKE) -C $(RT28xx_DIR)/os/linux/
-else
-	cp -f os/linux/Makefile.6.netif $(RT28xx_DIR)/os/linux/Makefile
-	$(MAKE) -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules
-endif
+	cp -f os/linux/Makefile.6.netif $(PWD)/os/linux/Makefile
+	$(MAKE) -C $(LINUX_SRC) SUBDIRS=$(PWD)/os/linux modules
 endif
 
 osdrv:
-ifneq (,$(findstring 2.4,$(LINUX_SRC)))
-	cp -f os/linux/Makefile.4 $(RT28xx_DIR)/os/linux/Makefile
-	$(MAKE) -C $(RT28xx_DIR)/os/linux/
-else
-	cp -f os/linux/Makefile.6 $(RT28xx_DIR)/os/linux/Makefile
-	$(MAKE) -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules
-endif
+	cp -f os/linux/Makefile.6 $(PWD)/os/linux/Makefile
+	$(MAKE) -C $(LINUX_SRC) SUBDIRS=$(PWD)/os/linux modules
 
 # Declare the contents of the .PHONY variable as phony.  We keep that information in a variable
 .PHONY: $(PHONY)
diff --git a/os/linux/Makefile.6 b/os/linux/Makefile.6
index 8ac9431..d174204 100644
--- a/os/linux/Makefile.6
+++ b/os/linux/Makefile.6
@@ -1,4 +1,4 @@
-include $(RT28xx_DIR)/os/linux/config.mk
+include $(PWD)/os/linux/config.mk
 
 obj_wsc :=
 obj_vht :=
@@ -454,7 +454,7 @@ install:
 	rm -rf $(DAT_PATH)
 	$(shell [ ! -f /etc/Wireless ] && mkdir /etc/Wireless)
 	mkdir $(DAT_PATH)
-	cp $(RT28xx_DIR)/$(DAT_FILE_NAME) $(DAT_PATH)/.
+	cp $(PWD)/$(DAT_FILE_NAME) $(DAT_PATH)/.
 	install -d $(LINUX_SRC_MODULE)
 	install -m 644 -c $(addsuffix .ko,$(MOD_NAME)) $(LINUX_SRC_MODULE)
 	/sbin/depmod -a ${shell uname -r}
diff --git a/os/linux/Makefile.6.netif b/os/linux/Makefile.6.netif
index 16d31ae..3de7446 100644
--- a/os/linux/Makefile.6.netif
+++ b/os/linux/Makefile.6.netif
@@ -1,4 +1,4 @@
-include $(RT28xx_DIR)/os/linux/config.mk
+include $(PWD)/os/linux/config.mk
 
 
 #ifdef CONFIG_STA_SUPPORT
diff --git a/os/linux/Makefile.6.util b/os/linux/Makefile.6.util
index b5175e8..febff27 100644
--- a/os/linux/Makefile.6.util
+++ b/os/linux/Makefile.6.util
@@ -1,4 +1,4 @@
-include $(RT28xx_DIR)/os/linux/config.mk
+include $(PWD)/os/linux/config.mk
 
 
 #ifdef CONFIG_STA_SUPPORT
diff --git a/os/linux/Makefile.clean b/os/linux/Makefile.clean
index 495fd2b..71fb85a 100644
--- a/os/linux/Makefile.clean
+++ b/os/linux/Makefile.clean
@@ -1,4 +1,4 @@
-include $(RT28xx_DIR)/os/linux/config.mk
+include $(PWD)/os/linux/config.mk
 
 PHONY := clean install uninstall
 
diff --git a/os/linux/Makefile.libautoprovision.6 b/os/linux/Makefile.libautoprovision.6
index 89e6ba0..cd82d05 100644
--- a/os/linux/Makefile.libautoprovision.6
+++ b/os/linux/Makefile.libautoprovision.6
@@ -1,2 +1,2 @@
-include $(RT28xx_DIR)/os/linux/config.mk
+include $(PWD)/os/linux/config.mk
 
diff --git a/os/linux/config.mk b/os/linux/config.mk
index 3907796..9c065c0 100644
--- a/os/linux/config.mk
+++ b/os/linux/config.mk
@@ -211,7 +211,7 @@ endif
 WFLAGS += -g -DAGGREGATION_SUPPORT -DPIGGYBACK_SUPPORT -DWMM_SUPPORT  -DLINUX -Wall -Wstrict-prototypes -Wno-trigraphs
 WFLAGS += -DSYSTEM_LOG_SUPPORT -DRT28xx_MODE=$(RT28xx_MODE) -DCHIPSET=$(MODULE) -DRESOURCE_PRE_ALLOC -DENHANCED_STAT_DISPLAY
 #WFLAGS += -DFPGA_MODE
-WFLAGS += -I$(RT28xx_DIR)/include
+WFLAGS += -I$(PWD)/include
 
 
 
@@ -297,7 +297,7 @@ endif
 ifeq ($(HAS_ATE),y)
 WFLAGS += -DRALINK_ATE
 WFLAGS += -DCONFIG_RT2880_ATE_CMD_NEW
-WFLAGS += -I$(RT28xx_DIR)/ate/include
+WFLAGS += -I$(PWD)/ate/include
 ifeq ($(HAS_QA_SUPPORT),y)
 WFLAGS += -DRALINK_QA
 endif
diff --git a/tools/bin2h.c b/tools/bin2h.c
index a16d7c4..782533b 100644
--- a/tools/bin2h.c
+++ b/tools/bin2h.c
@@ -94,14 +94,14 @@ int main(int argc ,char *argv[])
     char *chipset, *token;
 	char *wow, *rt28xx_mode;
 
-    rt28xxdir = (char *)getenv("RT28xx_DIR");
+    rt28xxdir = (char *)getenv("PWD");
     chipset = (char *)getenv("CHIPSET");
 	memcpy(chipsets, chipset, strlen(chipset));
 	wow = (char *)getenv("HAS_WOW_SUPPORT");
 	rt28xx_mode = (char *)getenv("RT28xx_MODE");
 
     if(!rt28xxdir) {
-		printf("Environment value \"RT28xx_DIR\" not export \n");
+		printf("Environment value \"PWD\" not export \n");
 	 	return -1;
     }
 
@@ -111,7 +111,7 @@ int main(int argc ,char *argv[])
     }	
 	
 	if (strlen(rt28xxdir) > (sizeof(infname)-100)) {
-		printf("Environment value \"RT28xx_DIR\" is too long!\n");
+		printf("Environment value \"PWD\" is too long!\n");
 		return -1;
 	}