From bb432025483983495c6274d8cca82967f3941bdc Mon Sep 17 00:00:00 2001
From: pvvx <pvvx@mail.ru>
Date: Mon, 10 Apr 2017 15:32:36 +0300
Subject: [PATCH] update

---
 Makefile | 48 ++++++++++++++++++++++++------------------------
 paths.mk |  3 +++
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/Makefile b/Makefile
index 7332ce1..1127b95 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,9 @@ ram_all:
 	@$(MAKE) -f sdkbuild.mk
 	@$(MAKE) -f flasher.mk genbin1 genbin23
 
+webfs:
+	@$(MAKE) -f webfs.mk webpages.espfs
+
 .PHONY: ram_all_mp
 ram_all_mp:
 	@$(MAKE) -f sdkbuild.mk mp
@@ -15,45 +18,42 @@ ram_all_mp:
 .PHONY: clean  clean_all
 clean:
 	@$(MAKE) -f sdkbuild.mk clean
+	@$(MAKE) -f webfs.mk clean
 
 clean_all:
 	@$(MAKE) -f sdkbuild.mk clean_all
+	@$(MAKE) -f webfs.mk clean
 	
-.PHONY:	debug ramdebug
-debug: 
-	@$(MAKE) -f application.mk debug	
-
-ramdebug: 
-	@$(MAKE) -f application.mk ramdebug	
-
-.PHONY: flash_OTA flashburn runram reset test readfullflash
-
-flash_OTA: 
-	JLinkGDB_OTA.bat
-
+.PHONY: flashburn runram reset test readfullflash flashwebfs
 flashburn: 
-	JLinkGDB-WrFlash.bat
-	#@$(MAKE) -f flasher.mk flashburn
+	#JLinkGDB-WrFlash.bat
+	@$(MAKE) -f flasher.mk flashburn
+
+flash_OTA:
+	@$(MAKE) -f flasher.mk flash_OTA
+	
+flashwebfs:
+	@$(MAKE) -f webfs.mk webpages.espfs
+	@$(MAKE) -f flasher.mk flashwebfs
+	#JLinkGDB-WrWebFs.bat
 
 runram: 
-	JLink-RunRAM.bat
-	#@$(MAKE) --f flasher.mk runram
+	#JLink-RunRAM.bat
+	@$(MAKE) --f flasher.mk runram
 
 reset: 
-	JLink-Reset.bat
-	#@make -f flasher.mk reset 
+	#JLink-Reset.bat
+	@$(MAKE) -f flasher.mk reset 
 
 test: 
 	JLink-RTL00ConsoleROM.bat
 	#@make -f flasher.mk test 
 
 readfullflash:
-	JLink-RdFullFlash.bat
-	#@make -f flasher.mk readfullflash 
+	#JLink-RdFullFlash.bat
+	@$(MAKE) -f flasher.mk readfullflash 
 
 .PHONY:	prerequirement
 prerequirement:
-#	@$(file >DEPENDENCY_LIST.txt,$(DEPENDENCY_LIST))
-	
-TARGETTYPE := APP
-TARGETNAME := build\obj\build.axf
+	@$(file >DEPENDENCY_LIST.txt,$(DEPENDENCY_LIST))
+	
\ No newline at end of file
diff --git a/paths.mk b/paths.mk
index 7b0e000..a7154c4 100644
--- a/paths.mk
+++ b/paths.mk
@@ -5,8 +5,11 @@ SDK_PATH = ../RTL00MP3/RTL00_SDKV35a/
 #GCC_PATH = d:/MCU/GNU_Tools_ARM_Embedded/5.2_2015q4/bin/# + or set in PATH
 #OPENOCD_PATH = d:/MCU/OpenOCD/bin/# + or set in PATH
 TOOLS_PATH ?= $(SDK_PATH)component/soc/realtek/8195a/misc/iar_utility/common/tools/
+FLASHER_TYPE ?= Jlink
+#FLASHER_TYPE ?= OCD
 FLASHER_PATH ?= flasher/
 JLINK_PATH ?= D:/MCU/SEGGER/JLink_V612i/
+JLINK_GDBSRV ?= JLinkGDBServer.exe
 #---------------------------
 # Default
 #---------------------------