From be1d104c8b3179c762b6f6b78c3d5581ee00fdab Mon Sep 17 00:00:00 2001 From: Velsoth Date: Thu, 23 Apr 2020 16:19:09 +0100 Subject: [PATCH] Move all galaxys2-common blobs to system/vendor/firmware Signed-off-by: Velsoth --- galaxys2-common/common-vendor-blobs.mk | 25 +++++++++--------- .../system/lib/libsecril-client.so | Bin 13396 -> 0 bytes .../{bin => vendor/firmware}/bcm4330B1.hcd | Bin .../firmware}/bcm4330B1_murata.hcd | Bin .../firmware}/bcm4330B1_semcosh.hcd | Bin .../wifi => vendor/firmware}/bcmdhd_apsta.bin | Bin .../wifi => vendor/firmware}/bcmdhd_mfg.bin | Bin .../wifi => vendor/firmware}/bcmdhd_p2p.bin | Bin .../wifi => vendor/firmware}/bcmdhd_sta.bin | Bin .../wifi => vendor/firmware}/nvram_mfg.txt | 0 .../firmware}/nvram_mfg.txt_murata | 0 .../wifi => vendor/firmware}/nvram_net.txt | 0 .../firmware}/nvram_net.txt_murata | 0 13 files changed, 12 insertions(+), 13 deletions(-) delete mode 100755 galaxys2-common/proprietary/system/lib/libsecril-client.so rename galaxys2-common/proprietary/system/{bin => vendor/firmware}/bcm4330B1.hcd (100%) rename galaxys2-common/proprietary/system/{bin => vendor/firmware}/bcm4330B1_murata.hcd (100%) rename galaxys2-common/proprietary/system/{bin => vendor/firmware}/bcm4330B1_semcosh.hcd (100%) rename galaxys2-common/proprietary/system/{etc/wifi => vendor/firmware}/bcmdhd_apsta.bin (100%) rename galaxys2-common/proprietary/system/{etc/wifi => vendor/firmware}/bcmdhd_mfg.bin (100%) rename galaxys2-common/proprietary/system/{etc/wifi => vendor/firmware}/bcmdhd_p2p.bin (100%) rename galaxys2-common/proprietary/system/{etc/wifi => vendor/firmware}/bcmdhd_sta.bin (100%) rename galaxys2-common/proprietary/system/{etc/wifi => vendor/firmware}/nvram_mfg.txt (100%) rename galaxys2-common/proprietary/system/{etc/wifi => vendor/firmware}/nvram_mfg.txt_murata (100%) rename galaxys2-common/proprietary/system/{etc/wifi => vendor/firmware}/nvram_net.txt (100%) rename galaxys2-common/proprietary/system/{etc/wifi => vendor/firmware}/nvram_net.txt_murata (100%) diff --git a/galaxys2-common/common-vendor-blobs.mk b/galaxys2-common/common-vendor-blobs.mk index da1eaac..3053792 100644 --- a/galaxys2-common/common-vendor-blobs.mk +++ b/galaxys2-common/common-vendor-blobs.mk @@ -15,16 +15,15 @@ LOCAL_PATH := vendor/samsung/galaxys2-common PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/proprietary/system/bin/bcm4330B1.hcd:system/bin/bcm4330B1.hcd \ - $(LOCAL_PATH)/proprietary/system/bin/bcm4330B1_murata.hcd:system/bin/bcm4330B1_murata.hcd \ - $(LOCAL_PATH)/proprietary/system/bin/bcm4330B1_semcosh.hcd:system/bin/bcm4330B1_semcosh.hcd \ - $(LOCAL_PATH)/proprietary/system/etc/wifi/bcmdhd_apsta.bin:system/etc/wifi/bcmdhd_apsta.bin \ - $(LOCAL_PATH)/proprietary/system/etc/wifi/bcmdhd_mfg.bin:system/etc/wifi/bcmdhd_mfg.bin \ - $(LOCAL_PATH)/proprietary/system/etc/wifi/bcmdhd_p2p.bin:system/etc/wifi/bcmdhd_p2p.bin \ - $(LOCAL_PATH)/proprietary/system/etc/wifi/bcmdhd_sta.bin:system/etc/wifi/bcmdhd_sta.bin \ - $(LOCAL_PATH)/proprietary/system/etc/wifi/nvram_mfg.txt:system/etc/wifi/nvram_mfg.txt \ - $(LOCAL_PATH)/proprietary/system/etc/wifi/nvram_mfg.txt_murata:system/etc/wifi/nvram_mfg.txt_murata \ - $(LOCAL_PATH)/proprietary/system/etc/wifi/nvram_net.txt:system/etc/wifi/nvram_net.txt \ - $(LOCAL_PATH)/proprietary/system/etc/wifi/nvram_net.txt_murata:system/etc/wifi/nvram_net.txt_murata \ - $(LOCAL_PATH)/proprietary/system/lib/libsecril-client.so:system/lib/libsecril-client.so \ - $(LOCAL_PATH)/proprietary/system/vendor/firmware/mfc_fw.bin:system/vendor/firmware/mfc_fw.bin + $(LOCAL_PATH)/proprietary/system/vendor/firmware/bcm4330B1.hcd:system/vendor/firmware/bcm4330B1.hcd \ + $(LOCAL_PATH)/proprietary/system/vendor/firmware/bcm4330B1_murata.hcd:system/vendor/firmware/bcm4330B1_murata.hcd \ + $(LOCAL_PATH)/proprietary/system/vendor/firmware/bcm4330B1_semcosh.hcd:system/vendor/firmware/bcm4330B1_semcosh.hcd \ + $(LOCAL_PATH)/proprietary/system/vendor/firmware/bcmdhd_apsta.bin:system/vendor/firmware/bcmdhd_apsta.bin \ + $(LOCAL_PATH)/proprietary/system/vendor/firmware/bcmdhd_mfg.bin:system/vendor/firmware/bcmdhd_mfg.bin \ + $(LOCAL_PATH)/proprietary/system/vendor/firmware/bcmdhd_p2p.bin:system/vendor/firmware/bcmdhd_p2p.bin \ + $(LOCAL_PATH)/proprietary/system/vendor/firmware/bcmdhd_sta.bin:system/vendor/firmware/bcmdhd_sta.bin \ + $(LOCAL_PATH)/proprietary/system/vendor/firmware/mfc_fw.bin:system/vendor/firmware/mfc_fw.bin \ + $(LOCAL_PATH)/proprietary/system/vendor/firmware/nvram_mfg.txt:system/vendor/firmware/nvram_mfg.txt \ + $(LOCAL_PATH)/proprietary/system/vendor/firmware/nvram_mfg.txt_murata:system/vendor/firmware/nvram_mfg.txt_murata \ + $(LOCAL_PATH)/proprietary/system/vendor/firmware/nvram_net.txt:system/vendor/firmware/nvram_net.txt \ + $(LOCAL_PATH)/proprietary/system/vendor/firmware/nvram_net.txt_murata:system/vendor/firmware/nvram_net.txt_murata \ diff --git a/galaxys2-common/proprietary/system/lib/libsecril-client.so b/galaxys2-common/proprietary/system/lib/libsecril-client.so deleted file mode 100755 index 6f5eca58674c488940220b52e202679762d9a265..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13396 zcmeHOdw5jUwcqndGI^0eprS@NNeE05G7JIaVU;{42WCJCfhwYQGRz#9k;%+3Gm*p> zLD8a>E27wdj|NL?P|(DRHCBZBy0%qsqSR7~*QwSkd6HP{jI?I%Z=J_58KBpG_n&*e zulviIwbp*Fwf5Tk>~r?Yrs}1f9E3m< zXk}2^gB8;qC5#ay5tq%x{`CgN^jAr63=K{Ks9!2q1AQ0e-$gkAhcW^xr!kg)9&`Ym zlf?GOMOEJeg^VfCiaY{EzFM?T9G_%R`bX7K2}Q9q4pd5vV~qH$1im1FFHYc%3H+i2 z{`(31h6MiJ1pes+{;dT5&k1}qflrQ8ko36>{8wWcYX&_I+Rg*tfP%YZ{+uu}eUcKG%T1Xrkn2#5=%W z41TFx9*k>G{oj_rHz)AB6Ziw*1@z~G+|>Uo3FYr6@V`&sKThCJCGe*cc#Vd!-(7rm zys_Y`FU8uC^~ndXB+_R-_{}J922Jvr6UwgzugYc2B$uxPUkyGa^9|q&FFVWM3qENQ zV{gjkKLY>jIQ{_mZIjQI{}TLi?kxWX_z8K8JubKZE%*-bQ)K&{0ROvuX%8TI`@k!S z^!XC}R|Sl{2%5^(TE_NGVazS_mw=yu{ebo?D%XQI$MKhgza4yrTwVoUNz{KW@#RuZ zHdeb8JndbSvROLwfH%hY40gw;`oqyJ3H)~O+2vw$v>%SLjeb{9U{ei`@A3qh_`8FMGBWGxYv#%=FR!ur?Si{% zX7w%17j*gso5Nb)5EL5GrG0%uR)a^(Jh%BwqbQi!6P#66?K)5YbHwuMnkBc~Or=W_ zhM(uK1#K%_w+fKrJjJuA7)A9$eLx7Fr+X8LUn{J01%iVAd!B&T?XtsAj>XW@E%;+a zwZeu5ArP$c*8AK-P*92kf?Kc$nP0Gb{SIp&2rJZE*9k$ZM`#Q(n|(ur%P&|r+SUt_ zRn9fQT*zf2A#0X6&#U2lvaDpE8qq+BCYU)>s^N3n>_YX;5XLRo0`a4c7H_Rz5KzhH zz$6EPHv4+3-MQYn*5-1L%2?N6^E+btSNr{5f0fPcUV{elcAOiq-6Ft=FnP;-f~U&u z5PZ@q7t$bcoYm^}SRHOBfH7ZV zUTLkUt*yA;Y6Z)KKg$ZV43WDg5FnTHV zIN_8VZCF!oVV%w1q*Re{An34{l*mlIk}25zE_bQqI+Rz1Z882llnx$`HZd*4FO}1F zN@*Iv1h@i_1DF9&QW^+s=?sq@hDVW@lyldW;3@(0q-=&qHKXmDmw7^T>@AY{xxnQz zjbrJkG#}h|0A&DrzThz=rdjx{mT3j0C3{2d76BMgCq zgkhXU!f>G531i@9!kCyXgrWFW!sz?~!f>MPgyDpb5XRswgfTIX6Nd3x3F8G|FJTy= zjWC>XKVc}|P8bG$kuV(PWx^2jRl;z*BZT4LZxV(hyh9k1|1M#Uu`a?e>`}rn`Z2eNfkX(y`TkD09BV05`nfjrnQk>{oXK1?%uYqa zkwKL+WpSg4I1at3PbqDF3*Y__@Fk$MXK2|&?OI;jwu66+zmI2ynw`<`mxEKB+ToUD zBiemAcr^03adqz4E>&JJKlY6Js|mdtT}pRJm63lFCDHK7!JVB+AypYye5#vTga&zY zGRIq%4XJe1OGv8QAjM0AjiG6LK3~Ou5ZT-O@-WMq(mj6G6?xjeH&}Juk%(@)wk;Zd zXRrveM8j_mUN7P!gUk8VG9~4+SF-nM^D82=Gh3a}@J&&s&pDnRQq9tpaV6c|#pV)A zi8v38{>_xt#t~ z_p+fB9m#zAU^zdw{m{vw2if5{uz4$BANG%5VXs*LdL?iNzyi7u`FDe^03F6&6FE4Z zXZkr^%*pg+U6{c#R+!A^@E=9?`a3IihfDYuhNBC$-E2n2;bNZ3RdaNgbESjbD?3-` zUfRWA-8^2G&%P@1MZ?CyaiO21e(qu9Yu<>oRVH_@$W7~7S;qQaS1+%7q>gcsLmB|b zM-C+eOXJTI$Dd2%&tmz>{AD!$1{yzyKNuT-0*yaMRfh44Y5ePRC&rEc0mdI1$O^5_ zjg4NB+`T?m*EM?%>w7CUx-v3JLBQB2k=tjpeDc)WOqV*f{GRrS&a@rrJ0@?}J&Xs- zQ0`q%IX`oL61h>kyYiFBs`2k0Ru8MvG=L^kqba{>1!nNhflnf)7Xjn{W@<8N9{T1_ z+TroZEU!7A=6CPFPn}6alU2^KszUW;6V9lHw0(DFoQPWZ=H zmudU%&X{mU{TG&x^6aW!6`RSU2FrmTu^rLy{R2#2{+IVRx5_PcmTUVqkNMBYc;jW2 zZ0M=YMi_u>e%2yAt zj;x(yTC$$_$o!Gz_o%_P)0)(9Dy;S1{;XXWcVxp)mky}-F)gehpH^t?J(WrD>^ESA zw%XFp)A9-%?pB95XV&hvMXazlq$y-2UlXhnzpRyzMp;g$8e;3(HdqF?2Py6IADvP>5 zj!X%$X;b<4A`@FjOt15;d=RzTjCs7KMZ23l91WZLu|{ShkKJ9F+O6yR_l#?K6aO*l z!=lUY=*$bL=3=GH_^jK+cZvBakLl(-QTcW^k6n0N=vV}&tzGJe$<{5A{VUXuRpTi^ zxm&?q%ooEej3Y)q^T*LJM;6UC@_D@}DcGN|(kAt1?q*y8|6ycr_CpDKl%ZeTqh`?_ zRowwQ%__lfo2H0wSp-WI-XuOXEdAsYllocd!qY!}?s|CF^_JDJ@vSD>S)<|i`*!`; zb&IbvH)1^zx8uK};n(`qPHpjwF8IEF^2g*!m4D5c32#zwmAnb-pslQ=Gd1Q-+R$Qi zYCh*|GPNwC{k**od&o>yu&1tI1FaNYM>L#4b2+Q(=Om*xuVqm|DCAV-V?Amr#_p!o z1s@%6yreRxD=j}4Gkm6x=`%m3-nRCI@Oy6`=Zc2!l6vO$)Nvc~n^^It(<29TyBIfl zce-u{*HqRqSL z-vj&_a2fEt4vq7QjyEEEa~OwxyTG?d!%5&~uY5e@kBy&((3A z96udivZZfqh~=Tg50B|n<*C|eAD>?LY#sKXKF+Dy*J2bY{;ESc2X!4<=Z&39%u6jx zN3E!jdNtgAp@JrS-Y;Q8_cZg1S)MAN&KGN8@7B63oK#-xWw5scl0?HV_g-aQXjv$F z%xxy-Tockl2DS$K5!H9j`XjjI(eSFiH!;uJ;S5GJ(@#83Gq=At8g3DL`>xpAj$VV= zV3`r?jXk0gpU)5UCUIAx=a5tCdpdeZ6??e9m*#$JFU|dy-o7vLEZX5#Jf{ozTOo6C zpYG>0PNP^WDAw}#lJD(-RaT25GjZgVy*cLbmhrKXXr@+58&Ko*Y&1sgjQU1NQN5dtBE^gX0tkSHiEXRlI zF__m~Xlq5=OM&OgYvUsGM9aicZ5N|$e&{JDKeB=N8S}Hdw$|%C7B;*Uwwxu zDW7u{VV&33)7^?n5408Z zJ)o}yd^`Po|3JSr&@baW`dusQmlUU8>IL;%8>in*&~L4*-y&H*DvyS1V){Lc?-(Cp z-gAMs0k%L_`f$+*tm}Q<|x{p`@w0{4@@821sSaG(XuKzb+3mh+XmP zuV?YZsd0AwERrnF(>lBpM#KGI8+mQJ5A*aMwa4)@1&NQI2E$;a@msSofe=*7Sv z0@9&_5%}BaaMeH1!FT~3ro?neJx2$ptiv2p2dAjRWLXENsDnPHLp5ad!FN)CrvWBG zhdz85%mTd#^oO9ojSeRUFFX(L4;F=z&f`n34=TQtevS?hN|%@ukg>aX;o_3FNhdUJZR_fL;RnZqOHjmUKwtH9Mu9F&BQFYr*)j^)M2?b+9$1KI$aECe3{4&Xa3t)C8*T@U&&XxbC-R==nP?_EQ!lcw#!cc?R_;}O<6hM&Nv zwt+ITyaoK&heyIk2gpV@$Trdxmc?1={(&X()5-w340u`@Vv^lHaAl|jxh41-#Zsj& zLn^$#ut!J2o`G$Vq8iNsUH%x@X$pL`Fk8=8@Dua5MW(_&(|p?^`nr)YH<&qGq?v#n zF?Cp#+BrNiOA}FL{k6MZ+~Y^W^-+$m&r5w~Qo%_0x)JI5MP(!5y6D(ldY<&yRjKM4 z3BNEfPP8989K?6;kMWIL2VXt}TO0=c66igkp9W2~`vKtG=h+RN9Q5HVnnEtl2D*VV z*#^=I&=#KE+t2h*38@z73h1e2N zkj%jb{Tgn3Xor&(ryb9PCYhGZ*lg|X*K*0BEAsMrHSCmKJ`#TZkh(n^&y|@NV>SHd zPV_$(v<~CdfmY6QDQ2BTH)@m$rF1m60k>&7nw!6hZgSw!{vt5tPyefw?*wk&r)}mU(M``}bu_>Ex9Fzl zfJ1*r{&QoSBi~5ndq<@Dx@dHh9{tP)o(^0GOyfC$AvR0tP;G8+XInsCkj9PWg)dFd zUbdcd!z^#p_kTmxbPe7M#Y9GrN0&3QeX7~DXt$Ge~qx9$IAgEUqcSioK5<$}1{ z^%xY6ZrnNP(w|%F^-HB3`ls3f+`OVt3}@h+2m=uO99{kk4g;qzbQGOii7szPSGl41 zCay4`FXGl%<;(Fa3mwzBdRyaK2dFdzkx&>wDZ)ww|5}74h@Dc*0Y(n^tS*Pr9}4tE z3u3t>z;wkdj2NW6gwbx zpeV9{b4os86-SarKU)~foKBX5_>!DT8;O_1k$tLmRb|84wJ@z;2sZdVBra3>OQU(V z)>f~mUMbo|(Lgd9SLkC`H@Jf?i4|+ep$aa~I>l}r?50ds6~#ADncZ7okNbFzq94v% z(dL;J2G=B&@S1$XN6PLfGZ)4L7r}k8IpVv14!`_a40cLQ7_d@g5V;i^<2+Fup`aQRHKnQZdjntXnRxedB zEw13|y$(V2PbpdlWNe{Ju^^*^9ugxyun&mw7qlOUZY>5%fQt{h06Qw$f=4U^?KE;2 z(b$<4vSY->7%_FSHYr7ynwFkHeUFM886DvPTb(y{qqb3+MZUp9u_PYHx#1nOk^U?F z%L4xoED%K^F$q(wBqbbUSRLXBaCBmN91sxJz>eX&0zNN`u_E~N%#MJ^r)Dw62A`%G zj_2%5H0q@`IBK!+XouHd3j1a_60t4#!7CWc5YIqMRX zUxP(eRSP)%qHDfa#LYHbZfGoB=k>003tX9TCjN|!(6GF0QV<5d$>7ilJ{E>T~q znWSZgfD;jeLE9Q;a5Q-WP4yBE`kBFL3pkkpV^fJl_}oEeKpZQ6(YZlrbU7LoQtZR; z6~oyK6su^p`Te#gWv#DOR(k^XBzz9Yur~U}?05nHbkJcXnu9-&FBmXZ3DD`OF63{xP{%CDdUsTTkQ1TT2?V=1h zQ9VjD{Yt$qd}k(j6?afdQtDC69P0V*0)C)Sf>zLYH5HRGt_d9VM|w=3D!~-7hV-NK zw+yUOuLku9O3!1z>rjuDAK6;`-xDZC`YDO}pkxO?bg>@AbsJF+rimq`o)L;&jo2@5oPqlV&`MJDxC0p^57lGk04yrn7nP*YWH;)M)|{9? zpvzdIGJ+oh6q{0^5%p-VQ<5_7Q^>%WJ|%xC>djUdVCst!VNo`bW2_nVUXW=*O1=LE DM>N8C diff --git a/galaxys2-common/proprietary/system/bin/bcm4330B1.hcd b/galaxys2-common/proprietary/system/vendor/firmware/bcm4330B1.hcd similarity index 100% rename from galaxys2-common/proprietary/system/bin/bcm4330B1.hcd rename to galaxys2-common/proprietary/system/vendor/firmware/bcm4330B1.hcd diff --git a/galaxys2-common/proprietary/system/bin/bcm4330B1_murata.hcd b/galaxys2-common/proprietary/system/vendor/firmware/bcm4330B1_murata.hcd similarity index 100% rename from galaxys2-common/proprietary/system/bin/bcm4330B1_murata.hcd rename to galaxys2-common/proprietary/system/vendor/firmware/bcm4330B1_murata.hcd diff --git a/galaxys2-common/proprietary/system/bin/bcm4330B1_semcosh.hcd b/galaxys2-common/proprietary/system/vendor/firmware/bcm4330B1_semcosh.hcd similarity index 100% rename from galaxys2-common/proprietary/system/bin/bcm4330B1_semcosh.hcd rename to galaxys2-common/proprietary/system/vendor/firmware/bcm4330B1_semcosh.hcd diff --git a/galaxys2-common/proprietary/system/etc/wifi/bcmdhd_apsta.bin b/galaxys2-common/proprietary/system/vendor/firmware/bcmdhd_apsta.bin similarity index 100% rename from galaxys2-common/proprietary/system/etc/wifi/bcmdhd_apsta.bin rename to galaxys2-common/proprietary/system/vendor/firmware/bcmdhd_apsta.bin diff --git a/galaxys2-common/proprietary/system/etc/wifi/bcmdhd_mfg.bin b/galaxys2-common/proprietary/system/vendor/firmware/bcmdhd_mfg.bin similarity index 100% rename from galaxys2-common/proprietary/system/etc/wifi/bcmdhd_mfg.bin rename to galaxys2-common/proprietary/system/vendor/firmware/bcmdhd_mfg.bin diff --git a/galaxys2-common/proprietary/system/etc/wifi/bcmdhd_p2p.bin b/galaxys2-common/proprietary/system/vendor/firmware/bcmdhd_p2p.bin similarity index 100% rename from galaxys2-common/proprietary/system/etc/wifi/bcmdhd_p2p.bin rename to galaxys2-common/proprietary/system/vendor/firmware/bcmdhd_p2p.bin diff --git a/galaxys2-common/proprietary/system/etc/wifi/bcmdhd_sta.bin b/galaxys2-common/proprietary/system/vendor/firmware/bcmdhd_sta.bin similarity index 100% rename from galaxys2-common/proprietary/system/etc/wifi/bcmdhd_sta.bin rename to galaxys2-common/proprietary/system/vendor/firmware/bcmdhd_sta.bin diff --git a/galaxys2-common/proprietary/system/etc/wifi/nvram_mfg.txt b/galaxys2-common/proprietary/system/vendor/firmware/nvram_mfg.txt similarity index 100% rename from galaxys2-common/proprietary/system/etc/wifi/nvram_mfg.txt rename to galaxys2-common/proprietary/system/vendor/firmware/nvram_mfg.txt diff --git a/galaxys2-common/proprietary/system/etc/wifi/nvram_mfg.txt_murata b/galaxys2-common/proprietary/system/vendor/firmware/nvram_mfg.txt_murata similarity index 100% rename from galaxys2-common/proprietary/system/etc/wifi/nvram_mfg.txt_murata rename to galaxys2-common/proprietary/system/vendor/firmware/nvram_mfg.txt_murata diff --git a/galaxys2-common/proprietary/system/etc/wifi/nvram_net.txt b/galaxys2-common/proprietary/system/vendor/firmware/nvram_net.txt similarity index 100% rename from galaxys2-common/proprietary/system/etc/wifi/nvram_net.txt rename to galaxys2-common/proprietary/system/vendor/firmware/nvram_net.txt diff --git a/galaxys2-common/proprietary/system/etc/wifi/nvram_net.txt_murata b/galaxys2-common/proprietary/system/vendor/firmware/nvram_net.txt_murata similarity index 100% rename from galaxys2-common/proprietary/system/etc/wifi/nvram_net.txt_murata rename to galaxys2-common/proprietary/system/vendor/firmware/nvram_net.txt_murata