Index: mt7615e/mt_wifi/embedded/include/eeprom.h
===================================================================
--- mt7615e.orig/mt_wifi/embedded/include/eeprom.h
+++ mt7615e/mt_wifi/embedded/include/eeprom.h
@@ -81,7 +81,7 @@
 
 #ifdef MT7615
 #undef EEPROM_DEFAULT_FILE_PATH
-#define EEPROM_DEFAULT_FILE_PATH                     "/etc_ro/wlan/MT7615_EEPROM.bin"
+#define EEPROM_DEFAULT_FILE_PATH                     "/etc/wireless/mt7615e2/mt7615e.eeprom.bin"
 #endif /* MT7615 */
 
 
Index: mt7615e/mt_wifi/include/os/rt_linux.h
===================================================================
--- mt7615e.orig/mt_wifi/include/os/rt_linux.h
+++ mt7615e/mt_wifi/include/os/rt_linux.h
@@ -129,8 +129,8 @@ typedef struct usb_ctrlrequest devctrlre
 #define AP_PROFILE_PATH			"/etc/Wireless/iNIC/iNIC_ap.dat"
 #define AP_RTMP_FIRMWARE_FILE_NAME "/etc_ro/Wireless/iNIC/RT2860AP.bin"
 #else
-#define AP_PROFILE_PATH			"/etc/Wireless/RT2860AP/RT2860AP.dat"
-#define AP_RTMP_FIRMWARE_FILE_NAME "/etc/Wireless/RT2860AP/RT2860AP.bin"
+#define AP_PROFILE_PATH			"/etc/wireless/mt7615e2/mt7615e2.dat"
+#define AP_RTMP_FIRMWARE_FILE_NAME "/etc/wireless/mt7615e2/mt7615e.eeprom.bin"
 #endif
 
 
Index: mt7615e/mt_wifi/os/linux/rt_linux.c
===================================================================
--- mt7615e.orig/mt_wifi/os/linux/rt_linux.c
+++ mt7615e/mt_wifi/os/linux/rt_linux.c
@@ -43,8 +43,8 @@
 #endif /* MEM_ALLOC_INFO_SUPPORT */
 
 #if defined(CONFIG_RA_HW_NAT) || defined(CONFIG_RA_HW_NAT_MODULE)
-#include "../../../../../../net/nat/hw_nat/ra_nat.h"
-#include "../../../../../../net/nat/hw_nat/frame_engine.h"
+#include "../../../linux-kernel/net/nat/hw_nat/ra_nat.h"
+#include "../../../linux-kernel/net/nat/hw_nat/frame_engine.h"
 #endif
 
 /* TODO */
Index: mt7615e/mt_wifi/os/linux/rt_profile.c
===================================================================
--- mt7615e.orig/mt_wifi/os/linux/rt_profile.c
+++ mt7615e/mt_wifi/os/linux/rt_profile.c
@@ -34,8 +34,8 @@
 #endif
 
 #if defined (CONFIG_RA_HW_NAT)  || defined (CONFIG_RA_HW_NAT_MODULE)
-#include "../../../../../../net/nat/hw_nat/ra_nat.h"
-#include "../../../../../../net/nat/hw_nat/frame_engine.h"
+#include "../../../linux-kernel/net/nat/hw_nat/ra_nat.h"
+#include "../../../linux-kernel/net/nat/hw_nat/frame_engine.h"
 #endif
 
 #define BSSID_WCID_TO_REMOVE 1
