j3d1/RTL00_WEB
1
0
Fork 0
mirror of https://github.com/pvvx/RTL00_WEB.git synced 2024-11-22 05:54:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

update

Browse source
This commit is contained in:
pvvx 2018-01-22 08:47:23 +03:00
parent daddfa6789
commit 1c773d745a
5 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
USDK/component/soc/realtek/8195a/fwlib/ram_lib/rtl_boot.c
View file

@ -559,14 +559,14 @@ LOCAL uint32 BOOT_RAM_TEXT_SECTION load_segs(uint32 faddr, PIMG2HEAD hdr, uint8
|| seg_id == SEG_ID_SDRAM)) { || seg_id == SEG_ID_SDRAM)) {
#if CONFIG_DEBUG_LOG > 1 #if CONFIG_DEBUG_LOG > 1
DBG_8195A("Load Flash seg%d: 0x%08x -> %s: 0x%08x, size: %d\n", DBG_8195A("Load Flash seg%d: 0x%08x -> %s: 0x%08x, size: %d\n",
segnum, faddr, txt_tab_seg[seg_id], hdr->seg.ldaddr, segnum, fnextaddr, txt_tab_seg[seg_id], hdr->seg.ldaddr,
hdr->seg.size); hdr->seg.size);
#endif #endif
fnextaddr += flashcpy(fnextaddr, (void *)hdr->seg.ldaddr, hdr->seg.size); fnextaddr += flashcpy(fnextaddr, (void *)hdr->seg.ldaddr, hdr->seg.size);
} else if (seg_id) { } else if (seg_id) {
#if CONFIG_DEBUG_LOG > 2 #if CONFIG_DEBUG_LOG > 2
DBG_8195A("Skip Flash seg%d: 0x%08x -> %s: 0x%08x, size: %d\n", segnum, DBG_8195A("Skip Flash seg%d: 0x%08x -> %s: 0x%08x, size: %d\n", segnum,
faddr, txt_tab_seg[seg_id], hdr->seg.ldaddr, hdr->seg.size); fnextaddr, txt_tab_seg[seg_id], hdr->seg.ldaddr, hdr->seg.size);
#endif #endif
fnextaddr += hdr->seg.size; fnextaddr += hdr->seg.size;
} else { } else {
@ -574,7 +574,7 @@ LOCAL uint32 BOOT_RAM_TEXT_SECTION load_segs(uint32 faddr, PIMG2HEAD hdr, uint8
fnextaddr -= 8; fnextaddr -= 8;
break; break;
} }
fnextaddr += flashcpy(fnextaddr, hdr, sizeof(IMGSEGHEAD)) + 8; fnextaddr += flashcpy(fnextaddr, hdr, sizeof(IMGSEGHEAD));
segnum++; segnum++;
} }
return fnextaddr; return fnextaddr;
@ -590,6 +590,7 @@ LOCAL int BOOT_RAM_TEXT_SECTION loadUserImges(int imgnum) {
DBG_8195A("Selected Image %d.\n", imgnum); DBG_8195A("Selected Image %d.\n", imgnum);
while (1) { while (1) {
// новая image только с нового сектора flash
faddr = (faddr + FLASH_SECTOR_SIZE - 1) & (~(FLASH_SECTOR_SIZE - 1)); faddr = (faddr + FLASH_SECTOR_SIZE - 1) & (~(FLASH_SECTOR_SIZE - 1));
uint32 img_id = load_img2_head(faddr, &hdr); uint32 img_id = load_img2_head(faddr, &hdr);
if ((img_id >> 8) > 4 && (uint8) img_id != 0) { // есть подпись "RTKW" + RUN или SWP, сегмент != unknown if ((img_id >> 8) > 4 && (uint8) img_id != 0) { // есть подпись "RTKW" + RUN или SWP, сегмент != unknown
@ -603,7 +604,7 @@ LOCAL int BOOT_RAM_TEXT_SECTION loadUserImges(int imgnum) {
DBG_8195A("No Image%d! Trying Image0...\n", imgnum); DBG_8195A("No Image%d! Trying Image0...\n", imgnum);
// пробуем загрузить image по умолчанию, по записи в секторе установок // пробуем загрузить image по умолчанию, по записи в секторе установок
flashcpy(FLASH_SYSTEM_DATA_ADDR, &faddr, sizeof(faddr)); flashcpy(FLASH_SYSTEM_DATA_ADDR, &faddr, sizeof(faddr));
if (faddr < 0x8000000) if (faddr < 0x08000000)
faddr += SPI_FLASH_BASE; faddr += SPI_FLASH_BASE;
if (get_seg_id(faddr, 0x100) == SEG_ID_FLASH) { if (get_seg_id(faddr, 0x100) == SEG_ID_FLASH) {
// если указывает в область flash // если указывает в область flash

BIN
USDK/component/soc/realtek/8195a/misc/iar_utility/common/tools/rtlaimage.exe
View file

Binary file not shown.

4
USDK/component/soc/realtek/8195a/misc/rtl_std_lib/lib_rtlstd/ram_libgloss_retarget.c
View file

@ -97,9 +97,9 @@ int ram_libgloss_write(int file, const char *ptr, int len) {
//----- ram_libgloss_open() //----- ram_libgloss_open()
int ram_libgloss_open(char *file, int flags, int mode) { int ram_libgloss_open(char *file, int flags, int mode) {
// file->_p // file->_p
int result = rtl_strcmp(file, "/stdin"); int result;
if (result) { if (rtl_strcmp(file, "/stdin")) {
if (rtl_strcmp(file, "/stdout")) { if (rtl_strcmp(file, "/stdout")) {
if (rtl_strcmp(file, "/stderr")) if (rtl_strcmp(file, "/stderr"))
result = -1; result = -1;

1
project/src/console/wifi_console.c
View file

@ -350,4 +350,3 @@ MON_RAM_TAB_SECTION COMMAND_TABLE console_cmd_wifi_api[] = {
{"ATSN", 0, fATSN, ": Scan networks"} {"ATSN", 0, fATSN, ": Scan networks"}
}; };

5
tools/rtlaimage/rtlaimage.py
View file

@ -10,7 +10,7 @@ import os
import struct import struct
import sys import sys
__version__ = "20.01.18" __version__ = "22.01.18"
PYTHON2 = sys.version_info[0] < 3 # True if on pre-Python 3 PYTHON2 = sys.version_info[0] < 3 # True if on pre-Python 3
@ -295,7 +295,7 @@ def elf2image(args):
for s in image: for s in image:
if s.hm & HM_IS_OTA: if s.hm & HM_IS_OTA:
chks = s.save_ota(f, fn, chks) chks = s.save_ota(f, fn, chks)
f.write(struct.pack('<L', chks)) f.write(struct.pack(b'<LLL', 0, 0, chks))
f.close() f.close()
except: except:
@ -311,6 +311,7 @@ def elf2image(args):
with open(fn, "wb") as f: with open(fn, "wb") as f:
for s in image: for s in image:
s.save_sram(f, fn) s.save_sram(f, fn)
f.write(struct.pack(b'<LL', 0, 0))
f.close() f.close()
except: except: