diff -urN 2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO/Makefile 2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO-armadillo/Makefile
--- 2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO/Makefile	2011-07-19 17:56:36.000000000 +0900
+++ 2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO-armadillo/Makefile	2011-11-21 19:44:52.000000000 +0900
@@ -23,7 +23,8 @@
 RTMP_SRC_DIR = $(RT28xx_DIR)/RT$(CHIPSET)
 
 #PLATFORM: Target platform
-PLATFORM = PC
+#PLATFORM = PC
+PLATFORM = ARMADILLO
 #PLATFORM = 5VT
 #PLATFORM = IKANOS_V160
 #PLATFORM = IKANOS_V180
@@ -177,6 +178,13 @@
 CROSS_COMPILE = 
 endif
 
+ifeq ($(PLATFORM),ARMADILLO)
+DIST_SRC = `pwd`/../atmark-dist
+LINUX_SRC = $(DIST_SRC)/linux-2.6.x
+#CROSS_COMPILE = arm-linux-
+CROSS_COMPILE = arm-linux-gnueabi-
+endif
+
 ifeq ($(PLATFORM),IXP)
 LINUX_SRC = /project/stable/Gmtek/snapgear-uclibc/linux-2.6.x
 CROSS_COMPILE = arm-linux-
@@ -385,6 +393,11 @@
 	cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.ko /tftpboot
 endif
 else
+ifeq ($(PLATFORM),ARMADILLO)
+	mkdir -p $(DIST_SRC)/romfs/lib/modules $(DIST_SRC)/romfs/etc/Wireless/RT2870STA
+	cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko $(DIST_SRC)/romfs/lib/modules
+	cp -f RT2870STA.dat $(DIST_SRC)/romfs/etc/Wireless/RT2870STA
+else
 	cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot
 ifeq ($(OSABL),YES)
 	cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.ko /tftpboot
@@ -393,6 +406,7 @@
 endif
 endif
 endif
+endif
 
 
 release:
@@ -424,6 +438,7 @@
 	cp -f os/linux/Makefile.clean os/linux/Makefile
 	$(MAKE) -C os/linux clean
 	rm -rf os/linux/Makefile
+	$(MAKE) -C tools clean
 endif	
 ifeq ($(TARGET), UCOS)
 	$(MAKE) -C os/ucos clean MODE=$(RT28xx_MODE)
diff -urN 2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO/RT2870STA.dat 2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO-armadillo/RT2870STA.dat
--- 2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO/RT2870STA.dat	2011-07-19 17:56:36.000000000 +0900
+++ 2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO-armadillo/RT2870STA.dat	2011-11-21 19:42:15.000000000 +0900
@@ -1,8 +1,8 @@
 #The word of "Default" must not be removed
 Default
 CountryRegion=5
-CountryRegionABand=7
-CountryCode=
+CountryRegionABand=1
+CountryCode=JP
 ChannelGeography=1
 SSID=11n-AP
 NetworkType=Infra
diff -urN 2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO/common/rtusb_dev_id.c 2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO-armadillo/common/rtusb_dev_id.c
--- 2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO/common/rtusb_dev_id.c	2011-07-19 17:56:36.000000000 +0900
+++ 2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO-armadillo/common/rtusb_dev_id.c	2011-11-21 21:21:35.000000000 +0900
@@ -63,6 +63,8 @@
 	{USB_DEVICE(0x13D3,0x3305)}, /* AzureWave 3070*/
 	{USB_DEVICE(0x1044,0x800D)}, /* Gigabyte GN-WB32L 3070 */
 	{USB_DEVICE(0x2019,0xAB25)}, /* Planex Communications, Inc. RT3070 */
+	{USB_DEVICE(0x2019,0xAB29)}, /* Planex Communications, Inc. */
+	{USB_DEVICE(0x2019,0xED14)}, /* Planex Communications, Inc. */
 	{USB_DEVICE(0x2019,0x5201)}, /* Planex Communications, Inc. RT8070 */
 	{USB_DEVICE(0x07B8,0x3070)}, /* AboCom 3070 */
 	{USB_DEVICE(0x07B8,0x3071)}, /* AboCom 3071 */
@@ -82,6 +84,7 @@
 	{USB_DEVICE(0x1D4D,0x0011)}, /* Pegatron Corporation 3072 */
 	{USB_DEVICE(0x5A57,0x5257)}, /* Zinwell 3070 */
 	{USB_DEVICE(0x5A57,0x0283)}, /* Zinwell 3072 */
+	{USB_DEVICE(0x04BB,0x0944)}, /* I-O DATA */
 	{USB_DEVICE(0x04BB,0x0945)}, /* I-O DATA 3072 */
 	{USB_DEVICE(0x04BB,0x0947)}, /* I-O DATA 3070 */
 	{USB_DEVICE(0x04BB,0x0948)}, /* I-O DATA 3072 */