@@ -87,13 +87,13 @@ struct dev_type_name_map{
 #define THIRD_CHIP_ID	xdef_to_str(CONFIG_RT_THIRD_CARD)
 
 #else
-#define FIRST_EEPROM_FILE_PATH	"/etc_ro/Wireless/RT2860/"
-#define FIRST_AP_PROFILE_PATH		"/etc/Wireless/RT2860/RT2860.dat"
+#define FIRST_EEPROM_FILE_PATH	"/etc/wireless/mt7615e2/mt7615e.eeprom.bin"
+#define FIRST_AP_PROFILE_PATH		"/etc/wireless/mt7615e2/mt7615e2.dat"
 #define FIRST_STA_PROFILE_PATH      "/etc/Wireless/RT2860/RT2860.dat"
 #define FIRST_CHIP_ID	xdef_to_str(CONFIG_RT_FIRST_CARD)
 
-#define SECOND_EEPROM_FILE_PATH	"/etc_ro/Wireless/iNIC/"
-#define SECOND_AP_PROFILE_PATH	"/etc/Wireless/iNIC/iNIC_ap.dat"
+#define SECOND_EEPROM_FILE_PATH	"/etc/wireless/mt7615e5/mt7615e.eeprom.bin"
+#define SECOND_AP_PROFILE_PATH	"/etc/wireless/mt7615e5/mt7615e5.dat"
 #define SECOND_STA_PROFILE_PATH "/etc/Wireless/iNIC/iNIC_sta.dat"
 
 #define SECOND_CHIP_ID	xdef_to_str(CONFIG_RT_SECOND_CARD)
Index: mt7615e/mt_wifi_ap/Makefile
===================================================================
--- mt7615e.orig/mt_wifi_ap/Makefile
+++ mt7615e/mt_wifi_ap/Makefile
@@ -1,14 +1,45 @@
-EXTRA_CFLAGS = -Idrivers/net/wireless/mt_wifi/include \
-				-Idrivers/net/wireless/mt_wifi/embedded/include \
-				-Idrivers/net/wireless/mt_wifi/ate/include
+PWD := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
+
+EXTRA_CFLAGS = -I$(PWD)/../mt_wifi/include \
+		-I$(PWD)/../mt_wifi/embedded/include \
+		-I$(PWD)/../mt_wifi/ate/include
 
 ifeq ($(CONFIG_SUPPORT_OPENWRT),y)
-EXTRA_CFLAGS = -I$(src)/../src/include \
-				-I$(src)/../src/embedded/include \
-				-I$(src)/../src/ate/include
-DRV_NAME = mt7628
-SRC_DIR = ../src/embedded
+DRV_NAME = mt7615e
+SRC_DIR = ../mt_wifi/
+SRC_EMBEDDED_DIR = ../mt_wifi/embedded
 obj-m += $(DRV_NAME).o
+
+EXTRA_CFLAGS += -DCONFIG_RT_FIRST_CARD=$(CONFIG_RT_FIRST_CARD)
+EXTRA_CFLAGS += -DCONFIG_RT_SECOND_CARD=$(CONFIG_RT_SECOND_CARD)
+
+EXTRA_CFLAGS += -DCONFIG_RT_FIRST_IF_RF_OFFSET=$(CONFIG_RT_FIRST_IF_RF_OFFSET)
+EXTRA_CFLAGS += -DCONFIG_RT_SECOND_IF_RF_OFFSET=$(CONFIG_RT_SECOND_IF_RF_OFFSET)
+
+ifeq ($(CONFIG_FIRST_IF_EEPROM_PROM),y)
+EXTRA_CFLAGS += -DCONFIG_RT_FIRST_CARD_EEPROM="\"prom\""
+else
+ifeq ($(CONFIG_FIRST_IF_EEPROM_EFUSE),y)
+EXTRA_CFLAGS += -DCONFIG_RT_FIRST_CARD_EEPROM="\"efuse\""
+else
+ifeq ($(CONFIG_FIRST_IF_EEPROM_FLASH),y)
+EXTRA_CFLAGS += -DCONFIG_RT_FIRST_CARD_EEPROM="\"flash\""
+endif
+endif
+endif
+
+ifeq ($(CONFIG_SECOND_IF_EEPROM_PROM),y)
+EXTRA_CFLAGS += -DCONFIG_RT_SECOND_CARD_EEPROM="\"prom\""
+else
+ifeq ($(CONFIG_SECOND_IF_EEPROM_EFUSE),y)
+EXTRA_CFLAGS += -DCONFIG_RT_SECOND_CARD_EEPROM="\"efuse\""
+else
+ifeq ($(CONFIG_SECOND_IF_EEPROM_FLASH),y)
+EXTRA_CFLAGS += -DCONFIG_RT_SECOND_CARD_EEPROM="\"flash\""
+endif
+endif
+endif
+
 else
 EXTRA_CFLAGS = -Idrivers/net/wireless/mt_wifi/include \
 				-Idrivers/net/wireless/mt_wifi/embedded/include \
