From 0cf6a74c390ba79cd4f09e48653d287ba3ddf150 Mon Sep 17 00:00:00 2001
From: pvvx <pvvx@mail.ru>
Date: Mon, 3 Apr 2017 12:14:58 +0300
Subject: [PATCH] update

---
 Makefile   | 6 ++----
 flasher.mk | 4 ----
 paths.mk   | 5 ++++-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 3444c2c..fc78f3f 100644
--- a/Makefile
+++ b/Makefile
@@ -18,11 +18,9 @@ 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: flashburn runram reset test readfullflash flashwebfs
 flashburn: 
@@ -50,8 +48,8 @@ test:
 	#@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:
diff --git a/flasher.mk b/flasher.mk
index f0ac29f..bcb4373 100644
--- a/flasher.mk
+++ b/flasher.mk
@@ -170,14 +170,10 @@ flashwebfs:
 
 	
 reset:
-#	@$(JLINK_PATH)$(JLINK_EXE) -Device CORTEX-M3 -If SWD -Speed $(FLASHER_SPEED) flasher/RTLreset.JLinkScript
 	@$(OPENOCD) -f interface/$(FLASHER).cfg -c "transport select swd" -f $(FLASHER_PATH)rtl8710.ocd -c "init" -c "adapter_khz $(FLASHER_SPEED)" -c "reset halt" \
 	-c "rtl8710_reboot" -c shutdown
 
 runram:
-#	@start $(JLINK_PATH)$(JLINK_GDB) -device Cortex-M3 -if SWD -ir -endian little -speed $(FLASHER_SPEED)
-#	@$(GDB) -x flasher/gdb_run_ram.jlink
-#	@taskkill.exe -F -IM $(JLINK_GDB)
 	@$(OPENOCD) -f interface/$(FLASHER).cfg -c "transport select swd" -f $(FLASHER_PATH)rtl8710.ocd -c "init" -c "adapter_khz $(FLASHER_SPEED)" -c "reset halt" \
 	-c "load_image $(RAM1R_IMAGE) 0x10000bc8 bin" \
 	-c "load_image $(RAM2_IMAGE) 0x10006000 bin" \
diff --git a/paths.mk b/paths.mk
index 236c126..8d56fa3 100644
--- a/paths.mk
+++ b/paths.mk
@@ -5,8 +5,11 @@ SDK_PATH = 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_V610a/
+JLINK_PATH ?= D:/MCU/SEGGER/JLink_V612i/
+JLINK_GDBSRV ?= JLinkGDBServer.exe
 #---------------------------
 # Default
 #---------------------------