update

.cproject

@@ -967,6 +967,14 @@
 				<useDefaultCommand>true</useDefaultCommand>
 				<runAllBuilders>true</runAllBuilders>
 			</target>
+			<target name="flashboot" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>mingw32-make.exe</buildCommand>
+				<buildArguments>-s</buildArguments>
+				<buildTarget>flashboot</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
 		</buildTargets>
 	</storageModule>
 </cproject>

Makefile

@@ -6,7 +6,7 @@ mp: ram_all_mp
 .PHONY: ram_all
 ram_all:
 	@$(MAKE) -f $(SDK_PATH)sdkbuild.mk
-	@$(MAKE) -f $(SDK_PATH)flasher.mk genbin1 genbin23
+	@$(MAKE) -f $(SDK_PATH)flasher.mk genbin
 
 .PHONY: ram_all_mp
 ram_all_mp:

RTL00_SDKV35a/component/common/api/wifi_api.c

@@ -665,7 +665,7 @@ int wifi_run(rtw_mode_t mode) {
 #ifdef USE_NETBIOS
     		netbios_set_name(WLAN_ST_NETIF_NUM, lwip_host_name[0]);
 #endif
-#endif
+#endif // WIP_NETIF_HOSTNAME
 			netif_set_addr(&xnetif[WLAN_ST_NETIF_NUM], (ip_addr_t *) &wifi_st_dhcp.ip,
 					(ip_addr_t *) &wifi_st_dhcp.mask, (ip_addr_t *) &wifi_st_dhcp.gw);
 			pnif = &xnetif[WLAN_AP_NETIF_NUM];
@@ -675,7 +675,7 @@ int wifi_run(rtw_mode_t mode) {
 #ifdef USE_NETBIOS
     		netbios_set_name(WLAN_AP_NETIF_NUM, lwip_host_name[1]);
 #endif
-#endif
+#endif // WIP_NETIF_HOSTNAME
 			netif_set_addr(&xnetif[WLAN_AP_NETIF_NUM], (ip_addr_t *) &wifi_ap_dhcp.ip,
 					(ip_addr_t *) &wifi_ap_dhcp.mask, (ip_addr_t *) &wifi_ap_dhcp.gw);
 

RTL00_SDKV35a/component/common/mbed/targets/hal/rtl8195a/log_uart_api.c

@@ -41,7 +41,7 @@ int32_t log_uart_init (log_uart_t *obj, int baudrate, int data_bits, SerialParit
 {
     HAL_LOG_UART_ADAPTER *pUartAdapter;
     int i;
-
+    HalLogUartWaitTxFifoEmpty();
     _memset((void*)obj, 0, sizeof(log_uart_t));
     pUartAdapter = &obj->log_hal_uart;
     // Check Baud rate

RTL00_SDKV35a/component/common/network/lwip/lwip_v1.4.1/port/realtek/freertos/sys_arch.c

@@ -621,6 +621,7 @@ void sys_assert( const char *msg )
     ;
 }
 
+/*
 u32_t sys_now(void)
 {
 	return xTaskGetTickCount();
@@ -630,3 +631,5 @@ u32_t sys_jiffies(void)
 {
 	return xTaskGetTickCount();
 }
+*/
+

RTL00_SDKV35a/component/common/network/lwip/lwip_v1.4.1/src/include/lwip/sys.h

@@ -229,14 +229,16 @@ sys_thread_t sys_thread_new(const char *name, lwip_thread_fn thread, void *arg,
 /* sys_init() must be called before anthing else. */
 void sys_init(void);
 
-#ifndef sys_jiffies
 /** Ticks/jiffies since power up. */
-u32_t sys_jiffies(void);
+#ifndef sys_jiffies
+#define sys_jiffies() xTaskGetTickCount()
+//u32_t sys_jiffies(void);
 #endif
 
 /** Returns the current time in milliseconds,
  * may be the same as sys_jiffies or at least based on it. */
-u32_t sys_now(void);
+#define sys_now() xTaskGetTickCount()
+//u32_t sys_now(void);
 
 /* Critical Region Protection */
 /* These functions must be implemented in the sys_arch.c file.

RTL00_SDKV35a/component/soc/realtek/8195a/fwlib/ram_lib/startup.c

@@ -46,6 +46,12 @@ void SYSPlatformInit(void);
 // Data declarations
 extern u8 __bss_start__, __bss_end__;
 extern const unsigned char cus_sig[32]; // images name
+/*
+#include "section_config.h"
+SECTION(".custom.validate.rodata")
+__attribute__ ((weak)) const unsigned char cus_sig[32] = "Customer Signature-modelxxx";
+*/
+
 //extern HAL_TIMER_OP	HalTimerOp;
 
 IMAGE2_START_RAM_FUN_SECTION RAM_START_FUNCTION gImage2EntryFun0 =
@@ -185,7 +191,12 @@ extern HAL_GPIO_ADAPTER gBoot_Gpio_Adapter;
 	_pHAL_Gpio_Adapter = &gBoot_Gpio_Adapter;
 	VectorTableInitRtl8195A(STACK_TOP);	// 0x1FFFFFFC
 	loguart_wait_tx_fifo_empty(); //	иначе глючит LogUART, если переключение CLK приходится на вывод символов !
-#if 1 // if set CLK CPU
+	uint8 ChipId = HalGetChipId();
+#if 1 //def ARDUINO
+	// 0 - 166666666 Hz, 1 - 83333333 Hz
+	*((int *) (SYSTEM_CTRL_BASE + REG_SYS_SYSPLL_CTRL1)) &= ~(1 << 17); // REG_SYS_SYSPLL_CTRL1 &= ~BIT_SYS_SYSPLL_DIV5_3
+	HalCpuClkConfig(ChipId < CHIP_ID_8195AM);
+#else // if set CLK CPU
 	if(HalGetCpuClk() != PLATFORM_CLOCK) {
 		//----- CLK CPU
 #if	CPU_CLOCK_SEL_DIV5_3
@@ -198,7 +209,7 @@ extern HAL_GPIO_ADAPTER gBoot_Gpio_Adapter;
 		HalCpuClkConfig(CPU_CLOCK_SEL_VALUE);
 #endif // CPU_CLOCK_SEL_DIV5_3
 	};
-#endif
+#endif // ARDUINO
 	PSHalInitPlatformLogUart(); // HalInitPlatformLogUartV02(); // Show "<RTL8195A>"... :(
 	HalReInitPlatformTimer(); // HalInitPlatformTimerV02(); HalTimerOpInit_Patch((VOID*) (&HalTimerOp));
 	SystemCoreClockUpdate();
@@ -226,7 +237,7 @@ extern HAL_GPIO_ADAPTER gBoot_Gpio_Adapter;
 //	SpicFlashInitRtl8195A(SpicDualBitMode); //	SpicReadIDRtl8195A(); SpicDualBitMode
 #ifdef CONFIG_SDR_EN
 	//---- SDRAM
-	uint8 ChipId = HalGetChipId();
+//	uint8 ChipId = HalGetChipId();
 	if (ChipId >= CHIP_ID_8195AM) {
 		if((HAL_PERI_ON_READ32(REG_SOC_FUNC_EN) & BIT(21)) == 0) { // SDR not init?
  #ifdef FIX_SDR_CALIBRATION // for speed :)

RTL00_SDKV35a/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_peri_on.h

@@ -165,7 +165,7 @@
 //2 REG_RSVD
 
 //2 REG_PESOC_CLK_SEL
-#define BIT_PESOC_SPI1_SCLK_SEL BIT(18)
+#define BIT_PESOC_SPI1_SCLK_SEL BIT(18) // =1 SPI1 Use High speed clock
 
 #define BIT_SHIFT_PESOC_PERI_SCLK_SEL 16
 #define BIT_MASK_PESOC_PERI_SCLK_SEL 0x3 // 0 - CLK, 1 - CLK/2, 2 - CLK/4, 3 - CLK/8 

RTL00_SDKV35a/component/soc/realtek/8195a/fwlib/src/hal_log_uart.c

@@ -32,7 +32,12 @@ HAL_Status HalLogUartRstFIFO(HAL_LOG_UART_ADAPTER *pUartAdapter, u8 RstCtrl);
 VOID HalLogUartEnable(HAL_LOG_UART_ADAPTER *pUartAdapter);
 VOID HalLogUartDisable(HAL_LOG_UART_ADAPTER *pUartAdapter);
  */
-extern VOID UartLogIrqHandleRam(VOID * Data);
+//extern VOID UartLogIrqHandleRam(VOID * Data);
+__attribute__ ((weak)) void UartLogIrqHandleRam(void * data)
+{
+	HAL_UART_READ32(UART_REV_BUF_OFF);
+}
+
 // extern DiagPrintf();
 // extern HalGetCpuClk(void);
 // extern VectorIrqUnRegisterRtl8195A();
@@ -55,8 +60,10 @@ extern VOID UartLogIrqHandleRam(VOID * Data);
  *  (0.005/5)*166666666 = 166666.666
  */
 VOID HalLogUartWaitTxFifoEmpty(VOID) {
-	int x = 16384;
+	if (HAL_PERI_ON_READ32(REG_SOC_FUNC_EN) & BIT_SOC_LOG_UART_EN) {
-	while((!(HAL_READ8(LOG_UART_REG_BASE, 0x14) & BIT6)) && x--);
+			int x = 16384;
+			while ((!(HAL_UART_READ32(UART_LINE_STATUS_REG_OFF) & LSR_TEMT)) && x--);
+	}
 }
 
 //----- HalLogUartIrqRxRdyHandle

RTL00_SDKV35a/component/soc/realtek/8195a/misc/driver/rtl_console_new.c

@@ -93,8 +93,7 @@ void UartLogIrqHandleRam(void * Data) {
 				// prvStrCpy(pUartLogCtl->pTmpLogBuf->UARTLogBuf, pUartLogCtl->pHistoryBuf[pUartLogCtl->SeeIdx]);
 				// pUartLogCtl->pTmpLogBuf->BufCount = prvStrLen(pUartLogCtl->pTmpLogBuf->UARTLogBuf);
 				// if(EchoFlag) pUartLogCtl->pfINPUT(pUartLogCtl->pTmpLogBuf->UARTLogBuf);
-				UartLogHistoryCmd(UartReceiveData, (UART_LOG_CTL *) pUartLogCtl,
+				UartLogHistoryCmd(UartReceiveData, (UART_LOG_CTL *) pUartLogCtl, 1);
-						1);
 			}
 		} else {
 			if (UartLogCmdChk(UartReceiveData, (UART_LOG_CTL *) pUartLogCtl, 1)
@@ -242,11 +241,13 @@ MON_RAM_TEXT_SECTION void RtlConsolTaskRam(void *Data) {
 				}
 				if(flg) DiagPrintf("cmd: %s - nothing!\n", ArgvArray[0]);
 #if defined(configUSE_WAKELOCK_PMU) && (configUSE_WAKELOCK_PMU == 1)
-				release_wakelock(WAKELOCK_LOGUART);
+ 				release_wakelock(WAKELOCK_LOGUART);
+//sdk4.0:		pmu_release_wakelock(PMU_LOGUART_DEVICE);
 #endif
 			}
 #if defined(configUSE_WAKELOCK_PMU) && (configUSE_WAKELOCK_PMU == 1)
 			else acquire_wakelock(WAKELOCK_LOGUART);
+//sdk4.0:	else pmu_acquire_wakelock(PMU_LOGUART_DEVICE);
 #endif
 			p->pTmpLogBuf->BufCount = 0;
 			p->pTmpLogBuf->UARTLogBuf[0] = 0;

RTL00_SDKV35a/flasher.mk

@@ -2,6 +2,7 @@
 # pvvx 21.09.2016
 include userset.mk
 include $(SDK_PATH)paths.mk
+include project.mk
 #---------------------------
 #FLASHER = stlink-v2-1
 #FLASHER = stlink-v2
@@ -36,23 +37,24 @@ endif
 PICK = $(TOOLS_PATH)pick$(EXE)
 PADDING = $(TOOLS_PATH)padding$(EXE)
 CHCKSUM = $(TOOLS_PATH)checksum$(EXE)
+IMAGETOOL = $(TOOLS_PATH)rtlaimage$(EXE)
 
 # openocd tools
-OPENOCD = $(OPENOCD_PATH)openocd
+OPENOCD = $(OPENOCD_PATH)openocd.exe
 
 JLINK_GDB ?= JLinkGDBServer.exe
 JLINK_EXE ?= JLink.exe
 
 ifeq ($(FLASHER), Jlink)
 # Jlink FLASHER_SPEED ..4000 kHz
-FLASHER_SPEED = 3500
+FLASHER_SPEED ?= 3500
 else 
 ifeq ($(FLASHER),stlink-v2)
 # stlink-v2 FLASHER_SPEED ..1800 kHz
-FLASHER_SPEED = 1800
+FLASHER_SPEED ?= 1800
 else
-# over FLASHER_SPEED ..500 kHz ?
+# over FLASHER_SPEED ..1000 kHz ?
-FLASHER_SPEED = 500
+FLASHER_SPEED ?= 1000
 endif
 endif
 
@@ -71,11 +73,9 @@ NMAPFILE = $(OBJ_DIR)/$(TARGET).nmap
 
 RAM1_IMAGE ?= $(BIN_DIR)/ram_1.bin
 RAM1P_IMAGE ?= $(BIN_DIR)/ram_1.p.bin
-RAM1R_IMAGE ?= $(BIN_DIR)/ram_1.r.bin
 
 RAM2_IMAGE = $(BIN_DIR)/ram_2.bin
 RAM2P_IMAGE = $(BIN_DIR)/ram_2.p.bin
-RAM2NS_IMAGE = $(BIN_DIR)/ram_2.ns.bin
 
 RAM3_IMAGE = $(BIN_DIR)/sdram.bin
 RAM3P_IMAGE = $(BIN_DIR)/sdram.p.bin
@@ -88,19 +88,29 @@ OTA_IMAGE = $(BIN_DIR)/ota.bin
 mp: FLASH_IMAGE = $(BIN_DIR)/ram_all_mp.bin
 mp: OTA_IMAGE = $(BIN_DIR)/ota_mp.bin
 
-TST_IMAGE = $(BIN_DIR)/ram_2.bin
 
-.PHONY: genbin1 genbin23 flashburn reset test readfullflash flashwebfs flash_OTA falshboot runsdram
+.PHONY: genbin flashburn reset test readfullflash flashboot flashwebfs flash_OTA runram runsdram
 .NOTPARALLEL: all mp genbin1 genbin23 flashburn reset test readfullflash _endgenbin flashwebfs flash_OTA
 
-all: $(ELFFILE) $(OTA_IMAGE) $(FLASH_IMAGE) _endgenbin
+all: $(ELFFILE) $(FLASH_IMAGE) _endgenbin
-mp: $(ELFFILE) $(OTA_IMAGE) $(FLASH_IMAGE) _endgenbin
+mp: $(ELFFILE) $(FLASH_IMAGE) _endgenbin
 
-genbin1: $(ELFFILE) $(RAM1P_IMAGE) 
+genbin: $(ELFFILE) $(FLASH_IMAGE) _endgenbin
 
-genbin23: $(ELFFILE) $(OTA_IMAGE) $(FLASH_IMAGE) _endgenbin 
+$(ELFFILE):
+	$(error Falsher: file $@ not found)
 
+$(NMAPFILE): $(ELFFILE)
+	@echo "==========================================================="
+	@echo "Build names map file"
+	@echo $@
+	@$(NM) $< | sort > $@
+#	@echo "==========================================================="
 
+$(FLASH_IMAGE):$(ELFFILE)
+	@echo "==========================================================="
+	$(IMAGETOOL) -a -r -o $(BIN_DIR)/ $(ELFFILE) 
+ 
 _endgenbin:
 	@echo "-----------------------------------------------------------"
 	@echo "Image ($(OTA_IMAGE)) size $(shell printf '%d\n' $$(( $$(stat --printf="%s" $(OTA_IMAGE)) )) ) bytes"
@@ -121,6 +131,7 @@ runsdram:
 readfullflash:
 	@$(JLINK_PATH)$(JLINK_EXE) -Device CORTEX-M3 -If SWD -Speed 1000 $(FLASHER_PATH)RTL_FFlash.JLinkScript
 
+
 flashburn:
 	@echo define call1>$(FLASHER_PATH)flash_file.jlink
 	@echo SetFirwareSize build/bin/ram_all.bin>>$(FLASHER_PATH)flash_file.jlink
@@ -135,6 +146,17 @@ flashburn:
 	@$(GDB) -x $(FLASHER_PATH)gdb_wrflash.jlink
 	#@taskkill /F /IM $(JLINK_GDBSRV)
 
+flashboot:
+	@echo define call1>$(FLASHER_PATH)file_info.jlink
+	@echo set '$$'ImageSize = $(shell printf '0x%X\n' $$(stat --printf="%s" $(BIN_DIR)/ram_1.p.bin))>>$(FLASHER_PATH)file_info.jlink
+	@echo set '$$'ImageAddr = 0x000000>>$(FLASHER_PATH)file_info.jlink
+	@echo end>>$(FLASHER_PATH)file_info.jlink
+	@echo define call2>>$(FLASHER_PATH)file_info.jlink
+	@echo FlasherWrite $(BIN_DIR)/ram_1.p.bin '$$'ImageAddr '$$'ImageSize>>$(FLASHER_PATH)file_info.jlink
+	@echo end>>$(FLASHER_PATH)file_info.jlink
+	@cmd /K start $(JLINK_PATH)$(JLINK_GDBSRV) -device Cortex-M3 -if SWD -ir -endian little -speed 1000 
+	@$(GDB) -x $(FLASHER_PATH)gdb_wrfile.jlink
+
 flashwebfs:
 	@echo define call1>$(FLASHER_PATH)file_info.jlink
 	@echo set '$$'ImageSize = $(shell printf '0x%X\n' $$(stat --printf="%s" $(BIN_DIR)/WEBFiles.bin))>>$(FLASHER_PATH)file_info.jlink
@@ -147,18 +169,6 @@ flashwebfs:
 	@$(GDB) -x $(FLASHER_PATH)gdb_wrfile.jlink
 	#@taskkill /F /IM $(JLINK_GDBSRV)
 
-flashboot:
-	@echo define call1>$(FLASHER_PATH)file_info.jlink
-	@echo set '$$'ImageSize = $(shell printf '0x%X\n' $$(stat --printf="%s" $(RAM1P_IMAGE)))>>$(FLASHER_PATH)file_info.jlink
-	@echo set '$$'ImageAddr = 0x00000>>$(FLASHER_PATH)file_info.jlink
-	@echo end>>$(FLASHER_PATH)file_info.jlink
-	@echo define call2>>$(FLASHER_PATH)file_info.jlink
-	@echo FlasherWrite $(RAM1P_IMAGE) '$$'ImageAddr '$$'ImageSize>>$(FLASHER_PATH)file_info.jlink
-	@echo end>>$(FLASHER_PATH)file_info.jlink
-	@cmd /K start $(JLINK_PATH)$(JLINK_GDBSRV) -device Cortex-M3 -if SWD -ir -endian little -speed 1000 
-	@$(GDB) -x $(FLASHER_PATH)gdb_wrfile.jlink
-	
-
 flashespfs:
 	@echo define call1>$(FLASHER_PATH)file_info.jlink
 	@echo set '$$'ImageSize = $(shell printf '0x%X\n' $$(stat --printf="%s" $(BIN_DIR)/webpages.espfs))>>$(FLASHER_PATH)file_info.jlink
@@ -210,6 +220,13 @@ flash_OTA:
 	-c 'rtl8710_flash_write $(RAM2P_IMAGE) 0x80000' \
 	-c 'rtl8710_reboot' -c 'reset run' -c shutdown
 	
+flashwebfs:
+	@$(OPENOCD) -f interface/$(FLASHER).cfg -c 'transport select swd' -c 'adapter_khz 1000' \
+	-f $(FLASHER_PATH)rtl8710.ocd -c 'init' -c 'reset halt' -c 'adapter_khz $(FLASHER_SPEED)' \
+	-c 'rtl8710_flash_auto_erase 1' -c 'rtl8710_flash_auto_verify 1' \
+	-c 'rtl8710_flash_write $(BIN_DIR)/WEBFiles.bin 0xd0000' \
+	-c 'rtl8710_reboot' -c 'reset run' -c shutdown
+
 flashespfs:
 	@$(OPENOCD) -f interface/$(FLASHER).cfg -c 'transport select swd' -c 'adapter_khz 1000' \
 	-f $(FLASHER_PATH)rtl8710.ocd -c 'init' -c 'reset halt' -c 'adapter_khz $(FLASHER_SPEED)' \
@@ -225,14 +242,14 @@ reset:
 runram:
 	@$(OPENOCD) -f interface/$(FLASHER).cfg -c 'transport select swd' -c 'adapter_khz 1000' \
 	-f $(FLASHER_PATH)rtl8710.ocd -c 'init' -c 'reset halt' -c 'adapter_khz $(FLASHER_SPEED)' \
-	-c 'load_image $(RAM1R_IMAGE) 0x10000bc8 bin' \
+	-c 'load_image $(RAM1_IMAGE) 0x10000bc8 bin' \
 	-c 'load_image $(RAM2_IMAGE) 0x10006000 bin' \
 	-c 'mww 0x40000210 0x20111157' -c 'rtl8710_reboot' -c shutdown
 
 runsdram:
 	@$(OPENOCD) -f interface/$(FLASHER).cfg -c 'transport select swd' -c 'adapter_khz 1000' \
 	-f $(FLASHER_PATH)rtl8710.ocd -c 'init' -c 'reset halt' -c 'adapter_khz $(FLASHER_SPEED)' \
-	-c 'load_image $(RAM1R_IMAGE) 0x10000bc8 bin' \
+	-c 'load_image $(RAM1_IMAGE) 0x10000bc8 bin' \
 	-c 'load_image $(RAM2_IMAGE) 0x10006000 bin' \
 	-c 'boot_load_srdam $(RAM3_IMAGE) 0x30000000' \
 	-c shutdown
@@ -240,120 +257,6 @@ runsdram:
 endif
 endif
 
-$(NMAPFILE): $(ELFFILE)
-	@echo "==========================================================="
-	@echo "Build names map file"
-	@echo $@
-	@$(NM) $< | sort > $@
-#	@echo "==========================================================="
-
-$(FLASH_IMAGE): $(RAM1P_IMAGE) $(RAM2P_IMAGE) $(RAM3P_IMAGE)
-	@echo "==========================================================="
-	@echo "Make Flash image ($(FLASH_IMAGE))" 
-#	@echo "==========================================================="
-	@mkdir -p $(BIN_DIR)
-	@rm -f $(FLASH_IMAGE) 
-	@cat $(RAM1P_IMAGE) > $(FLASH_IMAGE)
-#	@chmod 777 $(FLASH_IMAGE)
-ifdef PADDINGSIZE
-	@$(PADDING) $(PADDINGSIZE) 0xFF $(FLASH_IMAGE)
-endif	
-	@cat $(RAM2P_IMAGE) >> $(FLASH_IMAGE)
-	@cat $(RAM3P_IMAGE) >> $(FLASH_IMAGE)
-#	@echo "Image ($(FLASH_IMAGE)) size $(shell printf '%d\n' $$(( $$(stat --printf="%s" $(FLASH_IMAGE)) )) ) bytes"
-#	@echo "==========================================================="
-#	@rm $(BIN_DIR)/ram_*.p.bin  
-	
-$(OTA_IMAGE): $(RAM2NS_IMAGE) $(RAM3_IMAGE) 
-	@echo "==========================================================="
-	@echo "Make OTA image ($(OTA_IMAGE))"
-	@rm -f $(OTA_IMAGE) 
-	@cat $(RAM2NS_IMAGE) > $(OTA_IMAGE)
-	@cat $(RAM3P_IMAGE) >> $(OTA_IMAGE)
-#	@chmod 777 $(OTA_IMAGE)
-	@$(CHCKSUM) $(OTA_IMAGE) || true
-#	@echo "==========================================================="
-
-$(RAM1P_IMAGE): $(ELFFILE) $(NMAPFILE) 
-	@echo "==========================================================="
-	@echo "Create image1r ($(RAM1R_IMAGE))"
-#	@echo "===========================================================" .bootloader
-ifdef COMPILED_BOOT
-	@mkdir -p $(BIN_DIR)
-	@rm -f $(RAM1_IMAGE) $(RAM1R_IMAGE)
-ifdef COMPILED_BOOT_BIN
-	@$(eval RAM1_START_ADDR := $(shell grep _binary_build_bin_ram_1_r_bin_start $(NMAPFILE) | awk '{print $$1}'))
-	@$(eval RAM1_END_ADDR := $(shell grep _binary_build_bin_ram_1_r_bin_end $(NMAPFILE) | awk '{print $$1}'))
-else
-	@$(eval RAM1_START_ADDR := $(shell grep __ram_image1_text_start__ $(NMAPFILE) | awk '{print $$1}'))
-	@$(eval RAM1_END_ADDR := $(shell grep __ram_image1_text_end__ $(NMAPFILE) | awk '{print $$1}'))
-endif
-	$(if $(RAM1_START_ADDR),,$(error "Not found __ram_image1_text_start__!"))
-	$(if $(RAM1_END_ADDR),,$(error "Not found __ram_image1_text_end__!"))
-ifeq ($(RAM1_START_ADDR),$(RAM1_END_ADDR))
-ifdef COMPILED_BOOT_BIN
-	$(OBJCOPY) --change-section-address .boot.head=0x10000ba8 -j .boot.head -j .bootloader -Obinary $(ELFFILE) $(RAM1P_IMAGE)
-else
-#	$(OBJCOPY) -j .rom_ram -Obinary $(ELFFILE) $(RAM_IMAGE)
-	$(OBJCOPY) -j .ram.start.table -j .ram_image1.text -Obinary $(ELFFILE) $(RAM1R_IMAGE)
-	$(PICK) 0x$(RAM1_START_ADDR) 0x$(RAM1_END_ADDR) $(RAM1R_IMAGE) $(RAM1P_IMAGE) head+reset_offset 0x0B000
-endif
-else 
-	$(error "BOOT-image size = 0")
-#	$(error Flasher: COMPILE_BOOT = No)
-endif	
-else
-	@if [ -s $(RAM1R_IMAGE) ]; then echo "Use external $(RAM1R_IMAGE)!"; fi 
-endif
-
-$(RAM2P_IMAGE): $(ELFFILE) $(NMAPFILE) 
-	@echo "==========================================================="
-	@echo "Create image2p ($(RAM2P_IMAGE))"
-#	@echo "==========================================================="
-	@mkdir -p $(BIN_DIR)
-	@rm -f $(RAM2_IMAGE) $(RAM2P_IMAGE)
-	@$(eval RAM2_START_ADDR = $(shell grep __ram_image2_text $(NMAPFILE) | grep _start__ | awk '{print $$1}'))
-	@$(eval RAM2_END_ADDR = $(shell grep __ram_image2_text $(NMAPFILE) | grep _end__ | awk '{print $$1}'))
-	$(if $(RAM2_START_ADDR),,$(error "Not found __ram_image2_text_start__!"))
-	$(if $(RAM2_END_ADDR),,$(error "Not found __ram_image2_text_end__!"))
-	@$(OBJCOPY) -j .image2.start.table -j .ram_image2.text -j .ram_image2.rodata -j .ram.data -Obinary $(ELFFILE) $(RAM2_IMAGE)
-	@$(PICK) 0x$(RAM2_START_ADDR) 0x$(RAM2_END_ADDR) $(RAM2_IMAGE) $(RAM2P_IMAGE) body+reset_offset+sig
-
-$(RAM2NS_IMAGE):$(ELFFILE) $(NMAPFILE) 
-	@echo "==========================================================="
-	@echo "Create image2ns ($(RAM2NS_IMAGE))"
-#	@echo "==========================================================="
-	mkdir -p $(BIN_DIR)
-	rm -f $(RAM2_IMAGE) $(RAM2NS_IMAGE)
-	$(eval RAM2_START_ADDR = $(shell grep __ram_image2_text $(NMAPFILE) | grep _start__ | awk '{print $$1}'))
-	$(eval RAM2_END_ADDR = $(shell grep __ram_image2_text $(NMAPFILE) | grep _end__ | awk '{print $$1}'))
-	$(if $(RAM2_START_ADDR),,$(error "Not found __ram_image2_text_start__!"))
-	$(if $(RAM2_END_ADDR),,$(error "Not found __ram_image2_text_end__!"))
-	$(OBJCOPY) -j .image2.start.table -j .ram_image2.text -j .ram_image2.rodata -j .ram.data -Obinary $(ELFFILE) $(RAM2_IMAGE)
-	$(PICK) 0x$(RAM2_START_ADDR) 0x$(RAM2_END_ADDR) $(RAM2_IMAGE) $(RAM2NS_IMAGE) body+reset_offset
-
-$(RAM3_IMAGE): $(ELFFILE) $(NMAPFILE) 
-	@echo "==========================================================="
-	@echo "Create image3 (SDRAM, $(RAM3P_IMAGE))"
-#	@echo "==========================================================="
-	@mkdir -p $(BIN_DIR)
-	@rm -f $(RAM3_IMAGE) $(RAM3P_IMAGE)
-	@$(eval RAM3_START_ADDR = $(shell grep __sdram_data_ $(NMAPFILE) | grep _start__ | awk '{print $$1}'))
-	@$(eval RAM3_END_ADDR = $(shell grep __sdram_data_ $(NMAPFILE) | grep _end__ | awk '{print $$1}'))
-	$(if $(RAM3_START_ADDR),,$(error "Not found __sdram_data_start__!"))
-	$(if $(RAM3_END_ADDR),,$(error "Not found __sdram_data_end__!"))
-#ifneq ($(RAM3_START_ADDR),$(RAM3_END_ADDR))
-	@echo	$(RAM3_START_ADDR) $(RAM3_END_ADDR)
-	@$(OBJCOPY) -j .image3 -j .sdr_text -j .sdr_rodata -j .sdr_data -Obinary $(ELFFILE) $(RAM3_IMAGE)
-	$(PICK) 0x$(RAM3_START_ADDR) 0x$(RAM3_END_ADDR) $(RAM3_IMAGE) $(RAM3P_IMAGE) body+reset_offset
-#else
-#	@rm -f $(RAM3_IMAGE) $(RAM3P_IMAGE)
-#	@echo "SDRAM not used (size = 0)"
-#endif
-	
-$(ELFFILE):
-	$(error Falsher: file $@ not found)
-
 clean:
 	@rm -f $(BIN_DIR)/*.bin
 	

RTL00_SDKV35a/flasher/RTL_RunRAM.JLinkScript

@@ -4,7 +4,7 @@ r1
 trst1
 h
 r
-loadbin build/bin/ram_1.r.bin 0x10000bc8
+loadbin build/bin/ram_1.bin 0x10000bc8
 loadbin build/bin/ram_2.bin 0x10006000
 r
 w4 0x40000210,0x20011113

flasher/RTL_RunRAM.JLinkScript

@@ -4,7 +4,7 @@ r1
 trst1
 h
 r
-loadbin build/bin/ram_1.r.bin 0x10000bc8
+loadbin build/bin/ram_1.bin 0x10000bc8
 loadbin build/bin/ram_2.bin 0x10006000
 r
 w4 0x40000210,0x20011113

project/inc/platform_autoconf.h

@@ -4,7 +4,7 @@
 #define AUTOCONF_INCLUDED
 
 #define RTL8710AF
-//#define RTL8711AM
+#define RTL8711AM
 /* Image1 on project */
 #define PRESENT_IMAGE1
 /* Image2 on project */

userset.mk

@@ -6,8 +6,8 @@ SDK_PATH = RTL00_SDKV35a/
 #GCC_PATH = d:/MCU/GNU_Tools_ARM_Embedded/6.2017-q1-update/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 = Jlink
-FLASHER_TYPE = cmsis-dap
+#FLASHER_TYPE = cmsis-dap
 FLASHER_SPEED = 3500
 FLASHER_PATH = flasher/
 JLINK_PATH ?= D:/MCU/SEGGER/JLink_V612i/