diff --git a/RTL00_SDKV35a/component/common/api/wifi_api.c b/RTL00_SDKV35a/component/common/api/wifi_api.c index 64a8103..4b6777f 100644 --- a/RTL00_SDKV35a/component/common/api/wifi_api.c +++ b/RTL00_SDKV35a/component/common/api/wifi_api.c @@ -374,7 +374,7 @@ void _LwIP_Init(void) tcpip_init( NULL, NULL ); chk_ap_netif_num(); // Исполняется после _wifi_on() - for(int idx = 0; idx < NET_IF_NUM; idx++) { + for(idx = 0; idx < NET_IF_NUM; idx++) { xnetif[idx].name[0] = 'r'; xnetif[idx].name[1] = '0' + idx; } @@ -728,7 +728,7 @@ void fATWT(int argc, char *argv[]) { #define ReadTSF_Lo32() (*((volatile unsigned int *)(WIFI_REG_BASE + REG_TSFTR))) #define ReadTSF_Hi32() (*((volatile unsigned int *)(WIFI_REG_BASE + REG_TSFTR1))) -uint64_t get_tsf(void) +LOCAL uint64_t get_tsf(void) { return *((uint64_t *)(WIFI_REG_BASE + REG_TSFTR)); } diff --git a/RTL00_SDKV35a/component/soc/realtek/8195a/fwlib/ram_lib/rtl_boot.c b/RTL00_SDKV35a/component/soc/realtek/8195a/fwlib/ram_lib/rtl_boot.c index 98a84ed..99582c8 100644 --- a/RTL00_SDKV35a/component/soc/realtek/8195a/fwlib/ram_lib/rtl_boot.c +++ b/RTL00_SDKV35a/component/soc/realtek/8195a/fwlib/ram_lib/rtl_boot.c @@ -207,9 +207,10 @@ struct spic_table_flash_type spic_table_flash = { BIT_FLASE_SIZE(0x0F), // REG_SPIC_FLASE_SIZE 0x40006124 0x0E ? BIT_CS_H_WR_DUM_LEN(2)| BIT_AUTO_ADDR__LENGTH(3) | BIT_RD_DUMMY_LENGTH(0x0), // REG_SPIC_AUTO_LENGTH 0x4000611C 0x20030001 ? { - BIT_WR_BLOCKING, // REG_SPIC_VALID_CMD 0x40006120 0x200 SpicOneBitMode - BIT_WR_BLOCKING | BIT_RD_DUAL_I, // REG_SPIC_VALID_CMD 0x40006120 0x200 SpicOneBitMode - BIT_WR_BLOCKING | BIT_RD_QUAD_O, // REG_SPIC_VALID_CMD 0x40006120 0x200 SpicOneBitMode + BIT_WR_BLOCKING, // REG_SPIC_VALID_CMD 0x40006120 0x200 SpicOneBitMode + BIT_WR_BLOCKING | BIT_RD_DUAL_I, // REG_SPIC_VALID_CMD 0x40006120 0x202 SpicDualBitMode + BIT_WR_BLOCKING | BIT_RD_DUAL_I, // REG_SPIC_VALID_CMD 0x40006120 0x202 SpicDualBitMode +// BIT_WR_BLOCKING | BIT_RD_QUAD_O, // REG_SPIC_VALID_CMD 0x40006120 0x208 SpicQuadBitMode MXIC not QIO }, 0xC2, 0x20 // MX25L8006/MX25L1606 }; @@ -274,7 +275,7 @@ LOCAL int BOOT_RAM_TEXT_SECTION InitSpic(uint8 SpicBitMode) { for(x = 0; x < SpicMaxMode; x++) { *(uint32 *)&SpicInitParaAllClk[SpicOneBitMode][x].BaudRate = ptr[0]; *(uint32 *)&SpicInitParaAllClk[SpicDualBitMode][x].BaudRate = ptr[CPU_CLK_TYPE_NO]; - *(uint32 *)&SpicInitParaAllClk[SpicQuadBitMode][x].BaudRate = ptr[CPU_CLK_TYPE_NO]; + *(uint32 *)&SpicInitParaAllClk[SpicQuadBitMode][x].BaudRate = ptr[CPU_CLK_TYPE_NO]; // MXIC not QIO ptr++; } ACTCK_FLASH_CCTRL(1); diff --git a/build/bin/ota.bin b/build/bin/ota.bin index c9ac5d9..a61ba09 100644 Binary files a/build/bin/ota.bin and b/build/bin/ota.bin differ diff --git a/build/bin/ram_1.p.bin b/build/bin/ram_1.p.bin index 99c6d43..3148f0c 100644 Binary files a/build/bin/ram_1.p.bin and b/build/bin/ram_1.p.bin differ diff --git a/build/bin/ram_2.bin b/build/bin/ram_2.bin index f34fcf4..642e5d6 100644 Binary files a/build/bin/ram_2.bin and b/build/bin/ram_2.bin differ diff --git a/build/bin/ram_2.ns.bin b/build/bin/ram_2.ns.bin index d966dfd..b7cc153 100644 Binary files a/build/bin/ram_2.ns.bin and b/build/bin/ram_2.ns.bin differ diff --git a/build/bin/ram_2.p.bin b/build/bin/ram_2.p.bin index 1522887..04149a7 100644 Binary files a/build/bin/ram_2.p.bin and b/build/bin/ram_2.p.bin differ diff --git a/build/bin/ram_all.bin b/build/bin/ram_all.bin index e1b0a12..f84f9f9 100644 Binary files a/build/bin/ram_all.bin and b/build/bin/ram_all.bin differ diff --git a/build/obj/build.nmap b/build/obj/build.nmap index 5e3caa5..90e3978 100644 --- a/build/obj/build.nmap +++ b/build/obj/build.nmap @@ -2655,65 +2655,65 @@ 1003bcc4 T ODM_TXPowerTrackingCallback_ThermalMeter 1003c0d0 T ODM_ResetIQKResult 1003c118 T ODM_GetRightChnlPlaceforIQK -1003c170 t __CmdDumpWord_veneer -1003c180 t __rtw_get_sec_ie_veneer -1003c190 t __rtw_set_fixed_ie_veneer -1003c1a0 t __Strtoul_veneer -1003c1b0 t __rtw_set_supported_rate_veneer -1003c1c0 t __rtw_set_ie_veneer -1003c1d0 t __AES_UnWRAP_veneer -1003c1e0 t __rtw_get_wps_attr_content_veneer -1003c1f0 t __AES_WRAP_veneer -1003c200 t __rt_arc4_init_veneer -1003c210 t __phy_CalculateBitShift_veneer -1003c220 t __aes_80211_decrypt_veneer -1003c230 t ___vsscanf_veneer -1003c240 t __rtw_get_rateset_len_veneer -1003c250 t __prvStrCmp_veneer -1003c260 t __HalI2SClrAllIntrRtl8195a_veneer -1003c270 t __rtw_get_wps_ie_veneer -1003c280 t __rtw_get_wpa2_ie_veneer -1003c290 t __wep_80211_decrypt_veneer -1003c2a0 t __PHY_SetBBReg_8195A_veneer -1003c2b0 t __ROM_odm_QueryRxPwrPercentage_veneer -1003c2c0 t __HalI2SRead32_veneer -1003c2d0 t __wep_80211_encrypt_veneer -1003c2e0 t __rtw_get_bit_value_from_ieee_value_veneer -1003c2f0 t __rtw_check_network_type_veneer -1003c300 t __ROM_odm_FalseAlarmCounterStatistics_veneer -1003c310 t __rt_arc4_crypt_veneer -1003c320 t __CmdWriteWord_veneer -1003c330 t __rt_md5_hmac_veneer -1003c340 t __PHY_QueryBBReg_8195A_veneer -1003c350 t __rom_psk_CalcGTK_veneer -1003c360 t __tkip_80211_encrypt_veneer -1003c370 t __rom_psk_CalcPTK_veneer -1003c380 t __rtw_secgetmic_veneer -1003c390 t __rtw_parse_wpa_ie_veneer -1003c3a0 t __rtw_seccalctkipmic_veneer -1003c3b0 t __rtw_secmicsetkey_veneer -1003c3c0 t __tkip_80211_decrypt_veneer -1003c3d0 t __StrUpr_veneer -1003c3e0 t __ROM_odm_CfoTrackingFlow_veneer -1003c3f0 t __aes_80211_encrypt_veneer -1003c400 t __rt_hmac_sha1_veneer -1003c410 t __ROM_odm_SetCrystalCap_veneer -1003c420 t __HalDelayUs_veneer -1003c430 t __rtw_get_ie_veneer -1003c440 t __HalI2SIntrCtrlRtl8195a_veneer -1003c450 t __SpicWaitBusyDoneRtl8195A_veneer -1003c460 t __HalI2SWrite32_veneer -1003c470 t __ROM_odm_EVMdbToPercentage_veneer -1003c480 t __HalCpuClkConfig_veneer -1003c490 t __rtw_secmicappend_veneer -1003c4a0 t __rtw_parse_wpa2_ie_veneer -1003c4b0 t __ROM_ODM_CfoTrackingReset_veneer -1003c4c0 t __ROM_odm_GetDefaultCrytaltalCap_veneer -1003c4d0 t __rtw_get_wpa_ie_veneer -1003c4e0 t __rom_psk_PasswordHash_veneer -1003c4f0 t __rtw_ieee802_11_parse_elems_veneer -1003c500 t __key_2char2num_veneer -1003c510 t __Rand_veneer +1003c170 t __rtw_get_ie_veneer +1003c180 t __rtw_get_wpa_ie_veneer +1003c190 t __HalI2SRead32_veneer +1003c1a0 t __aes_80211_decrypt_veneer +1003c1b0 t __rom_psk_PasswordHash_veneer +1003c1c0 t __ROM_odm_SetCrystalCap_veneer +1003c1d0 t __rtw_set_supported_rate_veneer +1003c1e0 t __rtw_ieee802_11_parse_elems_veneer +1003c1f0 t __SpicWaitBusyDoneRtl8195A_veneer +1003c200 t __ROM_ODM_CfoTrackingReset_veneer +1003c210 t ___vsscanf_veneer +1003c220 t __rtw_parse_wpa_ie_veneer +1003c230 t __AES_WRAP_veneer +1003c240 t __rtw_get_wpa2_ie_veneer +1003c250 t __rtw_secmicappend_veneer +1003c260 t __rtw_check_network_type_veneer +1003c270 t __wep_80211_decrypt_veneer +1003c280 t __rom_psk_CalcGTK_veneer +1003c290 t __rtw_set_ie_veneer +1003c2a0 t __CmdWriteWord_veneer +1003c2b0 t __ROM_odm_CfoTrackingFlow_veneer +1003c2c0 t __ROM_odm_EVMdbToPercentage_veneer +1003c2d0 t __phy_CalculateBitShift_veneer +1003c2e0 t __rtw_get_wps_attr_content_veneer +1003c2f0 t __rtw_seccalctkipmic_veneer +1003c300 t __rt_arc4_init_veneer +1003c310 t __rtw_get_bit_value_from_ieee_value_veneer +1003c320 t __tkip_80211_decrypt_veneer +1003c330 t __ROM_odm_FalseAlarmCounterStatistics_veneer +1003c340 t __HalCpuClkConfig_veneer +1003c350 t __rt_md5_hmac_veneer +1003c360 t __rtw_secgetmic_veneer +1003c370 t __StrUpr_veneer +1003c380 t __ROM_odm_QueryRxPwrPercentage_veneer +1003c390 t __HalDelayUs_veneer +1003c3a0 t __wep_80211_encrypt_veneer +1003c3b0 t __tkip_80211_encrypt_veneer +1003c3c0 t __rtw_get_sec_ie_veneer +1003c3d0 t __ROM_odm_GetDefaultCrytaltalCap_veneer +1003c3e0 t __rom_psk_CalcPTK_veneer +1003c3f0 t __rtw_get_rateset_len_veneer +1003c400 t __PHY_SetBBReg_8195A_veneer +1003c410 t __HalI2SClrAllIntrRtl8195a_veneer +1003c420 t __rtw_get_wps_ie_veneer +1003c430 t __rt_hmac_sha1_veneer +1003c440 t __CmdDumpWord_veneer +1003c450 t __rtw_secmicsetkey_veneer +1003c460 t __rt_arc4_crypt_veneer +1003c470 t __HalI2SWrite32_veneer +1003c480 t __AES_UnWRAP_veneer +1003c490 t __rtw_parse_wpa2_ie_veneer +1003c4a0 t __aes_80211_encrypt_veneer +1003c4b0 t __key_2char2num_veneer +1003c4c0 t __Strtoul_veneer +1003c4d0 t __prvStrCmp_veneer +1003c4e0 t __Rand_veneer +1003c4f0 t __PHY_QueryBBReg_8195A_veneer +1003c500 t __HalI2SIntrCtrlRtl8195a_veneer +1003c510 t __rtw_set_fixed_ie_veneer 1003c9f5 d __func__.21276 1003ca01 d __FUNCTION__.14658 1003cf5c d bitrate_table diff --git a/flasher.mk b/flasher.mk index 09ee653..31daea2 100644 --- a/flasher.mk +++ b/flasher.mk @@ -66,7 +66,7 @@ NMAPFILE = $(OBJ_DIR)/$(TARGET).nmap #FLASHER_PATH ?= flasher/ -RAM_IMAGE?= $(BIN_DIR)/ram.bin +#RAM_IMAGE?= $(BIN_DIR)/ram.bin RAM1_IMAGE ?= $(BIN_DIR)/ram_1.bin RAM1P_IMAGE ?= $(BIN_DIR)/ram_1.p.bin @@ -91,18 +91,12 @@ TST_IMAGE = $(BIN_DIR)/ram_2.bin LD_ADDRESS = 0x1000B000 ST_ADDRESS = 0x10006068 -.PHONY: copybin1 genbin1 genbin23 flashburn reset test readfullflash -.NOTPARALLEL: all mp copybin1 genbin1 genbin23 flashburn reset test readfullflash _endgenbin +.PHONY: genbin1 genbin23 flashburn reset test readfullflash +.NOTPARALLEL: all mp genbin1 genbin23 flashburn reset test readfullflash _endgenbin all: $(ELFFILE) $(OTA_IMAGE) $(FLASH_IMAGE) _endgenbin mp: $(ELFFILE) $(OTA_IMAGE) $(FLASH_IMAGE) _endgenbin -copybin1: -# cp $(patsubst sdk/%,$(SDK_PATH)%,$(BOOTS))/ram_1.r.bin $(BIN_DIR)/ram_1.r.bin - cp $(patsubst sdk/%,$(SDK_PATH)%,$(BOOTS))/ram_1.p.bin $(BIN_DIR)/ram_1.p.bin -# @chmod 777 $(OBJ_DIR)/ram_1.r.bin -# @$(OBJCOPY) --rename-section .data=.loader.data,contents,alloc,load,readonly,data -I binary -O elf32-littlearm -B arm $(BIN_DIR)/ram_1.r.bin $(OBJ_DIR)/ram_1.r.o - genbin1: $(ELFFILE) $(RAM1P_IMAGE) genbin23: $(ELFFILE) $(OTA_IMAGE) $(FLASH_IMAGE) _endgenbin @@ -191,7 +185,7 @@ 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 .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 diff --git a/flasher/gdb_wrflash.jlink b/flasher/gdb_wrflash.jlink index 4c740fd..c07f501 100644 --- a/flasher/gdb_wrflash.jlink +++ b/flasher/gdb_wrflash.jlink @@ -7,7 +7,6 @@ set $rtl8710_flasher_auto_erase = 1 set $rtl8710_flasher_auto_verify = 1 set $rtl8710_flasher_firmware_ptr = 0x10001000 set $rtl8710_flasher_buffer = 0x10008000 -#262144 set $rtl8710_flasher_buffer_size = 421888 set $rtl8710_flasher_sector_size = 4096 set $rtl8710_flasher_auto_erase_sector = 0xFFFFFFFF diff --git a/sdkbuild.mk b/sdkbuild.mk index 3bb1cfa..dafc499 100644 --- a/sdkbuild.mk +++ b/sdkbuild.mk @@ -45,18 +45,10 @@ build_info: .PHONY: application application: build_info $(SRC_O) $(DRAM_O) $(BOOT_O) - @echo "===========================================================" - @echo "Make BootLoader (ram_1.p.bin, ram_1.r.bin)" -# @echo "===========================================================" - @mkdir -p $(BIN_DIR) $(OBJ_DIR) -## @cp $(patsubst sdk/%,$(SDK_PATH)%,$(BOOTS))/ram_1.r.bin $(BIN_DIR)/ram_1.r.bin -## @cp $(patsubst sdk/%,$(SDK_PATH)%,$(BOOTS))/ram_1.p.bin $(BIN_DIR)/ram_1.p.bin -# @chmod 777 $(OBJ_DIR)/ram_1.r.bin -## $(OBJCOPY) --rename-section .data=.loader.data,contents,alloc,load,readonly,data -I binary -O elf32-littlearm -B arm $(BIN_DIR)/ram_1.r.bin $(OBJ_DIR)/ram_1.r.o @echo "===========================================================" @echo "Link ($(TARGET))" # @echo "===========================================================" -## @$(LD) $(LFLAGS) -o $(ELFFILE) $(OBJ_LIST) $(OBJ_DIR)/ram_1.r.o $(LIBFLAGS) -T$(LDFILE) + @mkdir -p $(BIN_DIR) $(OBJ_DIR) @$(LD) $(LFLAGS) -o $(ELFFILE) $(OBJ_LIST) $(LIBFLAGS) -T$(LDFILE) @$(OBJDUMP) -d $(ELFFILE) > $(OBJ_DIR)/$(TARGET).asm @@ -96,7 +88,5 @@ VPATH:=$(OBJ_DIR) $(SDK_PATH) #.PHONY: clean clean: rm -rf $(OBJ_DIR) $(BIN_DIR) $(OBJ_DIR)/$(SDK_PATH) -# @rm -f $(patsubst %.c,%.d,$(SRC_C_LIST)) -# @rm -f $(patsubst %.c,%.o,$(SRC_C_LIST)) \ No newline at end of file