@@ -104,11 +107,21 @@
 	{USB_DEVICE(0x13D3,0x3307)}, /* Azurewave */
 	{USB_DEVICE(0x13D3,0x3321)}, /* Azurewave */
 	{USB_DEVICE(0x07FA,0x7712)}, /* Edimax */
-	{USB_DEVICE(0x0789,0x0166)}, /* Edimax */
+	{USB_DEVICE(0x0789,0x0162)}, /* Logitec */
+	{USB_DEVICE(0x0789,0x0163)}, /* Logitec */
+	{USB_DEVICE(0x0789,0x0164)}, /* Logitec */
+	{USB_DEVICE(0x0789,0x0166)}, /* Logitec */
+	{USB_DEVICE(0x0789,0x0168)}, /* Logitec */
+	{USB_DEVICE(0x0789,0x0169)}, /* Logitec */
 	{USB_DEVICE(0x0586,0x341A)}, /* Zyxel */
 	{USB_DEVICE(0x0586,0x341E)}, /* Zyxel */
 	{USB_DEVICE(0x0586,0x343E)}, /* Zyxel */
 	{USB_DEVICE(0x1EDA,0x2012)}, /* Airties */
+	{USB_DEVICE(0x0411,0x0158)}, /* Buffalo */
+	{USB_DEVICE(0x0411,0x015D)}, /* Buffalo */
+	{USB_DEVICE(0x0411,0x016F)}, /* Buffalo */
+	{USB_DEVICE(0x0411,0x019E)}, /* Buffalo */
+	{USB_DEVICE(0x0411,0x01A2)}, /* Buffalo */
 #endif /* RT3070 */
 #ifdef RT3370
 	{USB_DEVICE(0x148F,0x3370)}, /* Ralink 3370 */
diff -urN 2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO/os/linux/config.mk 2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO-armadillo/os/linux/config.mk
--- 2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO/os/linux/config.mk	2011-07-19 17:56:36.000000000 +0900
+++ 2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO-armadillo/os/linux/config.mk	2011-11-21 19:42:15.000000000 +0900
@@ -220,7 +220,7 @@
 # config for STA mode
 
 ifeq ($(RT28xx_MODE),STA)
-WFLAGS += -DCONFIG_STA_SUPPORT -DDBG
+WFLAGS += -DCONFIG_STA_SUPPORT #-DDBG
 
 ifeq ($(HAS_XLINK),y)
 WFLAGS += -DXLINK_SUPPORT
@@ -734,6 +734,10 @@
     endif
 endif
 
+ifeq ($(PLATFORM),ARMADILLO)
+EXTRA_CFLAGS := $(WFLAGS) -I$(RT28xx_DIR)/include -O3
+endif
+
 #If the kernel version of RMI is newer than 2.6.27, please change "CFLAGS" to "EXTRA_FLAGS"
 ifeq ($(PLATFORM),RMI)
 EXTRA_CFLAGS := -D__KERNEL__ -DMODULE=1 -I$(LINUX_SRC)/include -I$(LINUX_SRC)/include/asm-mips/mach-generic  -I$(RT28xx_DIR)/include -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -DCONFIG_IFX_ALG_QOS -DCONFIG_WAN_VLAN_SUPPORT -fomit-frame-pointer -DIFX_PPPOE_FRAME -G 0 -fno-pic -mno-abicalls -mlong-calls -pipe -finline-limit=100000 -mabi=32 -G 0 -mno-abicalls -fno-pic -pipe -msoft-float -march=xlr -ffreestanding  -march=xlr -Wa,--trap, -nostdinc -iwithprefix include $(WFLAGS)
diff -urN 2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO/sta/sta_cfg.c 2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO-armadillo/sta/sta_cfg.c
--- 2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO/sta/sta_cfg.c	2011-07-19 17:56:36.000000000 +0900
+++ 2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO-armadillo/sta/sta_cfg.c	2011-11-21 19:42:20.000000000 +0900
@@ -7283,17 +7283,23 @@
 			break;
 
 		case CMD_RTPRIV_IOCTL_MAC:
+#ifdef DBG
 			RTMPIoctlMAC(pAd, pRequest);
+#endif /* DBG */
 			break;
 
 		case CMD_RTPRIV_IOCTL_E2P:
+#ifdef DBG
 			RTMPIoctlE2PROM(pAd, pRequest);
+#endif /* DBG */
 			break;
 
 		case CMD_RTPRIV_IOCTL_RF:
+#ifdef DBG
 #ifdef RTMP_RF_RW_SUPPORT
 			RTMPIoctlRF(pAd, pRequest);
 #endif /* RTMP_RF_RW_SUPPORT */
+#endif /* DBG */
 			break;
 
 		case CMD_RTPRIV_IOCTL_BBP: