From fb8c6e86e4f2cb38a36bd163266a0f557fb48498 Mon Sep 17 00:00:00 2001 From: Can Cao Date: Tue, 26 Jun 2018 05:47:47 +0000 Subject: Merge "darwin: add AVB code [9/14]" into p-amlogic --- diff --git a/BoardConfig.mk b/BoardConfig.mk index bf62f10..963caba 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -64,20 +64,35 @@ BOARD_HAVE_FLASHLIGHT := false BOARD_HAVE_HW_JPEGENC := true TARGET_USERIMAGES_USE_EXT4 := true -BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1946157056 BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800 BOARD_FLASH_BLOCK_SIZE := 4096 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 -BOARD_VENDORIMAGE_PARTITION_SIZE := 268435456 BOARD_USES_VENDORIMAGE := true TARGET_COPY_OUT_VENDOR := vendor BOARD_ROOT_EXTRA_FOLDERS := odm BOARD_ODMIMAGE_FILE_SYSTEM_TYPE := ext4 -BOARD_ODMIMAGE_PARTITION_SIZE := 268435456 BOARD_USES_ODMIMAGE := true +BOARD_USES_PRODUCTIMAGE := true +BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4 +TARGET_COPY_OUT_PRODUCT := product + +BOARD_DTBIMAGE_PARTITION_SIZE := 262144 +BOARD_BOOTIMAGE_PARTITION_SIZE := 16777216 +BOARD_RECOVERYIMAGE_PARTITION_SIZE := 25165824 +ifeq ($(ANDROID_BUILD_TYPE), 64) +BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1551892480 +BOARD_VENDORIMAGE_PARTITION_SIZE := 268435456 +BOARD_ODMIMAGE_PARTITION_SIZE := 134217728 +BOARD_PRODUCTIMAGE_PARTITION_SIZE := 134217728 +else +BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1342177280 +BOARD_VENDORIMAGE_PARTITION_SIZE := 268435456 +BOARD_ODMIMAGE_PARTITION_SIZE := 134217728 +BOARD_PRODUCTIMAGE_PARTITION_SIZE := 134217728 +endif TARGET_SUPPORT_USB_BURNING_V2 := true TARGET_AMLOGIC_RES_PACKAGE := device/amlogic/darwin/logo_img_files @@ -106,7 +121,7 @@ TARGET_RECOVERY_UI_LIB += \ libsystemcontrol_static ifneq ($(AB_OTA_UPDATER),true) TARGET_RECOVERY_UPDATER_LIBS := libinstall_amlogic -TARGET_RECOVERY_UPDATER_EXTRA_LIBS += libenv libsystemcontrol_static +TARGET_RECOVERY_UPDATER_EXTRA_LIBS += libenv libsystemcontrol_static libsecurity libdtb endif include device/amlogic/common/sepolicy.mk diff --git a/Kernel.mk b/Kernel.mk index 27067bf..5b3c506 100644 --- a/Kernel.mk +++ b/Kernel.mk @@ -35,6 +35,9 @@ $(TARGET_PREBUILT_KERNEL): $(INSTALLED_BOARDDTB_TARGET) cp $(KERNEL_KO_OUT)/* $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/lib/modules/ mkdir -p $(PRODUCT_OUT)/vendor/lib/egl cp device/amlogic/darwin-kernel/lib/egl/* $(PRODUCT_OUT)/vendor/lib/egl/ +ifeq ($(UPDATE_BOOTLOADER),true) + $(call add-radio-file,bootloader.img) +endif $(INSTALLED_KERNEL_TARGET): $(TARGET_PREBUILT_KERNEL) | $(ACP) @echo "Kernel installed" @@ -102,6 +105,9 @@ $(INTERMEDIATES_KERNEL): $(KERNEL_OUT) $(KERNEL_CONFIG) $(INSTALLED_BOARDDTB_TAR $(media-modules) mkdir -p $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/lib/modules/ cp $(KERNEL_KO_OUT)/* $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/lib/modules/ +ifeq ($(UPDATE_BOOTLOADER),true) + $(call add-radio-file,bootloader.img) +endif kerneltags: $(KERNEL_OUT) $(MAKE) -C $(KERNEL_ROOTDIR) O=../$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(PREFIX_CROSS_COMPILE) tags diff --git a/board-info.txt b/board-info.txt index 9bb970a..42deeeb 100644 --- a/board-info.txt +++ b/board-info.txt @@ -1,2 +1,2 @@ require board=txlx_skt -require version-bootloader=01.01.180613.184638 \ No newline at end of file +require version-bootloader=01.01.180621.161213 \ No newline at end of file diff --git a/bootloader.img b/bootloader.img index eafd0ff..3132ceb 100644 --- a/bootloader.img +++ b/bootloader.img @@ -1,4 +1,4 @@ -ܘ! kc9EB=@AML +iǹ"s7x@AML 2? @@ -2534,41 +2534,42 @@ This will cause memory leakage. aml-sha1 ;3+#>6.&=5-% <4,$     -  - - +  + + -P! -x - - +P! +x + + h#D _p  -2? - +2? + @ -@*`** -@ |@x +@*`** +@ |@ +x  -b  +b   - + qT`RRR -8 -0 +8 +0  R. R 0 -4 -R +4 +R ap -" +" 'K @ ! -, -@Mz +, +@Mz c  @ @@ -2578,574 +2579,557 @@ b   C  -!hS!*h +!hS!*h |  -pҰ - -,  -"A -, - -8Cq +pҰ +,  +"A +, + +Cq c -<+ +<+ 8 p p - -,? - -JQ` -qT -@? -@6@9 -@ + +,? + +JQ` +qT +@? +@6@9 +@ - -c\ + +c\  l @ -p +p -dP` -@X6 +dP` +@X6 @a@ ( - t@a@ -a + t@a@ +a `\ - + -d)AR 80R 8/h 44 -C +d2AR 80R 8/h 44 +C Uh 8`1@p - -:4g - -0 - + +:4g + +0 + ֒/  -@0X " +@0X " & A -@ - -4< +@ +   -Ͱ\`[ +Ͱ\`[ @k@X0k@L - 5` R9c` -`Qt -Ă]R*0P! -\ - + 5` R9c` +`Qt +Ă]R*0P! +\ + $ b -@@Â$at% -`9T - -"82w - -_ -^ЈH% - +@@Â$at% +`9T + +1xC< +"82w + +^ЈH% +^ { + 07 87 @7P6 @\)*Y -nh `6 6az@b~ -BbC9A\`!`4R<0?T -T XDW/  -Ԛ,| -9ȅ, -TbЬؚ1*`  /! XS. +Ԛ  2Dv";d"0.z&֌ $!cH'" -"aH -D< -@B$| *@v",/p&!.fR.R#R4!"#3L5tȿ",, -I 0/@d * - -8L +"aH +D< +@B$| *@v",/p&!.oR.R#R4!"#44t㜒,, +I 0/@d * + - -l -8 - t -<4p9| -"1\ws+@ +`b&R + + t +<4p8| +"{1\ws+@  @hd + -)Zn y xfbr8L t8 +)Zn y xfbr8L t8 k ` -S -@@`SR +S +@@`SR й` ->47P@O<"|>6h +>47P@O<"|>6h -P!N d Xu -X~ -X q#X Rf)pEf<"[!,  - +P!N dXu +X~ +X q#X Rhf)pEf<"[!  + @HPz@% -šl12\)"'T11 +šl12\)"'T11 s  -t -!'Ȅ"'" PAq pX(.< -2T0NF,< ! -_4*&`@ ,zw4]awL#ė AVb -`!KKs - -> -h -" `? -@2S0DTR+Dt~ + d +@9B@7T9B` + > +h +" `? + @ -L -R2*ML +L +R2*ML < q -Rl -m 12 Cq@ +Rl +m 1D Cq@ Re"js|Y R\0 \T.Y -h-d$A -C -" +h-m$A +C +" %A* - - (t -# - -9 -{3&@9 - -9 d! -"=>0  - -' - !$ -A -94 + + +# + +{&@9 + +"F>0  +' + +}\W$R + !@$ +A֪84 \ -t"$S"R: - -6[d=T[_=X"Z=P!R@ S -!D|{'; -ܬ -dS +t"$S"R: + +6[m=T[h=X"c=P!R@ S +ܬ +dS t -l +l # -"UПT$* - 3S 7a~ -n96**-_ V1  -!@9 -Sdx" -b R0Ll +"UПT$* + 3S 7a~ +n96**-_ V1  +!@9 +Sdx" +b RL0Ll  * \ - -*,`T@ 'P -q9zᄤ#@J - + +*,`T@ 'P +q9zᄤ#@J + -B9: -F@*S -P*x6 -A9 - -d "ldB GL_@. - - +B9: +F@*S + +P*x6 +A9 + +d "ldB GL_I. + +  05 @4 -` -9, R, 4`I -B9` +` +9, R, 4`I +B9` @h - -A9`2A9 + +A9`2A9 <`*a - ;aA9b0A9 -(^ - - - + ;aA9b0A9 +(^ + + - - -$ - - -Ԫє -9kB= + +$ + + +Ԫє8kB= 46st" x $\:@ - -D#A -`8 + +D#A +`8 y -#V -0r9 ) - p -@"- +#V +*hC@A$ 4IC4F\ +0r9 ) + p +@"- \ - -\ -9_ - - -LR!R4-E\ -<,'l8 -" -!<'>r - +@PQK~ +\ + + +LR!R4-E\ +<,'l8 +@" +!&>r + $."$SA - -;TA -0l -h + +;TA +0l +h -R, -1*p -B6cR(= +R, +1%*p +B86cR )= - - -#@06tW -1 -3 + + +#@06tW +1  =S -" - ` @> "@@H !6h1 +" + ` @> "@@H !6h1 @`P -X -M(,0,0|SA - -a0 -"`p48l !X4 - -`_ - +X +M(,0,0|SA + +a0 +"`p48l !X4 + +`_ + @ -B; @~K 0~PvB -r@ - -`$d ?tB9@@ - -B pP? - Hh +03B; @~K 0~PvB +r@ + +`$d HtB9@@ + +B pP? x! < -f@@c -@A*tG0 +f@@c - + 8 -S/ -l.̐0|! 1T` -7yT,@ -4 -0 - +S/ +l.̐0|! 1T` +7yT,@ +4 +r0 +0 + B@<1 -"x +"x  w `4+" -@# - -"T6Pj((#|@ -@` +@# + +"T6Pj((#|@ +@`  "? -D@ - -# -Z? +D@ + +# +Z? @ OI@ - +  -) " -,XPA -9d  -7d$00~ĭ5@G@C@;D(&h10E - -4 -T -9B@%0 - +) " +,XPA +7# + +4X +\T +9B$0 "< -5* -4 -Paۭ -\4$K,,",,< -@ D +5* +Paۭ +\4$K,,",,< @c@ -p BXex"¨ -i - A'< I@  -Ԅ$ ER 1*pEp  @@#8 8% - 8y -@y -]40PTp÷ - -" / - - - "| +pBXex"¨ +i +@2qA + +ER1*pE  @@#8 8% +BRc3 +C0Q"`"0 +@y +]40PTph÷ + + + + "| 9JE -{9\5*!R  -@Т -\#10$C D4v@\@@@RR"}$ *d P8ϒ"/ -h@Ũ-tt[l2 #  - &#AR`% +{9\5*!R  +,Sd +@Т +\#10 +h@Ũ-tt[ l2# + &#AR  -@$Rr -Aj`8 +@$Rr +Aj`8 @9 n` k c bRBL (6_Bbjb8r@ -x|S +x|S -j -{!B!59h@?4 -zp{@k,T`&X95r5aFDb -jE`Fo  - +j +{!B!59h@?4 +jE`Fo  + fA@XfL b-`R -ZaRJ`& С +ZaRJ`& С b-$E -H0`D -D< h -MRB6ȧ|"X -40"H +H0`D +D< h +MRB6ȧ|"X +40!H " !5$ -dxK k 8TB&u -(%<"__ }@@ - - - bC"m$AHVt -x -Cb/+%$v`$ -k4bd!t;} J~$(4!B0/% "D>RI &J - -h - -thͨ$^4 \$`,S*ė3\Cb.ht-Iy@w -@T -4E0| -@ +dxK,z!`k 8TB&u +(%<"__ }@@ + + + bL"m$AHVt +x +Cb/+%$v`$ + +T + +h +thͨ$^4 \$`,S*ė3\C/hbt@Iy@w +@] +4E0| +@ b_p9 ! "`" B -] - - - -5 -4q -$ - !dF< +] + + + +5 +4q +$ +0!\= rLC>`a -0,L"uttg|8O 4p|,i,D ++! @"Q - - $NB@=5( + + $NB@=5( ` -"H -x8D! -v -~ -!/x -3X!` +"H +x8D! +v +~ +!/x +3X!`  !D -TSb@9 +TSb@9 a@9a@9$ a@9 -a"A9z&A9|VA9: a*A9eFA9ZL - -R$ +a"A9z&A9|VA9: a*A9eFA9ZL +R$ S@9b 3_  @@ -3153,298 +3137,289 @@ S@9b    - "@ 4444 BH  HDk 86 -@!TX -ٚ -O* -xX\ ܓ -@ -RC#v -`l|S - + "@ 4444 BH  HDkذ +@!TX +ٚ +O* +xX\ ܓ +@ +RC#v +`l|S + dF -pA@.0 - -VT - d -, -t +pA@.0 + +VT + d +, +t  - -XI+XO& + +XI4XO/ ? -% - -,O@ +% + +,OI <2x$ - - + + `O`$ ` ` -E -K - -&LNl"m@ $ +E +K + +&LNl"m@ $ 6 - + @ -X - - 0 +X + 0  ? ?I` *  -  -3 - :R:R:R 8;9`| - - -Rє +  +3 + :R:R:R`8 < + + +Rє ( -̔ *4Ru@lPja -D, -V*<" -@wHY -"sVT -Z:8k*hK9`jt8 - -"d5x -L -k*""jsf909f 9oys +̔ *4Ru@lPja +D, +V*<" +@HY +SsT +Z:8k*hK9`jt8 + +"d5x +L -P - +P P - -IW( B5+p -/$ - -@ - -\kR@70 - + +IW( B6+p +/$ + +@ + +\j + |"| -@9S%Ru +@9S%Ru "Mglz } 0* - BT`)= +qBTR!= $ӵ -* +* .+t -&#x +&#x -"L$ +"L$ @ -̴S +̴S  - -sL#3MR -bM4F -(` -4B;BF $  hb`F -\aDp5P + +sL#3MR +bM4F +4B;BF $  hb`F -R4 -[y -@ - -DjN -R -0|3* - -d$@9 @95 * @9%@9 * @9,0 *4g0 -=(: -, -BĨI!( +R4 +[ +@ + +DjN +R!  +0|3* + +d$@9 @95 * @9%@9 * @9,0 *4g0 +=(: +, +BĨI!(  T| # (  -2!t +2!t 42` T d - 4,`" "dH -@9!8Dd + 4,`" "dH +@9!8Dd  t 0 >c| -3B -R +3B +R ""bp @@p -U- 3 -0Q`6_ +U, 3 +0Q`6_ - -\# - -"@ + +\# + +"@ ,1 -8 p@b@\ -11L5h5,5DPD@!XABP - " +8 p@b@\ +114h5,4DPD@!XABP + "   -x|x0R: - M!  d - - +x|x0R: + M!  d + -N4 ,.PH>#6 -"H_D -d>aR -H - -D -2RR5 -"@$H - -x - - -@9_<{ SC@pJ -` 9|, 4 - - - 4XxDB@ -- -9By g*" " $ -Y#6 +" +d>aR +H + +D& +2RR5 +"@$H0 + + + + +@9_<{ SC@pJ +` 9|, !L4 + +U + 4XxDB@ +- +9By *" " $ +Y. -,IB,u;`k*@ 2 +,IB,u;`k*@ 2 -@J1 -a. -b  - -B*RH``T -(X32AL! -@ +@J1 +b  + +B*RH``T +(X3p2AL! +@ y - -@ - -f -N -j#KH& - @t? + +@ + +f +j#KH& + @? #@pQ - -0 -TuC8`"@H8 -H8@x<D + +0 +TuC8`"@H8 +H8@x<D )0; ``$ -<#C4@yT+[S@TP"afPm@Ri -ך5 - -"`" -VpD -x9@T.@97R2 +<#C4@yT+[S@TP"afPm@R@i +ך5 + +"`" +VpD +x9@T.@97R2 6 - -9 -ې? - F -"}t -sPAR -D, - -d/ - -x ĵ~X -!s4*"$b - -$"| -K -`6`$Z3+\a -p8 TH y;s + +9 +ې? + F +"}t +sPAR +D, + +d/ + +$ R +x ĵ~X +!s4*"$b + +$"| +K +p8 TH y;s KH D4 - -&dW_R7 |eRBcy%Rd@,"4,pg"L 54X -4 < -"@ -ѧ - D - - -)8!b - - -8_ -`RdH + +&dWP_R47 |eRBcy%Rd@,"4pg"L 54X +4< +ѧ +B a8B8   + D + + +)8!b + + +8_ +`RdH 0X3, -mQ* -\ - - -PsU -#: - -&h `, @ -D( -9aAl` - xE -(U@Ek$8HP!ol -! ti -\)L - -@@,|! - - +mQ* +\ + + +PsU +#: + +&h `, @ +D( + xE +(U@Ek$8HP!ol +! tr +\! L + +@@,|Ā)ܤ + + ` -#| +#| +& | -+* +@P?* Ԛ -0s H% -l**f` -<<P|tC0R4@t -<8 - h +0 H% +l**f` +<<P|tC0R4@t +<8 + \{ R= &70 + h s`= ! -" -"CD S 9 S! -a, +" +a, SA  -}d - +}d + 4 I CaB*aA*0 @@ -3452,156 +3427,152 @@ CaB*aA*0 @  #  AA  -\d -t t -؊8 +\d +؊8 "8A  -p - +p + 2bs `  2v BAj*7< - - - - - + + + + + } -yyyyyy&y6 -r1 -܄p{q -x +yyyyyy&y6 +r1 +܄p{q + : ,l6yoY 1 +x J@9 8@9  -8:d% +8:d% @9 - - - -ku@` + + + @ -@l - - aRj -آǴ - -d -@\!Z"Gi\Y ,| - - -Ti +@l + +آǴ + +d +@\!lZ"Gi\0 -| + + +Ti T  -  +  H.+P}20 - |%)"{to"+#(J3 + |%t)"to"+#(J3  - -"`1 l -! - - -pä -`= -@D -r -@#kp8L? -P + -@ ` + +"`4 u30 +! +"KP! + + +pä +`= +@D +r +@#kp8L? +P + +@ Spp xs@ - h`8L0 -@BXa" +! h`8L4 +@BXa" A c\X -@ -Rc ]'t$b -( -80B6H!`zX* -]Pkb - },/7b Rc@ +@ +Rc]'t$b +( +80B6H!`zX* + },/7b Rc ! C,v 0 -X  `@\<4 -p -@y +X  `@\<4 +p +@y /t0 b0 &!b,PH -`@9! -PHL - +`@9! +PHL + ,* - -w + ` y`@yH -L +L #$88 9C9 yg)25 yL "x - -(pj{Fp - A4d6 -8}RR T8R9!C㶣 + +(pj{Fp + A4d6 + Tu@*@X0 +8}RR T8R9!C㶣 @ @z@@W - d\ -@hD - -@bnA @ -)qyR@ -!q + d\ +@hD + +@bnA @ L9A - - `Gh3E9`8"7 + + `Gh3E9`8"7 l@Sk$ * @@ -4101,100 +4070,102 @@ J  X@@OK @@9 @b - -jL,L,L, - - -p@| -@$th! + +jL,L,L, + + +p@| +@$th!  -%` ( +%` ( dc 88b* 4 -@ +@ P ِ- - -A|}Z - -r94_4`? -D$Cjc[@q[m -$0k - ,0 Ú\k@ -t - - - + +A|}Z + +r94_4`? +D$Cjc[@q[d +$0k + +t + + + L -h -u\B~@H@Bz@Bz +h +l\B~@H@Bz@Bz `ӰВ -Sb -20d(aH4 - - - -x8&z -`=xR -a - -rBD% - -! - -0R$ +@l + +A4 + +"T*"~t@! +,! +d +RpJ9a +l$ +a +8` +R`F9 +.d" +>Sb + +20d(aH4 + + + +x8&z +`=xR +a<$ + +rBH% +#2/ + +! + +0R( d!hb| 3A -|Pxr 8X -Ts2l(=P@ -@! - - -$ -A -` -AA( -A+"##00 - -8_0C"T *"H - -(A - -0 +Oxr 8\ +Js2p,=P@ +@! + + +$ \s +A +d +AA(pR +A+"##0 + +<_4C"S*"H + +$)A + +0 - -"\ -  -$P + +"\ +  +$8  )gpisk_gui X @@ -4203,7 +4174,7 @@ x o 4top @'ed P_shortcut. -@ +@ 5lBɻ@l2u\E Y=ѫ0&: | jm Zjz  ' }Dңhi]Wbgeq6lknv+ӉZzJgo߹ﾎCՎ`~ѡ8ROggW?K6H+ L @@ -4211,245 +4182,243 @@ P_shortcut. m ?6grW TN³9a&g`MGiIwn>JjѮZf @;7SŞϲG0򽽊º0S$6к)WTg#.zfJah]+o*7 Z- n! -w -3 -d +w +d  % - - + J -0 -{ -c0x1234 -  0xe31cfb04 0xb748 -A +0 +c0x1234 +A 2  - -- + +- yD<#*=(LZO   -  - H  H -  - -02 - -#H -x*R&8@h0BX  - +  +EG G +  + +0 + + , O "T " - -H"X + +@ +' +H"X X" " - -#!@ - - - - -( + +" +e X "!' + + + + +( + ( s - >pP -Q - q` + oPt +A +p` Q - - - - sa9q - - - - + + + + sap + + + + 3 4 -/0] -3 -@aml -_m1usbYq cfg: %d - -o poll:0x%x va +/0] +3 +@aml +m1usbq cfg: %d + +o poll:0x%x va -sTX-DWC ]b%04x rr - +sTX-DWC ^]b%04x rrr + - + - - - -i - -Star]U + + + +i + +Star]U - - + + - - - -4^\]=]/; V^ -[e# + + + +7^\]=]/; Y^ +e# - + **S -Y@"%s"1 -dv1# +Y@"%s"1 - + - -"- ' -W -]z-- : %2d ow - -@pass -aml^] : Sig Cf2 %dLTe ARM64 Immagic! - - -DVs| + +"- ' +W +]z-- : %2d /w + +@pass +amla] : Sig Cf2 %dLe ARM64 Immagic! + + +DV3| -J - -0res  - -b"rd - +J + +0res  + +b"rd +  Xbrief" Q 1111 (prerelease) -^monitor,r -  %d: DecryptD F dts,buffer=%p,dtq - -7 -'N -+qa tbp +^monitor,r +  %d: DecryptD F dts,buffer=%p,dtq + +7 +'N +pa tbp : -: -4 - - +: +4 + + n< h< 2crc MHashB  Q -l + +l For -u +ou -C#no -a -k : - +C#no +a +k : +l% [7 availabl OFF -P - +P + 4 -& - +& + ** Un o %sWC - + ipD0anc L fd4 (NULL). - + C< %d - - + + the4 -Abo -MBtag - - +Abo +MBtag + + -fi -'  $ s,w=t: . -" s 4 -m +&i +'  $ s,w=t: +" s +-U 0 bu f -f\*4 @" +f\*4 @"  -8 +8 %3Not - - - -X - + + +~ +X + * - + [ - -f + +f Thi<%<5omeo ` which-x/T T Z0: - 48 +  Ex9 - -Uaa 11+Db 22 + -Uaa 115Db 22 So you>& f - - -ݑ + + + 6  -l I - O +l I + O -A +A -."x +."x -: q[reg] [ -eg: -e؊/ - +: Ůq[reg] [ +eg: +eۊ/ + - + -!q! #~m - +!1! #~m + PBus W hj@ppen= X - - + + mmc-blk# cnt mmf!s<@oX$M 6 "] -8 " - - P=" + - P=" T < J - -ͼ + +  5 N @@ -4464,35 +4433,35 @@ gp ' sEXT_CSD 1[%d L Phs_tiYA%Thr -[HS_TIMING]x -X - + - +[HS_TIMING]x +X + + e5l{?Crath:  - -0x<CLASS_6_CTRLI '0'Y + +0x<CLASS_6_CTRLI '0'Y / -2 ml$.co:oJ +2 mlu$.co:oJ * soEb '5 #x -  Y#K 5 'J") +  Y#K 5 'J") J 2  -K  +K  u& -E"%s-> - ` #D!o - x2i% +OE"%s-> + ` #D!o + x2i%  - -DStalbe:t mb   -g + +DStalbe:t mb  f +g  6! @@ -4500,17 +4469,17 @@ soEb ' F6'onD 6 or --wp +T-wp   - + E 1   -B %Pagainy y +B %Pagainy y 6Y a ZC + / ] a @@ -4524,39 +4493,39 @@ B %Pagainy y C/off iz((F($  - /b + /b )  x+ - + [dtb]e _RES! -f_: - +f_: + C - -gu --- Res[,dmIMAGE_FORMAT_ANDROID> -% - -Z + +ju --- Res[,dmIMAGE_FORMAT_ANDROID> +% + +Z { - -' -H -| + +' -H +| &s.MT?J - + no sA @ USB+.%l@l@l@F usb2- QpXu'p S ry) -, +, !c ez# @@ -4564,13 +4533,13 @@ usb2-  ]0 - - + +  -! -T +! +T ! - +  ra> ~ s @@ -4579,7 +4548,7 @@ s  4 - + < X @nvedit.c @@ -4590,18 +4559,18 @@ q%zX `  - L - -:% - + L + +:% +  -rci AIS  +rci AIS    - +  5 - + GXg c @@ -4625,7 +4594,7 @@ v di r "X - -N + -N  h W#  @@ -4878,397 +4847,408 @@ Bu ) BS!.cz  - - D|bE Y - - - - -.4=%d? - -M@GRSTrv4%0x -%ttrx4R FULLPc m  ؜" !L + + k|bl Y +,-  + + + +uk + +%ttx 5R FULLіwc  " !s - -8KF3 - - - - - -@"c -m -z -%b -~F -No c#fsewv!4/%s. -  -< -# -= cyD L o)l2Env7 - - - - -@#: - -T#guZ_U - OFFER/ACK -!ou b%pI4 (< ), - 4MAC - -)pM -i + +_Km3 + +z + + + + +@Ic +m + +%b +F +No c#fs&ev#"4/%s. +  +< +Y +# += cyk L o)2Env&8 + + +; + +g#: + +BT#gu_U + OFFER/ACK +!ou b%pI4 (< ), + 4MAC + +)pM +i  -$ - +$ + -TFTP^& +TFTP& - F -P[ -l - -~ - - -_ -/ + F +/P[ +k + +~ + + + +_ + +/  L -P - -G@[argF]mCappl"toh1 paH>'L - ) - G - uC '-'bU!e 96 +P + + ) + G + uC '-'U!e :6 -F_ - T.)2WcludeD - ^<2g_u{-1D -l - as. +F_ + |.*2WcludeD + 5^<2g_u{-1D +l + 3as. -Sub-@w4l  F* -Bdkvi)(@bAok tl - G  =#Ros -U.$OS" G4 -  +Sub-hx4  F* +jdvi)(hbAok t + #Ros -V.$OS"3G4 - " bZ 5 - v ' - goLsP OS< 8 - V - Q92d3RAWS + v ' + goMPOS + V + y9Zd3RAWS Sincewp -2 -O -/X( -/( - -P? - -RB[to  -fd6P - -i2cGUpA -*$ ? -/ -X?t).  - - -/|  -0 / -( - -[3d_S!] -Q -t - $: oF!s rh* -R -; -eJ [-P-b | cB[-s {w -'*?#   -( - /(( - ( -)  -( - - -h ` h(1 ->~ -  +#Ҍ + +O +/X( +/( + +P? + +RB[to  +fd6x + +i2coUpA +ߠ/0( +*  ? +/ +X/t( + + +/|  +0 / +( + +[[d_S!] +y +t + $: pF!s h* +R +; +eJ [-DP-b | cB[-s {w +'*?#   +( + ( +)  +D/ +( + + +hB. +>~ +  $ -$ -p(; +$ +p(;  - - @z:S1 - (20$00 /,mX0 #/Ph(1 - + + @z:S1 + (8 + #e(A1@ /v) hP -P, -~ -`f - -y -( ^4 -#/p>x) -h/0 -8/8s*K -ULU - -   -tvD_0p -/> +P, +~ +2#2x +`f + +y +( ^P*1P./1x4 #H0)0(/Q| + +x) +h/0 +8( +ULU + +   +tvD_0p +/> ^ -_ -v -fC= -d +_ +v +fC= +d *6 E1 88< -tc$c(c,c0c4cc(c,cdccj -9 2Tf8"eh{ - R - -@@> - -xH - - -H?H n+I8m/I m+IPl -P?K n?XL R` -+L%nM -xP -0 - - -h -?(W (t -H - -;] vx] [0 -H/d1d) -/d1d)e(G -/ee) -(hH -`/ee)eK -/ee1e5 -X/fg8g - H -p - -H/h:8 -/@8 -/h8 -/  -(/ -X -$P -x+X  - -H -x - -8 -p -x -0 -H` - -8 -0 -h -p -x -  -Xp - - -` -P -0x -h - -8 -p8 -` - -(` -0x -h - -X -` - -H -@p -` - - -8` -8?X 8 -$8 -H -X - -x/ -x -x?H X -Hh -P + + + + +8 +80 +8H +8` +8x +8 +8 +8 +80 +0+ +p/` +8H +P`H +H +/    +/   +/ +/x!!! +/!( +/ +b/,@  +H +/ +/x- -  +h/-  +/. +/@. +` +/h. +hx +/.p.p. +/.p  +//p +H/@/p +/h/p +//8 +//8/ / +(//8/  +`/080  +/0080  +/X080  +/080  +@/00  +x/00  +/01  +/ 11  + /H11  +X/p11  +/118 +/1181  + +p/8228 +،X +/`228 +/228 +/228 +P/2282` +/ +/(3383`H +/P3383 p +0/x3383  +h/338 +/338 +/3384 +/44848 +H/@448/4 I` +/h4484p/4 X8 +/484p + +8/484p +/H5@5 +/p5@5@ +/5@5@5 +@/5@5@5 +x/5@8= +( +0/=@=8 +h/=@=8 +H +/>@>x + + +xH + +x/>@>@ + + +G>g +?I l?J XS +P?K n?hL Rp ++L%xo*M +0 + +x +?T s?PU +h +?V s$0W +?8W (t +H+W&2e + +H  +( +P;Z s` xZp +1H/\ u +0<\ u] 0H  +;^ `u0] \ +H/d1d) +/ +/(ee) +(/xee)e +`/ee)eK +/ee1e5 +/0ggx +p ++PB +H/(h:H +/P8 +/x8 +/  +(/Ȁ +P +X +$` +x+h`W + +H + + +8; `B +H` + + +0 +Hp +H +0 +x +x +0 +X + + +8 0 +p +P +0 +h +( +8  +pH +p + +8` +0 +h +( +X +` + +X +@ +p + + +8` ++X  +8?h 8 +$H ++X8 + +x/ +xX` +Hx +P diff --git a/bootloader.img.sha1 b/bootloader.img.sha1 index f53316e..5fe9f24 100644 --- a/bootloader.img.sha1 +++ b/bootloader.img.sha1 @@ -4,4 +4,5 @@ 8513e5ca0ae14015b5ea505bd4a22e726cd14cd9 01.01.180607.161938-cefbc4993 ba13cb02c155dec65dc6081cb11aaad7a0c3d378 01.01.180612.114517-442fed275 -cf0488e17ce34833ee55880180c59cc524920c12 01.01.180613.184638-5e49a3a92 \ No newline at end of file +cf0488e17ce34833ee55880180c59cc524920c12 01.01.180613.184638-5e49a3a92 +6e18a22b23e83276dfc65341e9f024f1fec890e0 01.01.180621.161213-eaf7230c7 \ No newline at end of file diff --git a/darwin.mk b/darwin.mk index 9a1fb41..ddda7d6 100644 --- a/darwin.mk +++ b/darwin.mk @@ -60,6 +60,7 @@ BOARD_AML_VENDOR_PATH := vendor/amlogic/ampere/ BOARD_WIDEVINE_TA_PATH := vendor/amlogic/ #AB_OTA_UPDATER :=true +#BUILD_WITH_AVB := true ifeq ($(AB_OTA_UPDATER),true) AB_OTA_PARTITIONS := \ @@ -70,10 +71,29 @@ AB_OTA_PARTITIONS := \ TARGET_BOOTLOADER_CONTROL_BLOCK := true TARGET_NO_RECOVERY := true +ifneq ($(BUILD_WITH_AVB),true) TARGET_PARTITION_DTSI := partition_mbox_ab.dtsi else +TARGET_PARTITION_DTSI := partition_mbox_ab_avb.dtsi +endif +else TARGET_NO_RECOVERY := false -TARGET_PARTITION_DTSI := partition_mbox_normal.dtsi +ifeq ($(ANDROID_BUILD_TYPE), 64) +TARGET_PARTITION_DTSI := partition_mbox_normal_P_64.dtsi +ifneq ($(BUILD_WITH_AVB),true) +TARGET_FIRMWARE_DTSI := firmware_normal.dtsi +else +TARGET_FIRMWARE_DTSI := firmware_avb.dtsi +endif +else +TARGET_PARTITION_DTSI := partition_mbox_normal_P_32.dtsi +ifneq ($(BUILD_WITH_AVB),true) +TARGET_FIRMWARE_DTSI := firmware_normal.dtsi +else +TARGET_FIRMWARE_DTSI := firmware_avb.dtsi +endif +endif + BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 endif @@ -139,41 +159,18 @@ PRODUCT_PACKAGES += \ slideshow endif ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) -ifeq ($(AB_OTA_UPDATER),true) -ifeq ($(BUILD_WITH_DM_VERITY), true) -PRODUCT_COPY_FILES += \ - device/amlogic/darwin/fstab.AB.verity.amlogic:root/fstab.amlogic -else -PRODUCT_COPY_FILES += \ - device/amlogic/darwin/fstab.AB.amlogic:root/fstab.amlogic -endif -else -ifeq ($(BUILD_WITH_DM_VERITY), true) -PRODUCT_COPY_FILES += \ - device/amlogic/darwin/fstab.verity.amlogic:root/fstab.amlogic -else PRODUCT_COPY_FILES += \ device/amlogic/darwin/fstab.amlogic:root/fstab.amlogic -endif -endif -else -ifeq ($(AB_OTA_UPDATER),true) -ifeq ($(BUILD_WITH_DM_VERITY), true) -PRODUCT_COPY_FILES += \ - device/amlogic/darwin/fstab.AB.verity.amlogic:recovery/root/fstab.amlogic -else -PRODUCT_COPY_FILES += \ - device/amlogic/darwin/fstab.AB.amlogic:recovery/root/fstab.amlogic -endif -else -ifeq ($(BUILD_WITH_DM_VERITY), true) -PRODUCT_COPY_FILES += \ - device/amlogic/darwin/fstab.verity.amlogic:recovery/root/fstab.amlogic else PRODUCT_COPY_FILES += \ device/amlogic/darwin/fstab.amlogic:recovery/root/fstab.amlogic endif -endif + +ifeq ($(BUILD_WITH_AVB),true) +BOARD_AVB_ENABLE := true +BOARD_AVB_ALGORITHM := SHA256_RSA2048 +BOARD_AVB_KEY_PATH := device/amlogic/common/security/testkey_rsa2048.pem +BOARD_AVB_ROLLBACK_INDEX := 0 endif ######################################################################### @@ -344,6 +341,12 @@ PRODUCT_COPY_FILES += \ # A/B update # ######################################################################### +ifeq ($(BUILD_WITH_AVB),true) +PRODUCT_PACKAGES += \ + bootctrl.avb \ + libavb_user +endif + ifeq ($(AB_OTA_UPDATER),true) PRODUCT_PACKAGES += \ bootctrl.amlogic \ diff --git a/fstab.AB.amlogic b/fstab.AB.amlogic deleted file mode 100644 index c1a642a..0000000 --- a/fstab.AB.amlogic +++ b/dev/null @@ -1,14 +0,0 @@ -# Android fstab file. -# -# The filesystem that contains the filesystem checker binary (typically /system) cannot -# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK - -/dev/block/platform/d0074000.emmc/misc /misc emmc defaults defaults -/dev/block/data /data ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,fileencryption=aes-256-xts,quota,formattable -/devices/*.sd/mmc_host/sd* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata -/devices/*dwc3/xhci-hcd.0.auto/usb?/*/host*/target*/block/sd* auto auto defaults voldmanaged=usb:auto,encryptable=userdata -/devices/*dwc3/xhci-hcd.0.auto/usb?/*/host*/target*/block/sr* auto auto defaults voldmanaged=sr0:auto,encryptable=userdata -/dev/block/loop auto loop defaults voldmanaged=loop:auto -# Add for zram. zramsize can be in numeric (byte) , in percent -/dev/block/zram0 /swap_zram0 swap defaults wait,zramsize=524288000 -/dev/block/tee /tee ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,formattable diff --git a/fstab.AB.verity.amlogic b/fstab.AB.verity.amlogic deleted file mode 100644 index c1a642a..0000000 --- a/fstab.AB.verity.amlogic +++ b/dev/null @@ -1,14 +0,0 @@ -# Android fstab file. -# -# The filesystem that contains the filesystem checker binary (typically /system) cannot -# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK - -/dev/block/platform/d0074000.emmc/misc /misc emmc defaults defaults -/dev/block/data /data ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,fileencryption=aes-256-xts,quota,formattable -/devices/*.sd/mmc_host/sd* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata -/devices/*dwc3/xhci-hcd.0.auto/usb?/*/host*/target*/block/sd* auto auto defaults voldmanaged=usb:auto,encryptable=userdata -/devices/*dwc3/xhci-hcd.0.auto/usb?/*/host*/target*/block/sr* auto auto defaults voldmanaged=sr0:auto,encryptable=userdata -/dev/block/loop auto loop defaults voldmanaged=loop:auto -# Add for zram. zramsize can be in numeric (byte) , in percent -/dev/block/zram0 /swap_zram0 swap defaults wait,zramsize=524288000 -/dev/block/tee /tee ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,formattable diff --git a/fstab.amlogic b/fstab.amlogic index 8640511..6a80651 100644 --- a/fstab.amlogic +++ b/fstab.amlogic @@ -6,6 +6,7 @@ /dev/block/misc /misc emmc defaults defaults /dev/block/data /data ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,fileencryption=aes-256-xts,quota,formattable /dev/block/cache /cache ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,formattable +/dev/block/metadata /metadata ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,formattable /devices/*.sd/mmc_host/sd* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata /devices/*dwc3/xhci-hcd.0.auto/usb?/*/host*/target*/block/sd* auto auto defaults voldmanaged=usb:auto,encryptable=userdata /devices/*dwc3/xhci-hcd.0.auto/usb?/*/host*/target*/block/sr* auto auto defaults voldmanaged=sr0:auto,encryptable=userdata diff --git a/fstab.verity.amlogic b/fstab.verity.amlogic deleted file mode 100644 index 8640511..0000000 --- a/fstab.verity.amlogic +++ b/dev/null @@ -1,16 +0,0 @@ -# Android fstab file. -# -# The filesystem that contains the filesystem checker binary (typically /system) cannot -# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK - -/dev/block/misc /misc emmc defaults defaults -/dev/block/data /data ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,fileencryption=aes-256-xts,quota,formattable -/dev/block/cache /cache ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,formattable -/devices/*.sd/mmc_host/sd* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata -/devices/*dwc3/xhci-hcd.0.auto/usb?/*/host*/target*/block/sd* auto auto defaults voldmanaged=usb:auto,encryptable=userdata -/devices/*dwc3/xhci-hcd.0.auto/usb?/*/host*/target*/block/sr* auto auto defaults voldmanaged=sr0:auto,encryptable=userdata -/dev/block/loop auto loop defaults voldmanaged=loop:auto -/dev/block/param /param ext4 noatime,nosuid,nodev,nomblk_io_submit,errors=remount-ro wait,check,formattable -# Add for zram. zramsize can be in numeric (byte) , in percent -/dev/block/zram0 /swap_zram0 swap defaults wait,zramsize=524288000 -/dev/block/tee /tee ext4 noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic wait,check,formattable diff --git a/recovery/recovery.fstab b/recovery/recovery.fstab index 4c91808..db1f5cf 100644 --- a/recovery/recovery.fstab +++ b/recovery/recovery.fstab @@ -1,12 +1,16 @@ #device mountpoint fstype options flags? (fstab version 2) /dev/block/bootloader /bootloader emmc defaults defaults /dev/block/logo /logo emmc defaults defaults +/dev/block/vbmeta /vbmeta emmc defaults defaults /dev/block/recovery /recovery emmc defaults defaults /dev/block/boot /boot emmc defaults defaults /dev/block/misc /misc emmc defaults defaults /dev/block/system /system ext4 defaults defaults /dev/block/vendor /vendor ext4 defaults defaults /dev/block/odm /odm ext4 defaults defaults +/dev/block/product /product ext4 defaults defaults +/dev/block/metadata /metadata ext4 defaults defaults +/dev/block/tee /tee ext4 defaults defaults /dev/block/cache /cache ext4 defaults defaults /dev/block/data /data ext4 defaults encryptable=footer /dev/block/mmcblk1p1 /sdcard vfat defaults defaults diff --git a/upgrade/u-boot.bin.sd.bin b/upgrade/u-boot.bin.sd.bin index 69714e5..aeae343 100644 --- a/upgrade/u-boot.bin.sd.bin +++ b/upgrade/u-boot.bin.sd.bin @@ -1,6 +1,5 @@ -ܘ! kc9EB=s[e -+p Y0Rr9!f$w)hr N}kP"FSVs9 ^# |{h/3i%^ &0 ܆'Nƺ+ozbKb_fZ?ɍ~gGh2 /Ŷ_>s@leP=x"G y!>ζ 7-}⽉ -x9+R4ՕsO$) +iǹ"s7xBU(w~AcwU+0gMAw,3*Y/WLRU>]̔MB2dm޽fkEROgcEDvgrT$G£Ֆ&' i6,z1D4IJ tLIqK~6.&=5-% <4,$     -  - - +  + + -P! -x - - +P! +x + + h#D _p  -2? - +2? + @ -@*`** -@ |@x +@*`** +@ |@ +x  -b  +b   - + qT`RRR -8 -0 +8 +0  R. R 0 -4 -R +4 +R ap -" +" 'K @ ! -, -@Mz +, +@Mz c  @ @@ -2580,574 +2580,557 @@ b   C  -!hS!*h +!hS!*h |  -pҰ - -,  -"A -, - -8Cq +pҰ +,  +"A +, + +Cq c -<+ +<+ 8 p p - -,? - -JQ` -qT -@? -@6@9 -@ + +,? + +JQ` +qT +@? +@6@9 +@ - -c\ + +c\  l @ -p +p -dP` -@X6 +dP` +@X6 @a@ ( - t@a@ -a + t@a@ +a `\ - + -d)AR 80R 8/h 44 -C +d2AR 80R 8/h 44 +C Uh 8`1@p - -:4g - -0 - + +:4g + +0 + ֒/  -@0X " +@0X " & A -@ - -4< +@ +   -Ͱ\`[ +Ͱ\`[ @k@X0k@L - 5` R9c` -`Qt -Ă]R*0P! -\ - + 5` R9c` +`Qt +Ă]R*0P! +\ + $ b -@@Â$at% -`9T - -"82w - -_ -^ЈH% - +@@Â$at% +`9T + +1xC< +"82w + +^ЈH% +^ { + 07 87 @7P6 @\)*Y -nh `6 6az@b~ -BbC9A\`!`4R<0?T -T XDW/  -Ԛ,| -9ȅ, -TbЬؚ1*`  /! XS. +Ԛ  2Dv";d"0.z&֌ $!cH'" -"aH -D< -@B$| *@v",/p&!.fR.R#R4!"#3L5tȿ",, -I 0/@d * - -8L +"aH +D< +@B$| *@v",/p&!.oR.R#R4!"#44t㜒,, +I 0/@d * + - -l -8 - t -<4p9| -"1\ws+@ +`b&R + + t +<4p8| +"{1\ws+@  @hd + -)Zn y xfbr8L t8 +)Zn y xfbr8L t8 k ` -S -@@`SR +S +@@`SR й` ->47P@O<"|>6h +>47P@O<"|>6h -P!N d Xu -X~ -X q#X Rf)pEf<"[!,  - +P!N dXu +X~ +X q#X Rhf)pEf<"[!  + @HPz@% -šl12\)"'T11 +šl12\)"'T11 s  -t -!'Ȅ"'" PAq pX(.< -2T0NF,< ! -_4*&`@ ,zw4]awL#ė AVb -`!KKs - -> -h -" `? -@2S0DTR+Dt~ + d +@9B@7T9B` + > +h +" `? + @ -L -R2*ML +L +R2*ML < q -Rl -m 12 Cq@ +Rl +m 1D Cq@ Re"js|Y R\0 \T.Y -h-d$A -C -" +h-m$A +C +" %A* - - (t -# - -9 -{3&@9 - -9 d! -"=>0  - -' - !$ -A -94 + + +# + +{&@9 + +"F>0  +' + +}\W$R + !@$ +A֪84 \ -t"$S"R: - -6[d=T[_=X"Z=P!R@ S -!D|{'; -ܬ -dS +t"$S"R: + +6[m=T[h=X"c=P!R@ S +ܬ +dS t -l +l # -"UПT$* - 3S 7a~ -n96**-_ V1  -!@9 -Sdx" -b R0Ll +"UПT$* + 3S 7a~ +n96**-_ V1  +!@9 +Sdx" +b RL0Ll  * \ - -*,`T@ 'P -q9zᄤ#@J - + +*,`T@ 'P +q9zᄤ#@J + -B9: -F@*S -P*x6 -A9 - -d "ldB GL_@. - - +B9: +F@*S + +P*x6 +A9 + +d "ldB GL_I. + +  05 @4 -` -9, R, 4`I -B9` +` +9, R, 4`I +B9` @h - -A9`2A9 + +A9`2A9 <`*a - ;aA9b0A9 -(^ - - - + ;aA9b0A9 +(^ + + - - -$ - - -Ԫє -9kB= + +$ + + +Ԫє8kB= 46st" x $\:@ - -D#A -`8 + +D#A +`8 y -#V -0r9 ) - p -@"- +#V +*hC@A$ 4IC4F\ +0r9 ) + p +@"- \ - -\ -9_ - - -LR!R4-E\ -<,'l8 -" -!<'>r - +@PQK~ +\ + + +LR!R4-E\ +<,'l8 +@" +!&>r + $."$SA - -;TA -0l -h + +;TA +0l +h -R, -1*p -B6cR(= +R, +1%*p +B86cR )= - - -#@06tW -1 -3 + + +#@06tW +1  =S -" - ` @> "@@H !6h1 +" + ` @> "@@H !6h1 @`P -X -M(,0,0|SA - -a0 -"`p48l !X4 - -`_ - +X +M(,0,0|SA + +a0 +"`p48l !X4 + +`_ + @ -B; @~K 0~PvB -r@ - -`$d ?tB9@@ - -B pP? - Hh +03B; @~K 0~PvB +r@ + +`$d HtB9@@ + +B pP? x! < -f@@c -@A*tG0 +f@@c - + 8 -S/ -l.̐0|! 1T` -7yT,@ -4 -0 - +S/ +l.̐0|! 1T` +7yT,@ +4 +r0 +0 + B@<1 -"x +"x  w `4+" -@# - -"T6Pj((#|@ -@` +@# + +"T6Pj((#|@ +@`  "? -D@ - -# -Z? +D@ + +# +Z? @ OI@ - +  -) " -,XPA -9d  -7d$00~ĭ5@G@C@;D(&h10E - -4 -T -9B@%0 - +) " +,XPA +7# + +4X +\T +9B$0 "< -5* -4 -Paۭ -\4$K,,",,< -@ D +5* +Paۭ +\4$K,,",,< @c@ -p BXex"¨ -i - A'< I@  -Ԅ$ ER 1*pEp  @@#8 8% - 8y -@y -]40PTp÷ - -" / - - - "| +pBXex"¨ +i +@2qA + +ER1*pE  @@#8 8% +BRc3 +C0Q"`"0 +@y +]40PTph÷ + + + + "| 9JE -{9\5*!R  -@Т -\#10$C D4v@\@@@RR"}$ *d P8ϒ"/ -h@Ũ-tt[l2 #  - &#AR`% +{9\5*!R  +,Sd +@Т +\#10 +h@Ũ-tt[ l2# + &#AR  -@$Rr -Aj`8 +@$Rr +Aj`8 @9 n` k c bRBL (6_Bbjb8r@ -x|S +x|S -j -{!B!59h@?4 -zp{@k,T`&X95r5aFDb -jE`Fo  - +j +{!B!59h@?4 +jE`Fo  + fA@XfL b-`R -ZaRJ`& С +ZaRJ`& С b-$E -H0`D -D< h -MRB6ȧ|"X -40"H +H0`D +D< h +MRB6ȧ|"X +40!H " !5$ -dxK k 8TB&u -(%<"__ }@@ - - - bC"m$AHVt -x -Cb/+%$v`$ -k4bd!t;} J~$(4!B0/% "D>RI &J - -h - -thͨ$^4 \$`,S*ė3\Cb.ht-Iy@w -@T -4E0| -@ +dxK,z!`k 8TB&u +(%<"__ }@@ + + + bL"m$AHVt +x +Cb/+%$v`$ + +T + +h +thͨ$^4 \$`,S*ė3\C/hbt@Iy@w +@] +4E0| +@ b_p9 ! "`" B -] - - - -5 -4q -$ - !dF< +] + + + +5 +4q +$ +0!\= rLC>`a -0,L"uttg|8O 4p|,i,D ++! @"Q - - $NB@=5( + + $NB@=5( ` -"H -x8D! -v -~ -!/x -3X!` +"H +x8D! +v +~ +!/x +3X!`  !D -TSb@9 +TSb@9 a@9a@9$ a@9 -a"A9z&A9|VA9: a*A9eFA9ZL - -R$ +a"A9z&A9|VA9: a*A9eFA9ZL +R$ S@9b 3_  @@ -3155,298 +3138,289 @@ S@9b    - "@ 4444 BH  HDk 86 -@!TX -ٚ -O* -xX\ ܓ -@ -RC#v -`l|S - + "@ 4444 BH  HDkذ +@!TX +ٚ +O* +xX\ ܓ +@ +RC#v +`l|S + dF -pA@.0 - -VT - d -, -t +pA@.0 + +VT + d +, +t  - -XI+XO& + +XI4XO/ ? -% - -,O@ +% + +,OI <2x$ - - + + `O`$ ` ` -E -K - -&LNl"m@ $ +E +K + +&LNl"m@ $ 6 - + @ -X - - 0 +X + 0  ? ?I` *  -  -3 - :R:R:R 8;9`| - - -Rє +  +3 + :R:R:R`8 < + + +Rє ( -̔ *4Ru@lPja -D, -V*<" -@wHY -"sVT -Z:8k*hK9`jt8 - -"d5x -L -k*""jsf909f 9oys +̔ *4Ru@lPja +D, +V*<" +@HY +SsT +Z:8k*hK9`jt8 + +"d5x +L -P - +P P - -IW( B5+p -/$ - -@ - -\kR@70 - + +IW( B6+p +/$ + +@ + +\j + |"| -@9S%Ru +@9S%Ru "Mglz } 0* - BT`)= +qBTR!= $ӵ -* +* .+t -&#x +&#x -"L$ +"L$ @ -̴S +̴S  - -sL#3MR -bM4F -(` -4B;BF $  hb`F -\aDp5P + +sL#3MR +bM4F +4B;BF $  hb`F -R4 -[y -@ - -DjN -R -0|3* - -d$@9 @95 * @9%@9 * @9,0 *4g0 -=(: -, -BĨI!( +R4 +[ +@ + +DjN +R!  +0|3* + +d$@9 @95 * @9%@9 * @9,0 *4g0 +=(: +, +BĨI!(  T| # (  -2!t +2!t 42` T d - 4,`" "dH -@9!8Dd + 4,`" "dH +@9!8Dd  t 0 >c| -3B -R +3B +R ""bp @@p -U- 3 -0Q`6_ +U, 3 +0Q`6_ - -\# - -"@ + +\# + +"@ ,1 -8 p@b@\ -11L5h5,5DPD@!XABP - " +8 p@b@\ +114h5,4DPD@!XABP + "   -x|x0R: - M!  d - - +x|x0R: + M!  d + -N4 ,.PH>#6 -"H_D -d>aR -H - -D -2RR5 -"@$H - -x - - -@9_<{ SC@pJ -` 9|, 4 - - - 4XxDB@ -- -9By g*" " $ -Y#6 +" +d>aR +H + +D& +2RR5 +"@$H0 + + + + +@9_<{ SC@pJ +` 9|, !L4 + +U + 4XxDB@ +- +9By *" " $ +Y. -,IB,u;`k*@ 2 +,IB,u;`k*@ 2 -@J1 -a. -b  - -B*RH``T -(X32AL! -@ +@J1 +b  + +B*RH``T +(X3p2AL! +@ y - -@ - -f -N -j#KH& - @t? + +@ + +f +j#KH& + @? #@pQ - -0 -TuC8`"@H8 -H8@x<D + +0 +TuC8`"@H8 +H8@x<D )0; ``$ -<#C4@yT+[S@TP"afPm@Ri -ך5 - -"`" -VpD -x9@T.@97R2 +<#C4@yT+[S@TP"afPm@R@i +ך5 + +"`" +VpD +x9@T.@97R2 6 - -9 -ې? - F -"}t -sPAR -D, - -d/ - -x ĵ~X -!s4*"$b - -$"| -K -`6`$Z3+\a -p8 TH y;s + +9 +ې? + F +"}t +sPAR +D, + +d/ + +$ R +x ĵ~X +!s4*"$b + +$"| +K +p8 TH y;s KH D4 - -&dW_R7 |eRBcy%Rd@,"4,pg"L 54X -4 < -"@ -ѧ - D - - -)8!b - - -8_ -`RdH + +&dWP_R47 |eRBcy%Rd@,"4pg"L 54X +4< +ѧ +B a8B8   + D + + +)8!b + + +8_ +`RdH 0X3, -mQ* -\ - - -PsU -#: - -&h `, @ -D( -9aAl` - xE -(U@Ek$8HP!ol -! ti -\)L - -@@,|! - - +mQ* +\ + + +PsU +#: + +&h `, @ +D( + xE +(U@Ek$8HP!ol +! tr +\! L + +@@,|Ā)ܤ + + ` -#| +#| +& | -+* +@P?* Ԛ -0s H% -l**f` -<<P|tC0R4@t -<8 - h +0 H% +l**f` +<<P|tC0R4@t +<8 + \{ R= &70 + h s`= ! -" -"CD S 9 S! -a, +" +a, SA  -}d - +}d + 4 I CaB*aA*0 @@ -3454,156 +3428,152 @@ CaB*aA*0 @  #  AA  -\d -t t -؊8 +\d +؊8 "8A  -p - +p + 2bs `  2v BAj*7< - - - - - + + + + + } -yyyyyy&y6 -r1 -܄p{q -x +yyyyyy&y6 +r1 +܄p{q + : ,l6yoY 1 +x J@9 8@9  -8:d% +8:d% @9 - - - -ku@` + + + @ -@l - - aRj -آǴ - -d -@\!Z"Gi\Y ,| - - -Ti +@l + +آǴ + +d +@\!lZ"Gi\0 -| + + +Ti T  -  +  H.+P}20 - |%)"{to"+#(J3 + |%t)"to"+#(J3  - -"`1 l -! - - -pä -`= -@D -r -@#kp8L? -P + -@ ` + +"`4 u30 +! +"KP! + + +pä +`= +@D +r +@#kp8L? +P + +@ Spp xs@ - h`8L0 -@BXa" +! h`8L4 +@BXa" A c\X -@ -Rc ]'t$b -( -80B6H!`zX* -]Pkb - },/7b Rc@ +@ +Rc]'t$b +( +80B6H!`zX* + },/7b Rc ! C,v 0 -X  `@\<4 -p -@y +X  `@\<4 +p +@y /t0 b0 &!b,PH -`@9! -PHL - +`@9! +PHL + ,* - -w + ` y`@yH -L +L #$88 9C9 yg)25 yL "x - -(pj{Fp - A4d6 -8}RR T8R9!C㶣 + +(pj{Fp + A4d6 + Tu@*@X0 +8}RR T8R9!C㶣 @ @z@@W - d\ -@hD - -@bnA @ -)qyR@ -!q + d\ +@hD + +@bnA @ L9A - - `Gh3E9`8"7 + + `Gh3E9`8"7 l@Sk$ * @@ -4103,100 +4071,102 @@ J  X@@OK @@9 @b - -jL,L,L, - - -p@| -@$th! + +jL,L,L, + + +p@| +@$th!  -%` ( +%` ( dc 88b* 4 -@ +@ P ِ- - -A|}Z - -r94_4`? -D$Cjc[@q[m -$0k - ,0 Ú\k@ -t - - - + +A|}Z + +r94_4`? +D$Cjc[@q[d +$0k + +t + + + L -h -u\B~@H@Bz@Bz +h +l\B~@H@Bz@Bz `ӰВ -Sb -20d(aH4 - - - -x8&z -`=xR -a - -rBD% - -! - -0R$ +@l + +A4 + +"T*"~t@! +,! +d +RpJ9a +l$ +a +8` +R`F9 +.d" +>Sb + +20d(aH4 + + + +x8&z +`=xR +a<$ + +rBH% +#2/ + +! + +0R( d!hb| 3A -|Pxr 8X -Ts2l(=P@ -@! - - -$ -A -` -AA( -A+"##00 - -8_0C"T *"H - -(A - -0 +Oxr 8\ +Js2p,=P@ +@! + + +$ \s +A +d +AA(pR +A+"##0 + +<_4C"S*"H + +$)A + +0 - -"\ -  -$P + +"\ +  +$8  )gpisk_gui X @@ -4205,7 +4175,7 @@ x o 4top @'ed P_shortcut. -@ +@ 5lBɻ@l2u\E Y=ѫ0&: | jm Zjz  ' }Dңhi]Wbgeq6lknv+ӉZzJgo߹ﾎCՎ`~ѡ8ROggW?K6H+ L @@ -4213,245 +4183,243 @@ P_shortcut. m ?6grW TN³9a&g`MGiIwn>JjѮZf @;7SŞϲG0򽽊º0S$6к)WTg#.zfJah]+o*7 Z- n! -w -3 -d +w +d  % - - + J -0 -{ -c0x1234 -  0xe31cfb04 0xb748 -A +0 +c0x1234 +A 2  - -- + +- yD<#*=(LZO   -  - H  H -  - -02 - -#H -x*R&8@h0BX  - +  +EG G +  + +0 + + , O "T " - -H"X + +@ +' +H"X X" " - -#!@ - - - - -( + +" +e X "!' + + + + +( + ( s - >pP -Q - q` + oPt +A +p` Q - - - - sa9q - - - - + + + + sap + + + + 3 4 -/0] -3 -@aml -_m1usbYq cfg: %d - -o poll:0x%x va +/0] +3 +@aml +m1usbq cfg: %d + +o poll:0x%x va -sTX-DWC ]b%04x rr - +sTX-DWC ^]b%04x rrr + - + - - - -i - -Star]U + + + +i + +Star]U - - + + - - - -4^\]=]/; V^ -[e# + + + +7^\]=]/; Y^ +e# - + **S -Y@"%s"1 -dv1# +Y@"%s"1 - + - -"- ' -W -]z-- : %2d ow - -@pass -aml^] : Sig Cf2 %dLTe ARM64 Immagic! - - -DVs| + +"- ' +W +]z-- : %2d /w + +@pass +amla] : Sig Cf2 %dLe ARM64 Immagic! + + +DV3| -J - -0res  - -b"rd - +J + +0res  + +b"rd +  Xbrief" Q 1111 (prerelease) -^monitor,r -  %d: DecryptD F dts,buffer=%p,dtq - -7 -'N -+qa tbp +^monitor,r +  %d: DecryptD F dts,buffer=%p,dtq + +7 +'N +pa tbp : -: -4 - - +: +4 + + n< h< 2crc MHashB  Q -l + +l For -u +ou -C#no -a -k : - +C#no +a +k : +l% [7 availabl OFF -P - +P + 4 -& - +& + ** Un o %sWC - + ipD0anc L fd4 (NULL). - + C< %d - - + + the4 -Abo -MBtag - - +Abo +MBtag + + -fi -'  $ s,w=t: . -" s 4 -m +&i +'  $ s,w=t: +" s +-U 0 bu f -f\*4 @" +f\*4 @"  -8 +8 %3Not - - - -X - + + +~ +X + * - + [ - -f + +f Thi<%<5omeo ` which-x/T T Z0: - 48 +  Ex9 - -Uaa 11+Db 22 + -Uaa 115Db 22 So you>& f - - -ݑ + + + 6  -l I - O +l I + O -A +A -."x +."x -: q[reg] [ -eg: -e؊/ - +: Ůq[reg] [ +eg: +eۊ/ + - + -!q! #~m - +!1! #~m + PBus W hj@ppen= X - - + + mmc-blk# cnt mmf!s<@oX$M 6 "] -8 " - - P=" + - P=" T < J - -ͼ + +  5 N @@ -4466,35 +4434,35 @@ gp ' sEXT_CSD 1[%d L Phs_tiYA%Thr -[HS_TIMING]x -X - + - +[HS_TIMING]x +X + + e5l{?Crath:  - -0x<CLASS_6_CTRLI '0'Y + +0x<CLASS_6_CTRLI '0'Y / -2 ml$.co:oJ +2 mlu$.co:oJ * soEb '5 #x -  Y#K 5 'J") +  Y#K 5 'J") J 2  -K  +K  u& -E"%s-> - ` #D!o - x2i% +OE"%s-> + ` #D!o + x2i%  - -DStalbe:t mb   -g + +DStalbe:t mb  f +g  6! @@ -4502,17 +4470,17 @@ soEb ' F6'onD 6 or --wp +T-wp   - + E 1   -B %Pagainy y +B %Pagainy y 6Y a ZC + / ] a @@ -4526,39 +4494,39 @@ B %Pagainy y C/off iz((F($  - /b + /b )  x+ - + [dtb]e _RES! -f_: - +f_: + C - -gu --- Res[,dmIMAGE_FORMAT_ANDROID> -% - -Z + +ju --- Res[,dmIMAGE_FORMAT_ANDROID> +% + +Z { - -' -H -| + +' -H +| &s.MT?J - + no sA @ USB+.%l@l@l@F usb2- QpXu'p S ry) -, +, !c ez# @@ -4566,13 +4534,13 @@ usb2-  ]0 - - + +  -! -T +! +T ! - +  ra> ~ s @@ -4581,7 +4549,7 @@ s  4 - + < X @nvedit.c @@ -4592,18 +4560,18 @@ q%zX `  - L - -:% - + L + +:% +  -rci AIS  +rci AIS    - +  5 - + GXg c @@ -4627,7 +4595,7 @@ v di r "X - -N + -N  h W#  @@ -4880,397 +4848,408 @@ Bu ) BS!.cz  - - D|bE Y - - - - -.4=%d? - -M@GRSTrv4%0x -%ttrx4R FULLPc m  ؜" !L + + k|bl Y +,-  + + + +uk + +%ttx 5R FULLіwc  " !s - -8KF3 - - - - - -@"c -m -z -%b -~F -No c#fsewv!4/%s. -  -< -# -= cyD L o)l2Env7 - - - - -@#: - -T#guZ_U - OFFER/ACK -!ou b%pI4 (< ), - 4MAC - -)pM -i + +_Km3 + +z + + + + +@Ic +m + +%b +F +No c#fs&ev#"4/%s. +  +< +Y +# += cyk L o)2Env&8 + + +; + +g#: + +BT#gu_U + OFFER/ACK +!ou b%pI4 (< ), + 4MAC + +)pM +i  -$ - +$ + -TFTP^& +TFTP& - F -P[ -l - -~ - - -_ -/ + F +/P[ +k + +~ + + + +_ + +/  L -P - -G@[argF]mCappl"toh1 paH>'L - ) - G - uC '-'bU!e 96 +P + + ) + G + uC '-'U!e :6 -F_ - T.)2WcludeD - ^<2g_u{-1D -l - as. +F_ + |.*2WcludeD + 5^<2g_u{-1D +l + 3as. -Sub-@w4l  F* -Bdkvi)(@bAok tl - G  =#Ros -U.$OS" G4 -  +Sub-hx4  F* +jdvi)(hbAok t + #Ros -V.$OS"3G4 - " bZ 5 - v ' - goLsP OS< 8 - V - Q92d3RAWS + v ' + goMPOS + V + y9Zd3RAWS Sincewp -2 -O -/X( -/( - -P? - -RB[to  -fd6P - -i2cGUpA -*$ ? -/ -X?t).  - - -/|  -0 / -( - -[3d_S!] -Q -t - $: oF!s rh* -R -; -eJ [-P-b | cB[-s {w -'*?#   -( - /(( - ( -)  -( - - -h ` h(1 ->~ -  +#Ҍ + +O +/X( +/( + +P? + +RB[to  +fd6x + +i2coUpA +ߠ/0( +*  ? +/ +X/t( + + +/|  +0 / +( + +[[d_S!] +y +t + $: pF!s h* +R +; +eJ [-DP-b | cB[-s {w +'*?#   +( + ( +)  +D/ +( + + +hB. +>~ +  $ -$ -p(; +$ +p(;  - - @z:S1 - (20$00 /,mX0 #/Ph(1 - + + @z:S1 + (8 + #e(A1@ /v) hP -P, -~ -`f - -y -( ^4 -#/p>x) -h/0 -8/8s*K -ULU - -   -tvD_0p -/> +P, +~ +2#2x +`f + +y +( ^P*1P./1x4 #H0)0(/Q| + +x) +h/0 +8( +ULU + +   +tvD_0p +/> ^ -_ -v -fC= -d +_ +v +fC= +d *6 E1 88< -tc$c(c,c0c4cc(c,cdccj -9 2Tf8"eh{ - R - -@@> - -xH - - -H?H n+I8m/I m+IPl -P?K n?XL R` -+L%nM -xP -0 - - -h -?(W (t -H - -;] vx] [0 -H/d1d) -/d1d)e(G -/ee) -(hH -`/ee)eK -/ee1e5 -X/fg8g - H -p - -H/h:8 -/@8 -/h8 -/  -(/ -X -$P -x+X  - -H -x - -8 -p -x -0 -H` - -8 -0 -h -p -x -  -Xp - - -` -P -0x -h - -8 -p8 -` - -(` -0x -h - -X -` - -H -@p -` - - -8` -8?X 8 -$8 -H -X - -x/ -x -x?H X -Hh -P + + + + +8 +80 +8H +8` +8x +8 +8 +8 +80 +0+ +p/` +8H +P`H +H +/    +/   +/ +/x!!! +/!( +/ +b/,@  +H +/ +/x- -  +h/-  +/. +/@. +` +/h. +hx +/.p.p. +/.p  +//p +H/@/p +/h/p +//8 +//8/ / +(//8/  +`/080  +/0080  +/X080  +/080  +@/00  +x/00  +/01  +/ 11  + /H11  +X/p11  +/118 +/1181  + +p/8228 +،X +/`228 +/228 +/228 +P/2282` +/ +/(3383`H +/P3383 p +0/x3383  +h/338 +/338 +/3384 +/44848 +H/@448/4 I` +/h4484p/4 X8 +/484p + +8/484p +/H5@5 +/p5@5@ +/5@5@5 +@/5@5@5 +x/5@8= +( +0/=@=8 +h/=@=8 +H +/>@>x + + +xH + +x/>@>@ + + +G>g +?I l?J XS +P?K n?hL Rp ++L%xo*M +0 + +x +?T s?PU +h +?V s$0W +?8W (t +H+W&2e + +H  +( +P;Z s` xZp +1H/\ u +0<\ u] 0H  +;^ `u0] \ +H/d1d) +/ +/(ee) +(/xee)e +`/ee)eK +/ee1e5 +/0ggx +p ++PB +H/(h:H +/P8 +/x8 +/  +(/Ȁ +P +X +$` +x+h`W + +H + + +8; `B +H` + + +0 +Hp +H +0 +x +x +0 +X + + +8 0 +p +P +0 +h +( +8  +pH +p + +8` +0 +h +( +X +` + +X +@ +p + + +8` ++X  +8?h 8 +$H ++X8 + +x/ +xX` +Hx +P diff --git a/upgrade/u-boot.bin.usb.bl2 b/upgrade/u-boot.bin.usb.bl2 index 6d301e4..6373af7 100644 --- a/upgrade/u-boot.bin.usb.bl2 +++ b/upgrade/u-boot.bin.usb.bl2 @@ -1,4 +1,4 @@ -ܘ! kc9EB=@AML +iǹ"s7x@AML 2? diff --git a/upgrade/u-boot.bin.usb.tpl b/upgrade/u-boot.bin.usb.tpl index c799fe0..cc5fff5 100644 --- a/upgrade/u-boot.bin.usb.tpl +++ b/upgrade/u-boot.bin.usb.tpl @@ -2341,41 +2341,42 @@ This will cause memory leakage. aml-sha1 ;3+#>6.&=5-% <4,$     -  - - +  + + -P! -x - - +P! +x + + h#D _p  -2? - +2? + @ -@*`** -@ |@x +@*`** +@ |@ +x  -b  +b   - + qT`RRR -8 -0 +8 +0  R. R 0 -4 -R +4 +R ap -" +" 'K @ ! -, -@Mz +, +@Mz c  @ @@ -2385,574 +2386,557 @@ b   C  -!hS!*h +!hS!*h |  -pҰ - -,  -"A -, - -8Cq +pҰ +,  +"A +, + +Cq c -<+ +<+ 8 p p - -,? - -JQ` -qT -@? -@6@9 -@ + +,? + +JQ` +qT +@? +@6@9 +@ - -c\ + +c\  l @ -p +p -dP` -@X6 +dP` +@X6 @a@ ( - t@a@ -a + t@a@ +a `\ - + -d)AR 80R 8/h 44 -C +d2AR 80R 8/h 44 +C Uh 8`1@p - -:4g - -0 - + +:4g + +0 + ֒/  -@0X " +@0X " & A -@ - -4< +@ +   -Ͱ\`[ +Ͱ\`[ @k@X0k@L - 5` R9c` -`Qt -Ă]R*0P! -\ - + 5` R9c` +`Qt +Ă]R*0P! +\ + $ b -@@Â$at% -`9T - -"82w - -_ -^ЈH% - +@@Â$at% +`9T + +1xC< +"82w + +^ЈH% +^ { + 07 87 @7P6 @\)*Y -nh `6 6az@b~ -BbC9A\`!`4R<0?T -T XDW/  -Ԛ,| -9ȅ, -TbЬؚ1*`  /! XS. +Ԛ  2Dv";d"0.z&֌ $!cH'" -"aH -D< -@B$| *@v",/p&!.fR.R#R4!"#3L5tȿ",, -I 0/@d * - -8L +"aH +D< +@B$| *@v",/p&!.oR.R#R4!"#44t㜒,, +I 0/@d * + - -l -8 - t -<4p9| -"1\ws+@ +`b&R + + t +<4p8| +"{1\ws+@  @hd + -)Zn y xfbr8L t8 +)Zn y xfbr8L t8 k ` -S -@@`SR +S +@@`SR й` ->47P@O<"|>6h +>47P@O<"|>6h -P!N d Xu -X~ -X q#X Rf)pEf<"[!,  - +P!N dXu +X~ +X q#X Rhf)pEf<"[!  + @HPz@% -šl12\)"'T11 +šl12\)"'T11 s  -t -!'Ȅ"'" PAq pX(.< -2T0NF,< ! -_4*&`@ ,zw4]awL#ė AVb -`!KKs - -> -h -" `? -@2S0DTR+Dt~ + d +@9B@7T9B` + > +h +" `? + @ -L -R2*ML +L +R2*ML < q -Rl -m 12 Cq@ +Rl +m 1D Cq@ Re"js|Y R\0 \T.Y -h-d$A -C -" +h-m$A +C +" %A* - - (t -# - -9 -{3&@9 - -9 d! -"=>0  - -' - !$ -A -94 + + +# + +{&@9 + +"F>0  +' + +}\W$R + !@$ +A֪84 \ -t"$S"R: - -6[d=T[_=X"Z=P!R@ S -!D|{'; -ܬ -dS +t"$S"R: + +6[m=T[h=X"c=P!R@ S +ܬ +dS t -l +l # -"UПT$* - 3S 7a~ -n96**-_ V1  -!@9 -Sdx" -b R0Ll +"UПT$* + 3S 7a~ +n96**-_ V1  +!@9 +Sdx" +b RL0Ll  * \ - -*,`T@ 'P -q9zᄤ#@J - + +*,`T@ 'P +q9zᄤ#@J + -B9: -F@*S -P*x6 -A9 - -d "ldB GL_@. - - +B9: +F@*S + +P*x6 +A9 + +d "ldB GL_I. + +  05 @4 -` -9, R, 4`I -B9` +` +9, R, 4`I +B9` @h - -A9`2A9 + +A9`2A9 <`*a - ;aA9b0A9 -(^ - - - + ;aA9b0A9 +(^ + + - - -$ - - -Ԫє -9kB= + +$ + + +Ԫє8kB= 46st" x $\:@ - -D#A -`8 + +D#A +`8 y -#V -0r9 ) - p -@"- +#V +*hC@A$ 4IC4F\ +0r9 ) + p +@"- \ - -\ -9_ - - -LR!R4-E\ -<,'l8 -" -!<'>r - +@PQK~ +\ + + +LR!R4-E\ +<,'l8 +@" +!&>r + $."$SA - -;TA -0l -h + +;TA +0l +h -R, -1*p -B6cR(= +R, +1%*p +B86cR )= - - -#@06tW -1 -3 + + +#@06tW +1  =S -" - ` @> "@@H !6h1 +" + ` @> "@@H !6h1 @`P -X -M(,0,0|SA - -a0 -"`p48l !X4 - -`_ - +X +M(,0,0|SA + +a0 +"`p48l !X4 + +`_ + @ -B; @~K 0~PvB -r@ - -`$d ?tB9@@ - -B pP? - Hh +03B; @~K 0~PvB +r@ + +`$d HtB9@@ + +B pP? x! < -f@@c -@A*tG0 +f@@c - + 8 -S/ -l.̐0|! 1T` -7yT,@ -4 -0 - +S/ +l.̐0|! 1T` +7yT,@ +4 +r0 +0 + B@<1 -"x +"x  w `4+" -@# - -"T6Pj((#|@ -@` +@# + +"T6Pj((#|@ +@`  "? -D@ - -# -Z? +D@ + +# +Z? @ OI@ - +  -) " -,XPA -9d  -7d$00~ĭ5@G@C@;D(&h10E - -4 -T -9B@%0 - +) " +,XPA +7# + +4X +\T +9B$0 "< -5* -4 -Paۭ -\4$K,,",,< -@ D +5* +Paۭ +\4$K,,",,< @c@ -p BXex"¨ -i - A'< I@  -Ԅ$ ER 1*pEp  @@#8 8% - 8y -@y -]40PTp÷ - -" / - - - "| +pBXex"¨ +i +@2qA + +ER1*pE  @@#8 8% +BRc3 +C0Q"`"0 +@y +]40PTph÷ + + + + "| 9JE -{9\5*!R  -@Т -\#10$C D4v@\@@@RR"}$ *d P8ϒ"/ -h@Ũ-tt[l2 #  - &#AR`% +{9\5*!R  +,Sd +@Т +\#10 +h@Ũ-tt[ l2# + &#AR  -@$Rr -Aj`8 +@$Rr +Aj`8 @9 n` k c bRBL (6_Bbjb8r@ -x|S +x|S -j -{!B!59h@?4 -zp{@k,T`&X95r5aFDb -jE`Fo  - +j +{!B!59h@?4 +jE`Fo  + fA@XfL b-`R -ZaRJ`& С +ZaRJ`& С b-$E -H0`D -D< h -MRB6ȧ|"X -40"H +H0`D +D< h +MRB6ȧ|"X +40!H " !5$ -dxK k 8TB&u -(%<"__ }@@ - - - bC"m$AHVt -x -Cb/+%$v`$ -k4bd!t;} J~$(4!B0/% "D>RI &J - -h - -thͨ$^4 \$`,S*ė3\Cb.ht-Iy@w -@T -4E0| -@ +dxK,z!`k 8TB&u +(%<"__ }@@ + + + bL"m$AHVt +x +Cb/+%$v`$ + +T + +h +thͨ$^4 \$`,S*ė3\C/hbt@Iy@w +@] +4E0| +@ b_p9 ! "`" B -] - - - -5 -4q -$ - !dF< +] + + + +5 +4q +$ +0!\= rLC>`a -0,L"uttg|8O 4p|,i,D ++! @"Q - - $NB@=5( + + $NB@=5( ` -"H -x8D! -v -~ -!/x -3X!` +"H +x8D! +v +~ +!/x +3X!`  !D -TSb@9 +TSb@9 a@9a@9$ a@9 -a"A9z&A9|VA9: a*A9eFA9ZL - -R$ +a"A9z&A9|VA9: a*A9eFA9ZL +R$ S@9b 3_  @@ -2960,298 +2944,289 @@ S@9b    - "@ 4444 BH  HDk 86 -@!TX -ٚ -O* -xX\ ܓ -@ -RC#v -`l|S - + "@ 4444 BH  HDkذ +@!TX +ٚ +O* +xX\ ܓ +@ +RC#v +`l|S + dF -pA@.0 - -VT - d -, -t +pA@.0 + +VT + d +, +t  - -XI+XO& + +XI4XO/ ? -% - -,O@ +% + +,OI <2x$ - - + + `O`$ ` ` -E -K - -&LNl"m@ $ +E +K + +&LNl"m@ $ 6 - + @ -X - - 0 +X + 0  ? ?I` *  -  -3 - :R:R:R 8;9`| - - -Rє +  +3 + :R:R:R`8 < + + +Rє ( -̔ *4Ru@lPja -D, -V*<" -@wHY -"sVT -Z:8k*hK9`jt8 - -"d5x -L -k*""jsf909f 9oys +̔ *4Ru@lPja +D, +V*<" +@HY +SsT +Z:8k*hK9`jt8 + +"d5x +L -P - +P P - -IW( B5+p -/$ - -@ - -\kR@70 - + +IW( B6+p +/$ + +@ + +\j + |"| -@9S%Ru +@9S%Ru "Mglz } 0* - BT`)= +qBTR!= $ӵ -* +* .+t -&#x +&#x -"L$ +"L$ @ -̴S +̴S  - -sL#3MR -bM4F -(` -4B;BF $  hb`F -\aDp5P + +sL#3MR +bM4F +4B;BF $  hb`F -R4 -[y -@ - -DjN -R -0|3* - -d$@9 @95 * @9%@9 * @9,0 *4g0 -=(: -, -BĨI!( +R4 +[ +@ + +DjN +R!  +0|3* + +d$@9 @95 * @9%@9 * @9,0 *4g0 +=(: +, +BĨI!(  T| # (  -2!t +2!t 42` T d - 4,`" "dH -@9!8Dd + 4,`" "dH +@9!8Dd  t 0 >c| -3B -R +3B +R ""bp @@p -U- 3 -0Q`6_ +U, 3 +0Q`6_ - -\# - -"@ + +\# + +"@ ,1 -8 p@b@\ -11L5h5,5DPD@!XABP - " +8 p@b@\ +114h5,4DPD@!XABP + "   -x|x0R: - M!  d - - +x|x0R: + M!  d + -N4 ,.PH>#6 -"H_D -d>aR -H - -D -2RR5 -"@$H - -x - - -@9_<{ SC@pJ -` 9|, 4 - - - 4XxDB@ -- -9By g*" " $ -Y#6 +" +d>aR +H + +D& +2RR5 +"@$H0 + + + + +@9_<{ SC@pJ +` 9|, !L4 + +U + 4XxDB@ +- +9By *" " $ +Y. -,IB,u;`k*@ 2 +,IB,u;`k*@ 2 -@J1 -a. -b  - -B*RH``T -(X32AL! -@ +@J1 +b  + +B*RH``T +(X3p2AL! +@ y - -@ - -f -N -j#KH& - @t? + +@ + +f +j#KH& + @? #@pQ - -0 -TuC8`"@H8 -H8@x<D + +0 +TuC8`"@H8 +H8@x<D )0; ``$ -<#C4@yT+[S@TP"afPm@Ri -ך5 - -"`" -VpD -x9@T.@97R2 +<#C4@yT+[S@TP"afPm@R@i +ך5 + +"`" +VpD +x9@T.@97R2 6 - -9 -ې? - F -"}t -sPAR -D, - -d/ - -x ĵ~X -!s4*"$b - -$"| -K -`6`$Z3+\a -p8 TH y;s + +9 +ې? + F +"}t +sPAR +D, + +d/ + +$ R +x ĵ~X +!s4*"$b + +$"| +K +p8 TH y;s KH D4 - -&dW_R7 |eRBcy%Rd@,"4,pg"L 54X -4 < -"@ -ѧ - D - - -)8!b - - -8_ -`RdH + +&dWP_R47 |eRBcy%Rd@,"4pg"L 54X +4< +ѧ +B a8B8   + D + + +)8!b + + +8_ +`RdH 0X3, -mQ* -\ - - -PsU -#: - -&h `, @ -D( -9aAl` - xE -(U@Ek$8HP!ol -! ti -\)L - -@@,|! - - +mQ* +\ + + +PsU +#: + +&h `, @ +D( + xE +(U@Ek$8HP!ol +! tr +\! L + +@@,|Ā)ܤ + + ` -#| +#| +& | -+* +@P?* Ԛ -0s H% -l**f` -<<P|tC0R4@t -<8 - h +0 H% +l**f` +<<P|tC0R4@t +<8 + \{ R= &70 + h s`= ! -" -"CD S 9 S! -a, +" +a, SA  -}d - +}d + 4 I CaB*aA*0 @@ -3259,156 +3234,152 @@ CaB*aA*0 @  #  AA  -\d -t t -؊8 +\d +؊8 "8A  -p - +p + 2bs `  2v BAj*7< - - - - - + + + + + } -yyyyyy&y6 -r1 -܄p{q -x +yyyyyy&y6 +r1 +܄p{q + : ,l6yoY 1 +x J@9 8@9  -8:d% +8:d% @9 - - - -ku@` + + + @ -@l - - aRj -آǴ - -d -@\!Z"Gi\Y ,| - - -Ti +@l + +آǴ + +d +@\!lZ"Gi\0 -| + + +Ti T  -  +  H.+P}20 - |%)"{to"+#(J3 + |%t)"to"+#(J3  - -"`1 l -! - - -pä -`= -@D -r -@#kp8L? -P + -@ ` + +"`4 u30 +! +"KP! + + +pä +`= +@D +r +@#kp8L? +P + +@ Spp xs@ - h`8L0 -@BXa" +! h`8L4 +@BXa" A c\X -@ -Rc ]'t$b -( -80B6H!`zX* -]Pkb - },/7b Rc@ +@ +Rc]'t$b +( +80B6H!`zX* + },/7b Rc ! C,v 0 -X  `@\<4 -p -@y +X  `@\<4 +p +@y /t0 b0 &!b,PH -`@9! -PHL - +`@9! +PHL + ,* - -w + ` y`@yH -L +L #$88 9C9 yg)25 yL "x - -(pj{Fp - A4d6 -8}RR T8R9!C㶣 + +(pj{Fp + A4d6 + Tu@*@X0 +8}RR T8R9!C㶣 @ @z@@W - d\ -@hD - -@bnA @ -)qyR@ -!q + d\ +@hD + +@bnA @ L9A - - `Gh3E9`8"7 + + `Gh3E9`8"7 l@Sk$ * @@ -3908,100 +3877,102 @@ J  X@@OK @@9 @b - -jL,L,L, - - -p@| -@$th! + +jL,L,L, + + +p@| +@$th!  -%` ( +%` ( dc 88b* 4 -@ +@ P ِ- - -A|}Z - -r94_4`? -D$Cjc[@q[m -$0k - ,0 Ú\k@ -t - - - + +A|}Z + +r94_4`? +D$Cjc[@q[d +$0k + +t + + + L -h -u\B~@H@Bz@Bz +h +l\B~@H@Bz@Bz `ӰВ -Sb -20d(aH4 - - - -x8&z -`=xR -a - -rBD% - -! - -0R$ +@l + +A4 + +"T*"~t@! +,! +d +RpJ9a +l$ +a +8` +R`F9 +.d" +>Sb + +20d(aH4 + + + +x8&z +`=xR +a<$ + +rBH% +#2/ + +! + +0R( d!hb| 3A -|Pxr 8X -Ts2l(=P@ -@! - - -$ -A -` -AA( -A+"##00 - -8_0C"T *"H - -(A - -0 +Oxr 8\ +Js2p,=P@ +@! + + +$ \s +A +d +AA(pR +A+"##0 + +<_4C"S*"H + +$)A + +0 - -"\ -  -$P + +"\ +  +$8  )gpisk_gui X @@ -4010,7 +3981,7 @@ x o 4top @'ed P_shortcut. -@ +@ 5lBɻ@l2u\E Y=ѫ0&: | jm Zjz  ' }Dңhi]Wbgeq6lknv+ӉZzJgo߹ﾎCՎ`~ѡ8ROggW?K6H+ L @@ -4018,245 +3989,243 @@ P_shortcut. m ?6grW TN³9a&g`MGiIwn>JjѮZf @;7SŞϲG0򽽊º0S$6к)WTg#.zfJah]+o*7 Z- n! -w -3 -d +w +d  % - - + J -0 -{ -c0x1234 -  0xe31cfb04 0xb748 -A +0 +c0x1234 +A 2  - -- + +- yD<#*=(LZO   -  - H  H -  - -02 - -#H -x*R&8@h0BX  - +  +EG G +  + +0 + + , O "T " - -H"X + +@ +' +H"X X" " - -#!@ - - - - -( + +" +e X "!' + + + + +( + ( s - >pP -Q - q` + oPt +A +p` Q - - - - sa9q - - - - + + + + sap + + + + 3 4 -/0] -3 -@aml -_m1usbYq cfg: %d - -o poll:0x%x va +/0] +3 +@aml +m1usbq cfg: %d + +o poll:0x%x va -sTX-DWC ]b%04x rr - +sTX-DWC ^]b%04x rrr + - + - - - -i - -Star]U + + + +i + +Star]U - - + + - - - -4^\]=]/; V^ -[e# + + + +7^\]=]/; Y^ +e# - + **S -Y@"%s"1 -dv1# +Y@"%s"1 - + - -"- ' -W -]z-- : %2d ow - -@pass -aml^] : Sig Cf2 %dLTe ARM64 Immagic! - - -DVs| + +"- ' +W +]z-- : %2d /w + +@pass +amla] : Sig Cf2 %dLe ARM64 Immagic! + + +DV3| -J - -0res  - -b"rd - +J + +0res  + +b"rd +  Xbrief" Q 1111 (prerelease) -^monitor,r -  %d: DecryptD F dts,buffer=%p,dtq - -7 -'N -+qa tbp +^monitor,r +  %d: DecryptD F dts,buffer=%p,dtq + +7 +'N +pa tbp : -: -4 - - +: +4 + + n< h< 2crc MHashB  Q -l + +l For -u +ou -C#no -a -k : - +C#no +a +k : +l% [7 availabl OFF -P - +P + 4 -& - +& + ** Un o %sWC - + ipD0anc L fd4 (NULL). - + C< %d - - + + the4 -Abo -MBtag - - +Abo +MBtag + + -fi -'  $ s,w=t: . -" s 4 -m +&i +'  $ s,w=t: +" s +-U 0 bu f -f\*4 @" +f\*4 @"  -8 +8 %3Not - - - -X - + + +~ +X + * - + [ - -f + +f Thi<%<5omeo ` which-x/T T Z0: - 48 +  Ex9 - -Uaa 11+Db 22 + -Uaa 115Db 22 So you>& f - - -ݑ + + + 6  -l I - O +l I + O -A +A -."x +."x -: q[reg] [ -eg: -e؊/ - +: Ůq[reg] [ +eg: +eۊ/ + - + -!q! #~m - +!1! #~m + PBus W hj@ppen= X - - + + mmc-blk# cnt mmf!s<@oX$M 6 "] -8 " - - P=" + - P=" T < J - -ͼ + +  5 N @@ -4271,35 +4240,35 @@ gp ' sEXT_CSD 1[%d L Phs_tiYA%Thr -[HS_TIMING]x -X - + - +[HS_TIMING]x +X + + e5l{?Crath:  - -0x<CLASS_6_CTRLI '0'Y + +0x<CLASS_6_CTRLI '0'Y / -2 ml$.co:oJ +2 mlu$.co:oJ * soEb '5 #x -  Y#K 5 'J") +  Y#K 5 'J") J 2  -K  +K  u& -E"%s-> - ` #D!o - x2i% +OE"%s-> + ` #D!o + x2i%  - -DStalbe:t mb   -g + +DStalbe:t mb  f +g  6! @@ -4307,17 +4276,17 @@ soEb ' F6'onD 6 or --wp +T-wp   - + E 1   -B %Pagainy y +B %Pagainy y 6Y a ZC + / ] a @@ -4331,39 +4300,39 @@ B %Pagainy y C/off iz((F($  - /b + /b )  x+ - + [dtb]e _RES! -f_: - +f_: + C - -gu --- Res[,dmIMAGE_FORMAT_ANDROID> -% - -Z + +ju --- Res[,dmIMAGE_FORMAT_ANDROID> +% + +Z { - -' -H -| + +' -H +| &s.MT?J - + no sA @ USB+.%l@l@l@F usb2- QpXu'p S ry) -, +, !c ez# @@ -4371,13 +4340,13 @@ usb2-  ]0 - - + +  -! -T +! +T ! - +  ra> ~ s @@ -4386,7 +4355,7 @@ s  4 - + < X @nvedit.c @@ -4397,18 +4366,18 @@ q%zX `  - L - -:% - + L + +:% +  -rci AIS  +rci AIS    - +  5 - + GXg c @@ -4432,7 +4401,7 @@ v di r "X - -N + -N  h W#  @@ -4685,397 +4654,408 @@ Bu ) BS!.cz  - - D|bE Y - - - - -.4=%d? - -M@GRSTrv4%0x -%ttrx4R FULLPc m  ؜" !L + + k|bl Y +,-  + + + +uk + +%ttx 5R FULLіwc  " !s - -8KF3 - - - - - -@"c -m -z -%b -~F -No c#fsewv!4/%s. -  -< -# -= cyD L o)l2Env7 - - - - -@#: - -T#guZ_U - OFFER/ACK -!ou b%pI4 (< ), - 4MAC - -)pM -i + +_Km3 + +z + + + + +@Ic +m + +%b +F +No c#fs&ev#"4/%s. +  +< +Y +# += cyk L o)2Env&8 + + +; + +g#: + +BT#gu_U + OFFER/ACK +!ou b%pI4 (< ), + 4MAC + +)pM +i  -$ - +$ + -TFTP^& +TFTP& - F -P[ -l - -~ - - -_ -/ + F +/P[ +k + +~ + + + +_ + +/  L -P - -G@[argF]mCappl"toh1 paH>'L - ) - G - uC '-'bU!e 96 +P + + ) + G + uC '-'U!e :6 -F_ - T.)2WcludeD - ^<2g_u{-1D -l - as. +F_ + |.*2WcludeD + 5^<2g_u{-1D +l + 3as. -Sub-@w4l  F* -Bdkvi)(@bAok tl - G  =#Ros -U.$OS" G4 -  +Sub-hx4  F* +jdvi)(hbAok t + #Ros -V.$OS"3G4 - " bZ 5 - v ' - goLsP OS< 8 - V - Q92d3RAWS + v ' + goMPOS + V + y9Zd3RAWS Sincewp -2 -O -/X( -/( - -P? - -RB[to  -fd6P - -i2cGUpA -*$ ? -/ -X?t).  - - -/|  -0 / -( - -[3d_S!] -Q -t - $: oF!s rh* -R -; -eJ [-P-b | cB[-s {w -'*?#   -( - /(( - ( -)  -( - - -h ` h(1 ->~ -  +#Ҍ + +O +/X( +/( + +P? + +RB[to  +fd6x + +i2coUpA +ߠ/0( +*  ? +/ +X/t( + + +/|  +0 / +( + +[[d_S!] +y +t + $: pF!s h* +R +; +eJ [-DP-b | cB[-s {w +'*?#   +( + ( +)  +D/ +( + + +hB. +>~ +  $ -$ -p(; +$ +p(;  - - @z:S1 - (20$00 /,mX0 #/Ph(1 - + + @z:S1 + (8 + #e(A1@ /v) hP -P, -~ -`f - -y -( ^4 -#/p>x) -h/0 -8/8s*K -ULU - -   -tvD_0p -/> +P, +~ +2#2x +`f + +y +( ^P*1P./1x4 #H0)0(/Q| + +x) +h/0 +8( +ULU + +   +tvD_0p +/> ^ -_ -v -fC= -d +_ +v +fC= +d *6 E1 88< -tc$c(c,c0c4cc(c,cdccj -9 2Tf8"eh{ - R - -@@> - -xH - - -H?H n+I8m/I m+IPl -P?K n?XL R` -+L%nM -xP -0 - - -h -?(W (t -H - -;] vx] [0 -H/d1d) -/d1d)e(G -/ee) -(hH -`/ee)eK -/ee1e5 -X/fg8g - H -p - -H/h:8 -/@8 -/h8 -/  -(/ -X -$P -x+X  - -H -x - -8 -p -x -0 -H` - -8 -0 -h -p -x -  -Xp - - -` -P -0x -h - -8 -p8 -` - -(` -0x -h - -X -` - -H -@p -` - - -8` -8?X 8 -$8 -H -X - -x/ -x -x?H X -Hh -P + + + + +8 +80 +8H +8` +8x +8 +8 +8 +80 +0+ +p/` +8H +P`H +H +/    +/   +/ +/x!!! +/!( +/ +b/,@  +H +/ +/x- -  +h/-  +/. +/@. +` +/h. +hx +/.p.p. +/.p  +//p +H/@/p +/h/p +//8 +//8/ / +(//8/  +`/080  +/0080  +/X080  +/080  +@/00  +x/00  +/01  +/ 11  + /H11  +X/p11  +/118 +/1181  + +p/8228 +،X +/`228 +/228 +/228 +P/2282` +/ +/(3383`H +/P3383 p +0/x3383  +h/338 +/338 +/3384 +/44848 +H/@448/4 I` +/h4484p/4 X8 +/484p + +8/484p +/H5@5 +/p5@5@ +/5@5@5 +@/5@5@5 +x/5@8= +( +0/=@=8 +h/=@=8 +H +/>@>x + + +xH + +x/>@>@ + + +G>g +?I l?J XS +P?K n?hL Rp ++L%xo*M +0 + +x +?T s?PU +h +?V s$0W +?8W (t +H+W&2e + +H  +( +P;Z s` xZp +1H/\ u +0<\ u] 0H  +;^ `u0] \ +H/d1d) +/ +/(ee) +(/xee)e +`/ee)eK +/ee1e5 +/0ggx +p ++PB +H/(h:H +/P8 +/x8 +/  +(/Ȁ +P +X +$` +x+h`W + +H + + +8; `B +H` + + +0 +Hp +H +0 +x +x +0 +X + + +8 0 +p +P +0 +h +( +8  +pH +p + +8` +0 +h +( +X +` + +X +@ +p + + +8` ++X  +8?h 8 +$H ++X8 + +x/ +xX` +Hx +P -- cgit