From 1c773d745a3d267b0f2e895e273213712777e514 Mon Sep 17 00:00:00 2001 From: pvvx Date: Mon, 22 Jan 2018 08:47:23 +0300 Subject: [PATCH] update --- .../realtek/8195a/fwlib/ram_lib/rtl_boot.c | 9 +++++---- .../iar_utility/common/tools/rtlaimage.exe | Bin 3348150 -> 3348162 bytes .../lib_rtlstd/ram_libgloss_retarget.c | 4 ++-- project/src/console/wifi_console.c | 1 - tools/rtlaimage/rtlaimage.py | 5 +++-- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/USDK/component/soc/realtek/8195a/fwlib/ram_lib/rtl_boot.c b/USDK/component/soc/realtek/8195a/fwlib/ram_lib/rtl_boot.c index 76f5fb8..0f6dc56 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/ram_lib/rtl_boot.c +++ b/USDK/component/soc/realtek/8195a/fwlib/ram_lib/rtl_boot.c @@ -559,14 +559,14 @@ LOCAL uint32 BOOT_RAM_TEXT_SECTION load_segs(uint32 faddr, PIMG2HEAD hdr, uint8 || seg_id == SEG_ID_SDRAM)) { #if CONFIG_DEBUG_LOG > 1 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); #endif fnextaddr += flashcpy(fnextaddr, (void *)hdr->seg.ldaddr, hdr->seg.size); } else if (seg_id) { #if CONFIG_DEBUG_LOG > 2 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 fnextaddr += hdr->seg.size; } else { @@ -574,7 +574,7 @@ LOCAL uint32 BOOT_RAM_TEXT_SECTION load_segs(uint32 faddr, PIMG2HEAD hdr, uint8 fnextaddr -= 8; break; } - fnextaddr += flashcpy(fnextaddr, hdr, sizeof(IMGSEGHEAD)) + 8; + fnextaddr += flashcpy(fnextaddr, hdr, sizeof(IMGSEGHEAD)); segnum++; } return fnextaddr; @@ -590,6 +590,7 @@ LOCAL int BOOT_RAM_TEXT_SECTION loadUserImges(int imgnum) { DBG_8195A("Selected Image %d.\n", imgnum); while (1) { + // новая image только с нового сектора flash faddr = (faddr + FLASH_SECTOR_SIZE - 1) & (~(FLASH_SECTOR_SIZE - 1)); uint32 img_id = load_img2_head(faddr, &hdr); 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); // пробуем загрузить image по умолчанию, по записи в секторе установок flashcpy(FLASH_SYSTEM_DATA_ADDR, &faddr, sizeof(faddr)); - if (faddr < 0x8000000) + if (faddr < 0x08000000) faddr += SPI_FLASH_BASE; if (get_seg_id(faddr, 0x100) == SEG_ID_FLASH) { // если указывает в область flash diff --git a/USDK/component/soc/realtek/8195a/misc/iar_utility/common/tools/rtlaimage.exe b/USDK/component/soc/realtek/8195a/misc/iar_utility/common/tools/rtlaimage.exe index 8136730f7a79429e54bba2d61743709c6a3e9c91..686ba4760f97088061efa8239b11b3764df9c1d4 100644 GIT binary patch delta 5950 zcmWmDWmFSv6u@!1n=u-uz~~&^4Fd#83F($@qz0p5bR*Iw-5@C=q(dpCL22m}#dq(A z-}#^Co^!w4bDoa+DRd-CcocdRMjPhQ1x!-Yl|jwlP)6?dT#PkV=}Y!-_EMXwDD-$g z%V_?4y4FOxlD@aTkp1ZQjXmGlrt!Q&>wpyD-JhS%zZicL07|f`Z?Vd2L&-p~pk=f~ z)^lspcS^GI;h<#(3Q*_G9&o?!m7xrzTp7x$xqkE3@a*3QKEVfmY}hi<43flg3Kn5G zQ-fF(U)`#!Y$i_fI$1Op8GHlnNCTYV8@*^w0%XiOccdB3(srcj&SJXShD$VQIi8}e z&IqxOI1~u4TD#h&N(lJHNeDRSN=UBKSZimyA%q-L-G1akhDAqnrN-cLwle~c4A}^X zrQ=Loh`(x{)Zj#cgv7}=$CI)on6!`8H0w?B=RWK`ErCw?zK5=W1c{6{?$1u&JIrJr zy-yBy%!Mee_74~29BkX~G1<;cx~kbKyz9ixdlb_CdEDbx=zHbLJ_!f!(|@K7&=J_D z@kwb#%EpR;hIwp~_yry!blOb0nQ)B)HwOnwadhVKgp)p9vDB_zYo@)rgO#Blc=xJV z;PI;@XSB?%=mHGZIJ_el$s7yh1_E!_c0NurT`p@{Mf%7@9kDeJnplv~W9CzkY%yzx z;@YEkCey4&TFy9Z6}Ysm)~rxgEn=z_2oXE1v^{#PIhT-%82U$%{-`r%D% ziEaa~>fAL;;~pKKJ0;zGHY2V7*6%8oGCMJ)WkJzZobv_Zke)ZLqA>1l={E9fhZ`g3 zNf(+3deNh>gBYCft3NnI+2J=0%)AaaLv<5`Ms7aPrqGh61lM7f@?=gD)q@NMlkENA zH2Zi?^@X|m>@p(hg*5>zNhTFbMoDeC=xC^410_6K{lEe-jwO+v0G zwq8wpALEvp28D;H!a{vkc~#Qmr%5`>% z27y>U1Zti`zCzPCSPI=qluK&_>Dx``v&?`e)^RyC7yc+_-cUHxmuiga(Cw7e^jHxz z8qh8JwutMdz*#+wZ-1Rd$PXMhmg_ebizJ9@ZJ+U$@sE?-Vu$51=ETR22t7T?YU7$y zAqsFRNHZ=S7E_89%j=u&nxfs4VKqp_5RN&7=BvHW?gOV2 zNoU(p-YVB4T=l|ed21+7AjLp7kC$g~8y;}uEx`)U9naxf z-6Gy@clNGQNcypkZXLe!yLf`ts6Szf&R>JaGK_OVV0X>)lW%tg0JTL^2aw%=eTN;&Hwo>dY zbRoYd==u_@<(sh=PpupJV-6czw!Y#awV`TkD%_|ZUnJ46hBtznMU2+U5@3n2G>BztN^qeDDI~|W3mR~sCTe~@Ojm8B&x{Ay;%;u2S zKn>9Q_?Yx&wKqwpq~ZfFy7|jTpHGI9a+aLY;bS9RRDVWKBE>VHE=bNP6P1vb$7Hh_ zDLz3aa0-PK|Wp)29$z$DpWS+xv1tAtGUgZ;VC+^(YJ<@R+Rvy?cP&s>u4 zZ_cyDE?S|&=03E%n?JcUQE1;ZB$x=4$tp+%msm{w=K<*Hxf+60B@9gVae~>A(&Gd@ zqc6YjFs$sLM~Edn#37}|p^9j$w+V|?snZB31t`DZP4)+{wfk z3}C>XOZ*jHS}mX8u?`aF)}oUnn>|xRR}EsrpHu>8%!kKoGfKx=Qk%f>c*V@ALb&kF zgkRS>C?)^wkt>i2ZZ<@?N!t-k>nW$a7_iRqSFb0-r;wW)DPFHG`(A>f=dPI6(bVpo zRYz!VxMRkUD01mn5Rnb@wST+V{WjSCTX%a%sPi`fZR@VaC!+=TuIK2Kp8+M9Skt*@ zUoYxLfy10glX*(N>{@>|0B2NB^bFLFI*B)2tI_+zW?g(*6O6T-{7WBiar9Z6dS0>? zn$DzW9>q(XTbZ=i=sNzdxi2w>8$OFmxFJf&+%eie6yv*TH1m(aQq?uNhy0VG8};#u ztfZj8-e}ROXUpqZbNo@!+NB43C3l+1LRZ*tgV0$5m5=rCdVBZ^S#wJH{;=hnzAQd9 zt|M8i3P%Iok|<^pAN`Hex91oN8+|#>9j;2JwIg2hXn|vh>+nzAw&!2W_mm+?qS;c$ zl}VdLM;xdA_a&`QFq|IGQ;#`SD?JQHOiwA=Pem+DlDD@`PO8)Jh7|pYIwI&~ix}dv zm$yy<_dVc1#+R#r^_yD!NqRQR{bj{yp;Oc{XgkYRho+BY{+MQ45HFDDYeV=6)^Yf3 z0c+hA*RS8$v2A#Wcv23l3$)rmGE7k_E^SLN!7 ztiO622B0S*cFAYFWs7o;lU-|riF78u-uPbCk(FzW^e%T(!OI@QtT;fTM!$%)Jv&@V>{^ z;zY_mC-#R!p%;(27xC4T+%G2QTx#7qEyQEAW)DqOze*MmyTj7!1;UZ#+Sz6D%=k{W zyT^4MCUVvrynEXx;_c?uXqBoi+tg&hbNx6Nuapk9^OBfBj?pKn2gG|;bn-}tR?tW9 zy_phLUT-k66?5&6=o0iuTJ}8rHI6ea~V)i4z7oUHO zL_7(f$ci$Lex!l3T59!3i*YM~H(s$gi))yEZ4EMIW(n$a4^sHm%-EF~#;iTRaq?nb z7N**_u5EX!iLb82xRJ}ww;*q9AytnT@Dk%JFp>)A|&FXMA-GJchtqz*D&x6=BG z$xm<90ONP?KC&SiWL1wl)Ltj13#F{b!jzX`iSZvk_0o=c-f`j#8UIY#*=YNLPN$!h zv&BemPY?@cGd|n+3c38`e6*CiVynT*`W2ofBo$%wIS~o^+#_Qm8I~L==IiufB}<6< z6D4!Z%k@U=GoRGMU%EsWb~Z}#An&2t&P*P>2l5OT@20(0$GZ88&Yrz|QwWaB6U?H1 z+~yjKJOhGwl^J@h=G@n?1o=is z_S>(iZ8rob%=A@h{hwXM23AX zXlV5x{DfGG%kcxj13-NYa3GT1uB}1X#LGnpP4i$=KhCZ3daz_NE{a=Tc9I$AT9FZW zC)R)sTfrsE49#vyOng&FA_=?b{OhCVt$q5@(PVSlv#!%Vi(n#(Xo2yX*f+;cg5`8d zHx-w|O4Y>JmB(E%AzAM-Fat>+a<<{EFTA3k8q5%w7Flcx*Z4M0GTnT0v(9e7N=3ypA~@mAIOvcY&agTZTm#5ssw9vzpbC*R+fy9R zjL7A*cEu#9x%N)o`2c(J)Mu&EiQ;kl71uQzyx~WjzE-1l3*+?R7%Rj?>L?A1l9V%{ z!!v?z*ERpNXr6c&Ki-wUicxw^*kAfxO>sUKkA;u-PI<)EaEYP&rxag9^IXDby06`( z*;LLUgd&)4|&%HU-q#C!QbfaP@dr8!lPb=W0?$QLS|p-&Be8*6y+DoHT) z)gH*2C~H3rg=kGu29sJ$>2~!c5^qH1$qiOsJr}%7DcPO%V$~Gvl&voM!hS=p@#ebef03)BZ%q1^qkuy zA44h$Y;)%V#>KTdcQJWeHpohXJPVqnDrV-IQ{uT7QH6PE7h0$p59VcJVpqxQl!4mt zo4u0NMPiT|%VB-y`U~xkE;s`;9Bw*IpvLh*XVFDy>#bwdv-@`GY^wrV@3;0m&h310 zk$nv$qH)9Bz&{0|dF7=>bhTcO28Ww}C1N-I4%YdaoD$r0cGYaq7{a{Lul)q1zwRGj z(sAtyguzrg*hOT6;@t)imWgRXd+oSF#?qs3k9L`zDWV`GKEVXD-m(FV8bf-91U(}h z?Jp(9Up={<+NgW{h(LvBVXt>I7XIWdrR>%Xd&yl8VGV>b!8a-3;zOVd=!Aa_&qU$Q z?KZ2uPbomRb!J{nI`O=VM%AB;S5F3f+NORn1LIY7=ayWE|4Dk56Ul>1!jX}vP*~N- z1$6%Mz*1aD{qi%ZFOFZ7<~%=RqQAAAgH7aIgsdQ53Q&Q@z@ty|!kowcghzPPgghnX zZg|(9bwD?loyNH3Wsy*EBKJ%*>Qbu5*i1yWAjnH>X2i552g&oGF(?@H=2h(|X;LdY z%=xRlFX%wvS#gX z*^E4dn+$=Ed{lg2L$S6ouJ6rCiYfA8VuqROI|@{sjYiKlZAFxF5_A`~$C%R0i`5{j zq0zl8YqY7yz4vtlD~#@QY*W?#2}RpiblH9}gYV-9q@|BTl6B5=gtho7G7&^Wvx2gO zWq`>~W3{QtKb#oUt^{gEHI7^a%|F)sJFNGyB}ccx-!8q)Te3cSEXeFFL9Bm;^;ddH zfW3bPx^@L13IIT`udm^wG!saS?K61p#THSoh58(k2HTulK* zweoigeTrUeo@s%qzx$g&_HnYXE@M0nrKXYCev=x}Wz6LSc;)?p-DJHe2QYN`X8jY+ z`>aW5fRe^EHBcUbE&gswRhrsBbqXS<-;z+_)BSf~{mu}>JRTFIVTe^H3GLm@{^cMd zbYVu&k{FOrj#q~Mb&aB+otMuW>K&HFt(+cQ7GkIRK+cW<=u=yv-t zXofa&%6i9Pl;S8fs}HE>$tAXn(Zkr2SdVHxJY;cYQrhFoTgkqSK-4+}KT*^yw*Ao~ zggM-Ex~bDg(2y^(PW}uq7hi4}t9EF-gY}tmi9~+#JMZXms?IPq`baAh(F|N#%NwVv zI49(wALBS;7-;m)3F3gAkd@rv)*$QS_8#m93woH>d;A=4{tUYMGQTUbxq4f`Ph4#} zpbkBxH@gVktP>hT;<5all8Z0fde{6c^cObL0(n?--+xn|$rTL<)TZCLE~{wAPtus% zVb9xB!k00j;nt$UA!G(H{7opN$8Zr=|C#y^_o|bQF7SJFhM7lf3oaH4HVO_3E(#tB zJ_-Q}Aqo)+F$xI^DGC`1ISK^|B?S=hVmSR z1%(xb4F!zCj>3V$iNb}#jlzS%i^7M(k0O8~h$7V4f(z*+!k$M%6KKwH2SBLNyK-Ux z5PtNPoDKkl8T}?_>Hpm4-2R{293T}cAvvP|=OM?43c`dTf}7({h1&R@Q~Ce&PtNH7 buYWnWR1h6hRDlo{Y$O`LSwfCG5TgDc8s7(U delta 6142 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 GI{yQPKQHY7 diff --git a/USDK/component/soc/realtek/8195a/misc/rtl_std_lib/lib_rtlstd/ram_libgloss_retarget.c b/USDK/component/soc/realtek/8195a/misc/rtl_std_lib/lib_rtlstd/ram_libgloss_retarget.c index 40d3175..90a7d97 100644 --- a/USDK/component/soc/realtek/8195a/misc/rtl_std_lib/lib_rtlstd/ram_libgloss_retarget.c +++ b/USDK/component/soc/realtek/8195a/misc/rtl_std_lib/lib_rtlstd/ram_libgloss_retarget.c @@ -97,9 +97,9 @@ int ram_libgloss_write(int file, const char *ptr, int len) { //----- ram_libgloss_open() int ram_libgloss_open(char *file, int flags, int mode) { // 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, "/stderr")) result = -1; diff --git a/project/src/console/wifi_console.c b/project/src/console/wifi_console.c index db33702..9ae9b14 100644 --- a/project/src/console/wifi_console.c +++ b/project/src/console/wifi_console.c @@ -350,4 +350,3 @@ MON_RAM_TAB_SECTION COMMAND_TABLE console_cmd_wifi_api[] = { {"ATSN", 0, fATSN, ": Scan networks"} }; - diff --git a/tools/rtlaimage/rtlaimage.py b/tools/rtlaimage/rtlaimage.py index da81ce5..dec78c8 100644 --- a/tools/rtlaimage/rtlaimage.py +++ b/tools/rtlaimage/rtlaimage.py @@ -10,7 +10,7 @@ import os import struct import sys -__version__ = "20.01.18" +__version__ = "22.01.18" PYTHON2 = sys.version_info[0] < 3 # True if on pre-Python 3 @@ -295,7 +295,7 @@ def elf2image(args): for s in image: if s.hm & HM_IS_OTA: chks = s.save_ota(f, fn, chks) - f.write(struct.pack('