From 4d9cb5336f04a84fb7b4cf916b7b2b4fb0fdcabf Mon Sep 17 00:00:00 2001 From: Sean Rhodes Date: Wed, 4 Mar 2026 09:46:29 +0000 Subject: [PATCH] mainboard/starlabs: drop display_native_res VBT toggle A local patch providing basic 2x scaling in edk2 means that the fixed resolution VBTs are no longer needed so always use the native-resolution VBT by default, Remove the CFR option to pick which VBT to use, so only the native resolution VBTs are used and included. Change-Id: Ib7f4c546a01ebfba963b7591af9d5e24c0611206 Signed-off-by: Sean Rhodes Reviewed-on: https://review.coreboot.org/c/coreboot/+/91618 Reviewed-by: Matt DeVillier Tested-by: build bot (Jenkins) --- src/mainboard/starlabs/adl/cfr.c | 13 ++----------- .../starlabs/adl/variants/hz/Makefile.mk | 2 -- .../starlabs/adl/variants/hz/data.vbt | Bin 9216 -> 9216 bytes .../adl/variants/hz/data_native_res.vbt | Bin 9216 -> 0 bytes .../starlabs/adl/variants/hz/ramstage.c | 4 ---- .../starlabs/adl/variants/i5/Makefile.mk | 2 -- .../starlabs/adl/variants/i5/data.vbt | Bin 9216 -> 9216 bytes .../adl/variants/i5/data_native_res.vbt | Bin 9216 -> 0 bytes .../starlabs/adl/variants/i5/ramstage.c | 4 ---- .../starlabs/common/include/common/cfr.h | 8 -------- src/mainboard/starlabs/starbook/cfr.c | 13 ------------- src/mainboard/starlabs/starbook/mainboard.c | 4 ---- .../starbook/variants/adl_n/Makefile.mk | 2 -- .../starlabs/starbook/variants/adl_n/data.vbt | Bin 9216 -> 9216 bytes .../variants/adl_n/data_native_res.vbt | Bin 9216 -> 0 bytes .../starbook/variants/mtl/Makefile.mk | 2 -- .../starlabs/starbook/variants/mtl/data.vbt | Bin 7680 -> 7680 bytes .../starbook/variants/mtl/data_native_res.vbt | Bin 7680 -> 0 bytes src/mainboard/starlabs/starfighter/cfr.c | 9 --------- .../starfighter/variants/mtl/Makefile.mk | 2 -- .../starfighter/variants/mtl/data.vbt | Bin 7680 -> 7680 bytes .../variants/mtl/data_native_res.vbt | Bin 7680 -> 0 bytes .../starfighter/variants/mtl/ramstage.c | 5 ----- .../starfighter/variants/rpl/Makefile.mk | 2 -- .../starfighter/variants/rpl/data.vbt | Bin 9216 -> 9216 bytes .../variants/rpl/data_native_res.vbt | Bin 9216 -> 0 bytes .../starfighter/variants/rpl/ramstage.c | 3 --- 27 files changed, 2 insertions(+), 73 deletions(-) delete mode 100644 src/mainboard/starlabs/adl/variants/hz/data_native_res.vbt delete mode 100644 src/mainboard/starlabs/adl/variants/i5/data_native_res.vbt delete mode 100644 src/mainboard/starlabs/starbook/variants/adl_n/data_native_res.vbt delete mode 100644 src/mainboard/starlabs/starbook/variants/mtl/data_native_res.vbt delete mode 100644 src/mainboard/starlabs/starfighter/variants/mtl/data_native_res.vbt delete mode 100644 src/mainboard/starlabs/starfighter/variants/rpl/data_native_res.vbt diff --git a/src/mainboard/starlabs/adl/cfr.c b/src/mainboard/starlabs/adl/cfr.c index 8c8f5f601f..89f7730e45 100644 --- a/src/mainboard/starlabs/adl/cfr.c +++ b/src/mainboard/starlabs/adl/cfr.c @@ -58,23 +58,16 @@ static struct sm_obj_form keyboard_group = { }; #endif -#if CONFIG(SYSTEM_TYPE_LAPTOP) || CONFIG(SYSTEM_TYPE_DETACHABLE) +#if CONFIG(BOARD_STARLABS_LITE_ADL) static struct sm_obj_form display_group = { .ui_name = "Display", .obj_list = (const struct sm_object *[]){ -#if CONFIG(BOARD_STARLABS_LITE_ADL) &accelerometer, -#endif - &display_native_res, -#if CONFIG(BOARD_STARLABS_LITE_ADL) &touchscreen, -#endif NULL, }, }; -#endif -#if CONFIG(BOARD_STARLABS_LITE_ADL) static struct sm_obj_form io_expansion_group = { .ui_name = "I/O / Expansion", .obj_list = @@ -140,10 +133,8 @@ static struct sm_obj_form *sm_root[] = { #endif &battery_group, &debug_group, -#if CONFIG(SYSTEM_TYPE_LAPTOP) || CONFIG(SYSTEM_TYPE_DETACHABLE) - &display_group, -#endif #if CONFIG(BOARD_STARLABS_LITE_ADL) + &display_group, &io_expansion_group, #endif #if CONFIG(SYSTEM_TYPE_LAPTOP) diff --git a/src/mainboard/starlabs/adl/variants/hz/Makefile.mk b/src/mainboard/starlabs/adl/variants/hz/Makefile.mk index bfea7ef255..9abc069b38 100644 --- a/src/mainboard/starlabs/adl/variants/hz/Makefile.mk +++ b/src/mainboard/starlabs/adl/variants/hz/Makefile.mk @@ -8,5 +8,3 @@ ramstage-y += devtree.c ramstage-y += gpio.c ramstage-y += hda_verb.c ramstage-y += ramstage.c - -$(call add_vbt_to_cbfs, vbt_native_res.bin, data_native_res.vbt) diff --git a/src/mainboard/starlabs/adl/variants/hz/data.vbt b/src/mainboard/starlabs/adl/variants/hz/data.vbt index 8c22ab4f40c953db62bbe3744709b4430e547cff..a101af780b8ecc78fff9335c3dc0cab7239b2250 100644 GIT binary patch delta 45 ucmZqhXz-XI#azT-Fu9OXc%#7s0UibzFfn7^EFkoPak7BWm(4$fIRpR%$_sx0 delta 45 zcmZqhXz-XI#cal4Fu9OXc%#7s0UpLTEDQ`D%nS@BX3U!fgkCUC77+Tf`G+uv000?` B41WLs diff --git a/src/mainboard/starlabs/adl/variants/hz/data_native_res.vbt b/src/mainboard/starlabs/adl/variants/hz/data_native_res.vbt deleted file mode 100644 index a101af780b8ecc78fff9335c3dc0cab7239b2250..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9216 zcmeHMUrbw782`?_ZRu)}ZlLRM!vkBe;DAfnkP(vI^3QdH(E=k~qM>80N@N2WGt8Lm z8hPNwj(eA)-V6?Mupz8!D z_ALETy?To%#@HTrv!*o%&(Fjse1mnoe{yVmBHq*;zwqYFgv2WJ`v+5FPV?AKYXOr z)!oxI&>sr+1%`tIC;7l2?+y+HhK73jJNr)a(BQzaU}tc+r@PdZ=R()y)TQb1*WZ}o zzOFj%M>`D?SDMVbCa0$wd0=9K4+@!HiKuL1i7!h+(S(1q%Ro_kBiBR0C~jmsVw`K<~GWdbHj? z=oLtJ-hpB!P>h%$qGy=CsrrxV@}_5TyNf2lm%#6XKLCFO{uKNr_-pVt;BUb{fPVr1 z3jP!P7kEbuZ7ZU~9@#w&a(zc@??^hG^*77q$3pg8qnavlQL5xNn=gMnbJlEfj{t6Zlp9BzM8yZi2t1Ss_-aT|Tk@b5Gn9K+ zKVmnO6=v*wTCQ!*X*b@mh~k#%ZRSC0FMEN~=^Hx?ldtUaIHNUI?W)$xnEOTE&DDtV zV1z^&r{>6B?lUUZ5ac`#1Ti-~7$LTY^Z?ar-uYGw!P|OSm0JNI*vTdkI`~d zEEQnGv7@>+w&d6KWDdbWa<}6iu@@4_*Q!Sr!&Ig9nwh>3ku=4=j9^M3ad@}UOhhZI zbd6{F0+F&wx(nC1=3F(7SFF_;9xzZ{c@gG$&b3IsbZz>8azlnC+Nnp^7#c^Ml`uI-Q~hl}9}u>`4VlFXVdW z?&}SWhR&RiPnrp^rnnETSfG5Wn18bNHmPf-YVA7mfWO%=uf-xqnE zuu)?)zed|5Ynh*Q@jp*nPLk{5DzfSHQP~q>Iu=%@GAD2`xt3ji z{%8d{R&?-I)X_ms|9EY0E2I76=lwW5j`}*t4|RFOL|SY)7rSD#AN~lt&8%y_{GaD? zJ(HhvNNT%o?F#Z`+q`sS(B+W(t!?f{(fncriV-MApcsK-1d0(TMxYph|1kpXpDBCk zl`$eiG4c5-N-Jz1{`bkhqLhST`o~0ECFUc8BG6^l7hEa3c^3*coq1^qh`9N(+$3rwRa=xC^ivn(hH7P478XCBBZZJs=t`LmF%um~+cR+}eF%_^ijG(`u> zlFgqdyVK8T#JTh|{6MLQO9DrFSflPntz29x ux`i!X_})NmwuU@Auf2ypapD&_E^?H^7WqFw#`Avt_aw*=wjw>b5%?PomVhn* diff --git a/src/mainboard/starlabs/adl/variants/hz/ramstage.c b/src/mainboard/starlabs/adl/variants/hz/ramstage.c index 370f5c8769..de25c0a7e5 100644 --- a/src/mainboard/starlabs/adl/variants/hz/ramstage.c +++ b/src/mainboard/starlabs/adl/variants/hz/ramstage.c @@ -2,7 +2,6 @@ #include #include -#include #include void mainboard_silicon_init_params(FSP_S_CONFIG *supd) @@ -12,8 +11,5 @@ void mainboard_silicon_init_params(FSP_S_CONFIG *supd) const char *mainboard_vbt_filename(void) { - if (get_uint_option("display_native_res", 0) == 1) - return "vbt_native_res.bin"; - return "vbt.bin"; } diff --git a/src/mainboard/starlabs/adl/variants/i5/Makefile.mk b/src/mainboard/starlabs/adl/variants/i5/Makefile.mk index d6e2d5b29d..4bd5ef44c0 100644 --- a/src/mainboard/starlabs/adl/variants/i5/Makefile.mk +++ b/src/mainboard/starlabs/adl/variants/i5/Makefile.mk @@ -9,5 +9,3 @@ ramstage-y += gpio.c ramstage-y += hda_verb.c ramstage-y += mainboard_ssdt.c ramstage-y += ramstage.c - -$(call add_vbt_to_cbfs, vbt_native_res.bin, data_native_res.vbt) diff --git a/src/mainboard/starlabs/adl/variants/i5/data.vbt b/src/mainboard/starlabs/adl/variants/i5/data.vbt index 3b0236d896639cc33734710dc8a4527cc631e290..13c5b92d61f599b4168691619efc28a28e05e7f4 100644 GIT binary patch delta 45 ucmZqhXz-XI#oWYTFu9OXc%#7s0UibzFfn7^EFkoPak7BWm(4$fIRpR)DhrPQ delta 45 zcmZqhXz-XI#azr_Fu9OXc%#7s0UkyR76yh3ObiSrX3U!fgkCUC77+Tf`G+uv000~s B437W+ diff --git a/src/mainboard/starlabs/adl/variants/i5/data_native_res.vbt b/src/mainboard/starlabs/adl/variants/i5/data_native_res.vbt deleted file mode 100644 index 13c5b92d61f599b4168691619efc28a28e05e7f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9216 zcmeHMUrbw782`?_ZRu)}ZlLRM!vkBe;DAfnkP(vI^3QdH(E=k~qM>80j>rZwW|%SA zRe9jWuJbreo=M^WF33 z`_Aut-*?VE=iGbujdTw4Kwo#yU|--^PeX`gw+48t4xN`vSwkf#ZB&kaq`%0z*SR{hfU$d1!FpNU$?F+|ym^%5$M>a_Zvr_^W4T zxUZ{@`_WH>#FZxVuF2`CMjn`$;DbWvJRgjok59i5k2RLM1W=NkHb%r;RF))U1l{f= z4>`#O*1;S(9hXQs%7m0qCX_ZOEX^E94VG3Up zLC;3lqU7;VpxPs=p{F2|gb$p_8hKmQ>FYB>@8yhMX|~^JMo(Blw8}Gj7c+WgmU~H> z%GZ;<0q=4~Z#$74?UQ8W_bZGM{eF?rD<^VDJu_cV+6ukzGJ2vJXhXkpP@wnQoqCjS zpKM*g?be%6$^?oL6GZeB(>FBzL0#TZ7q`1;5_}Q-F8Dq02jGvvpM$>ye+B*q{5|*= z@UP%M!GD3b#n87R2JE5T(;(NkwDydo(^)UJYR+9wNAbw1&W^d=(w7rN>5nQF$zc_V zIA)wCU*(ohN|2=+8`=c6eI9JBH*hbMQzE0TFg+c zvVO#FC@aj^{-oU7oYQVRVG+eG)0@nL)L!-+rPDudGfcj+$K#CFSgosCFJbK$c{f)h z%KZ@%Wt^HLySdM(SVNHOI1t3zbbo}{F46;3t9j>JEd+1tB~=~;fM6$^KSqxK^)@x?QLPXLO=Q4sRg~Z{lMl%tu ztkN}}84Ex;p;FGQ%ie+P%m0pV`0io*PXD>6)+#J)+JKmxf(5WW#<}# zN>7M9B3TH6RSEa!l)_UA`U9yq$m*VyZ|q5R8k_ucWQ2}OSH0V zF!4MB!6<2y^Fd7V&1bdJZg^jBYtSPNxv@|Qr%+)74$t?0F6wlO8dM(jcyJ~aB)yRP znY*tyG#WZ}Ex7LOqxm)38d=Nytc(A7+9H>A%ZLN5Sc*)n404fN7gv!@rw_}K5X-T!GL?A)7mI7z zrDqRUU|_`nZ$=#*$GJATfOm&Z|G2l=5cUonvud(OqK80`l?!)`L`nlJz7 zx!lO)=NyvSu34voeAyN+9U62wH`k zZhC2q$WTmtzKYTc+k^jo@~$n#ULIT6{Qj zNLLKpS3bq}YWo7yXbL(S+TmRmlmrXeterCtWR*5gp3MAN$W~Z{79gw5lci=A(jA(j z17*qP&y(HiXEb78WW8jm6Ijgb%u7nYU+K8WQ4U+={{R`!dyU`YAVb)S^!P^LZ!dy?E&u=k diff --git a/src/mainboard/starlabs/adl/variants/i5/ramstage.c b/src/mainboard/starlabs/adl/variants/i5/ramstage.c index 370f5c8769..de25c0a7e5 100644 --- a/src/mainboard/starlabs/adl/variants/i5/ramstage.c +++ b/src/mainboard/starlabs/adl/variants/i5/ramstage.c @@ -2,7 +2,6 @@ #include #include -#include #include void mainboard_silicon_init_params(FSP_S_CONFIG *supd) @@ -12,8 +11,5 @@ void mainboard_silicon_init_params(FSP_S_CONFIG *supd) const char *mainboard_vbt_filename(void) { - if (get_uint_option("display_native_res", 0) == 1) - return "vbt_native_res.bin"; - return "vbt.bin"; } diff --git a/src/mainboard/starlabs/common/include/common/cfr.h b/src/mainboard/starlabs/common/include/common/cfr.h index de4f108404..1a0dabbe86 100644 --- a/src/mainboard/starlabs/common/include/common/cfr.h +++ b/src/mainboard/starlabs/common/include/common/cfr.h @@ -40,14 +40,6 @@ static const struct sm_object card_reader = SM_DECLARE_BOOL({ .default_value = !CONFIG(BOARD_STARLABS_LITE_ADL), }, WITH_CALLBACK(cfr_card_reader_update)); -static const struct sm_object display_native_res = SM_DECLARE_BOOL({ - .opt_name = "display_native_res", - .ui_name = "Display: Use Native Resolution", - .ui_helptext = "Enabled: use the native panel resolution at boot.\n" - "Disabled: use a fixed/scaled video mode at boot.", - .default_value = false, -}); - static const struct sm_object fingerprint_reader = SM_DECLARE_BOOL({ .opt_name = "fingerprint_reader", .ui_name = "Fingerprint Reader", diff --git a/src/mainboard/starlabs/starbook/cfr.c b/src/mainboard/starlabs/starbook/cfr.c index d2e8b7c9ae..a561666812 100644 --- a/src/mainboard/starlabs/starbook/cfr.c +++ b/src/mainboard/starlabs/starbook/cfr.c @@ -36,16 +36,6 @@ static struct sm_obj_form debug_group = { }, }; -#if CONFIG(BOARD_USES_FIXED_MODE_VBT) -static struct sm_obj_form display_group = { - .ui_name = "Display", - .obj_list = (const struct sm_object *[]) { - &display_native_res, - NULL - }, -}; -#endif - static struct sm_obj_form io_expansion_group = { .ui_name = "I/O / Expansion", .obj_list = (const struct sm_object *[]) { @@ -156,9 +146,6 @@ static struct sm_obj_form *sm_root[] = { &audio_video_group, &battery_group, &debug_group, - #if CONFIG(BOARD_USES_FIXED_MODE_VBT) - &display_group, - #endif &io_expansion_group, &keyboard_group, &leds_group, diff --git a/src/mainboard/starlabs/starbook/mainboard.c b/src/mainboard/starlabs/starbook/mainboard.c index 8916dda296..93982cf807 100644 --- a/src/mainboard/starlabs/starbook/mainboard.c +++ b/src/mainboard/starlabs/starbook/mainboard.c @@ -4,7 +4,6 @@ #include #include #include -#include #include static void starlabs_configure_gpios(void *unused) @@ -22,8 +21,5 @@ struct chip_operations mainboard_ops = {}; const char *mainboard_vbt_filename(void) { - if (CONFIG(BOARD_USES_FIXED_MODE_VBT) && get_uint_option("display_native_res", 0) == 1) - return "vbt_native_res.bin"; - return "vbt.bin"; } diff --git a/src/mainboard/starlabs/starbook/variants/adl_n/Makefile.mk b/src/mainboard/starlabs/starbook/variants/adl_n/Makefile.mk index bfea7ef255..9abc069b38 100644 --- a/src/mainboard/starlabs/starbook/variants/adl_n/Makefile.mk +++ b/src/mainboard/starlabs/starbook/variants/adl_n/Makefile.mk @@ -8,5 +8,3 @@ ramstage-y += devtree.c ramstage-y += gpio.c ramstage-y += hda_verb.c ramstage-y += ramstage.c - -$(call add_vbt_to_cbfs, vbt_native_res.bin, data_native_res.vbt) diff --git a/src/mainboard/starlabs/starbook/variants/adl_n/data.vbt b/src/mainboard/starlabs/starbook/variants/adl_n/data.vbt index 70c3e07ea6ca12b647ed82e96d25eb46fd38ebe6..0cd0ec4b7773a3710b525f434dbf9050e4800bb7 100644 GIT binary patch delta 56 xcmZqhXz-XI#oWSRFgcM?c%#7~0Um}1b_NCu76t|rGv>(&!d2*abAs>!0RXc)5I+C_ delta 56 xcmZqhXz-XI#oWwbFgcM?c%#7~0UpK%b_NCu76t|rGv>(&!d2*abAs>!0RXcu5I+C_ diff --git a/src/mainboard/starlabs/starbook/variants/adl_n/data_native_res.vbt b/src/mainboard/starlabs/starbook/variants/adl_n/data_native_res.vbt deleted file mode 100644 index 0cd0ec4b7773a3710b525f434dbf9050e4800bb7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9216 zcmeHMUrbw782`?_?WL%k zd%o}d&i8%i^!&N^z-Y$^_xE;n5B2&_bk_$tC_*}^m2*fpQb%B5c&y7m;vehi9q2s4 z|DfmT=Keo#6Ga%?<7(3Nroe@nXsl+amiJALPsE~)UD1ng%uG)4U}u2)&z_COqSI$) zq7gnk`ih?mykcj^rHNRC_g^|c9-VIE0MVh%n+`WLALiWqa--hd=+&E!K+@LK(stx% zv9qhYbD%F6==F~T2KxEH5bp{M`-g|S`#O40@!-(Fu|P*)q`Rxwnd3s|N&+TWvftRWl31VGa?QvZidP2 zrmFpJSqn7r9_%kGjr6WnNa&WttMK5)^{og18O(ct5J?^vhCK%-FKjq z4iF&5P|?a+T6?On24co7*dWIZ2fIv}}ygN}=HdhLCqni@ zgSt}Wq?MvOY`*l#ELp3_0|L0ADm#xhhzb>j2t1Mq)Krq9Hs?SsrYT!lH)@Y7t1Q0r zS-Gh>rd{}lg%p>}?=UxVd&xmcrGDHIH~H#5wwXSHng0)|iU0e+*TO%Y&I5ma# z@|t*A20^alKoD!w)(DY3WcaCC_sq9g2%eTJsyqMy!A>@T;KOFTxfgmJEew)w=u_BF z1;Gn66eZWJy*w|3Sw2|qHr)3iFjMT{`67JTIJ-JnUTuUHvNkYNZ0_VTw52?3IM#0H z<4az{NM;cET?zYK9`oT^ZDM6`u2K(P-JL;D=^0T*B=bSg z>x|{_TtxQ_$~hoyP%)VV!atmoh=WQvA_@dM&%=w`<&+5W-MUNf6s;^9O#B~#5HD(# z^Fd7V&1bdJ7Wcf_T5p8vvtywW&Y!{t9GSQNU(^~Dj#Fva?Z$Cbkn}?CXRh9!;8^g? zg=nn*%=ze3@L)Okc+*tsr6#5wUnVWI`1n$BPQ9NLMcD<;kT|vq#)(t!7fY|OawUDq77J;~l^5H~Fo zHzS{q9NvlQo)$(`6BoR=D2~*KpyTh#CeCgjWWk)8rq)BSM zX`KLaW!wDe=#W#BXRB@QN5T9;1PT!-M4%9XLIesCC`6zTf&VZ9ZJ#T9>D6)EITaJH zs=~C&_Tk%}{Q5~r7-n3@msOQm4aF%0U53|kf|B4{_mJ2O=An7Ky{^VfG7S~L0Te2lv6+E{-I|`XC!6;#0 zVL`e|b800ptvj}m2_Fn?nLIQISwv`qE&n!)OA_(}#Ud^VTS(Sl2P0B1l4RsaA1 diff --git a/src/mainboard/starlabs/starbook/variants/mtl/data_native_res.vbt b/src/mainboard/starlabs/starbook/variants/mtl/data_native_res.vbt deleted file mode 100644 index f855dabf240a70571e2c1c25eeae7efd490739cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7680 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 #include #include #include @@ -14,10 +13,6 @@ void mainboard_silicon_init_params(FSP_S_CONFIG *supd) const char *mainboard_vbt_filename(void) { - if (get_uint_option("display_native_res", 0) == 1) - return "vbt_native_res.bin"; - - if (get_memory_config_straps() == 13) return "vbt_qhd.bin"; return "vbt.bin"; diff --git a/src/mainboard/starlabs/starfighter/variants/rpl/Makefile.mk b/src/mainboard/starlabs/starfighter/variants/rpl/Makefile.mk index bfea7ef255..9abc069b38 100644 --- a/src/mainboard/starlabs/starfighter/variants/rpl/Makefile.mk +++ b/src/mainboard/starlabs/starfighter/variants/rpl/Makefile.mk @@ -8,5 +8,3 @@ ramstage-y += devtree.c ramstage-y += gpio.c ramstage-y += hda_verb.c ramstage-y += ramstage.c - -$(call add_vbt_to_cbfs, vbt_native_res.bin, data_native_res.vbt) diff --git a/src/mainboard/starlabs/starfighter/variants/rpl/data.vbt b/src/mainboard/starlabs/starfighter/variants/rpl/data.vbt index 9377482170c89d789297f36e23526eae38141a2c..b0222677f63a502e639ba65c929273bee5409d70 100644 GIT binary patch delta 56 xcmZqhXz-XI#mvNDFu9OXc%#7~0Um}1b_RwGEDQ`LX3Uclgsaf;<^);y;JKN4fzW zN5^0Babd6A(Q|Ps9_51<&rQZ=J2{MK(B_`QEp3N6_rBb!wY7RR&k;yEJ?))Gj+Q$D zz5bzrP_W-O791MnLnAy89QBQk_73#)pW>mBp<}_G;8<^<+))sMe|qN9?9}UT%<%?) zBln`8W@%Tt%>C1|GcDW~kMj|sbAgY=s7E98{4aWCY#qAs5-n z0@lGCIUPTda+C=vp-d=kP0EK%f!;wo+1&SPp-&a%lr)$Xa7tvenY7GIQ}Bf6M8bpX z5pubxZof;`LQO#?g$Ov4HS(d;4XM_hQ7g}O8p)^$7li+&+Ubm1g&A6kW(w3~SLpPe zjM`2jD_W;0QP8PyMELe`My-;_Ce@4rHR&eQzRjqKR-lcYlF)>CdZ{$z~Rby0RhOCw(Gh zFSMv@We!>^yUi9WpUj-OirfdlO;!1Mv`JK|C?W7j5NN0+MQtlEwVa`RWz)Ddp{%pS z&S&MOW}kK99~M@eGQG`QNUaqIDV@HtBVq9MeJ*>X)@)tVei>`O$UC_jRvvC4S;5H@ z-pd;jRXGcC9ft+6Ha*-zbPwr1s@L3$?WP5H`(;%g0ARsN7Ga?aoAK6BXic;O2WE)Pot(ODr3fF6 zb?e&XidWZDc?&j@haBg)wHPE{+dsZMOf_1ckr@ktq#;gY1Xqf|;k_0k8L6((HJ%v@ zAZamn$S4wJ#YEB2l}OI4)WJfNXl0ItAvaxT(z;N@e7M?}TpM1f)k0Tx=Pao7jK~AY zVk~G)`f6k$s=0^d9FRV!m`uXLKb(`mK_wg!g#{}wB8pqplnn9Rnp5+OR;CXI{*SPb zDC>~(K}_oc(>F ziO`wzvH0MbbFrtOUb;~W$}Vt@#IaQ{PRugRmWxfr znk3hyOqwkho7y)J%sh||4bpFY&d>)J#E7hp1@YJf(7w#JC+>-tAJb(HvpVYcT3d8(kr}N%UrU>LRxY8#qKH$ zq8QArsH=_atG2ibWX8`zw$8$|1X+E7Y;9g4-KHrztgKkP z1+qH>jK;0Ytd9)%QUjUkX9E5Gw8qG=B}pR=n>9H_6x_E>*@~qOk(-|#h0Ky< zl(ep~5M7}KwH7wbJGPLC7