From dceee8cc09a54f96dee82a6e95e3e77a6dd7ac13 Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Mon, 22 Oct 2018 23:47:56 +0200 Subject: [PATCH] ipq-wifi: drop custom board-2.bins The BDFs for all boards were upstreamed to the ath10k-firmware repository and linux-firmware.git. We switched to the upstream board-2.bin, hence the files can be removed here. Keep the ipq-wifi package in case new boards are added. It might take some time till board-2.bins send upstream are merged. Signed-off-by: Christian Lamparter --- package/firmware/ipq-wifi/Makefile | 4 +--- .../firmware/ipq-wifi/board-zyxel_nbg6617.bin | Bin 24276 -> 0 bytes .../firmware/ipq-wifi/board-zyxel_wre6606.bin | Bin 24316 -> 0 bytes target/linux/ipq40xx/image/Makefile | 3 +-- 4 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 package/firmware/ipq-wifi/board-zyxel_nbg6617.bin delete mode 100644 package/firmware/ipq-wifi/board-zyxel_wre6606.bin diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile index a5555d5d7c4..51da4bc465f 100644 --- a/package/firmware/ipq-wifi/Makefile +++ b/package/firmware/ipq-wifi/Makefile @@ -17,7 +17,7 @@ endef # Please send a mail with your device-specific board files upstream. # You can find instructions and examples on the linux-wireless wiki: # -ALLWIFIBOARDS:=zyxel_nbg6617 zyxel_wre6606 +ALLWIFIBOARDS:= ALLWIFIPACKAGES:=$(foreach BOARD,$(ALLWIFIBOARDS),ipq-wifi-$(BOARD)) define Package/ipq-wifi-default @@ -51,8 +51,6 @@ Don't install it for any other device! PREV_BOARD+=ipq-wifi-$(1) endef -$(eval $(call generate-ipq-wifi-package,zyxel_wre6606,board-zyxel_wre6606.bin,ZyXEL WRE6606)) #$(eval $(call generate-ipq-wifi-package,,,)) -$(eval $(call generate-ipq-wifi-package,zyxel_nbg6617,board-zyxel_nbg6617.bin,ZyXEL NBG6617)) $(foreach PACKAGE,$(ALLWIFIPACKAGES),$(eval $(call BuildPackage,$(PACKAGE)))) diff --git a/package/firmware/ipq-wifi/board-zyxel_nbg6617.bin b/package/firmware/ipq-wifi/board-zyxel_nbg6617.bin deleted file mode 100644 index ab4d43e8cbc949c06f74e332807b8d92239a7de0..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc-jL100001 literal 24276 zc-rlpdr(tX9>-508tbBRLx>1?2_cXKAwZxSB=U?jKnj*B5?~Ri50V0EsUQdFtXFx%qhkc`8NV z2l94qNzX+#_ToiNG)U@gs=Y!k-o zLxFAhd^UwNLPJA;dj6auW~>G;|9C#i5*!&|q1>CAQE%!Aj6>$$%m#3R6$4@b6Cts{NVDpsT>y!{gL@EblCjC`)E zDa*@9fQ19P`Z7hvu7t>u9-2*`Ae{JN*?)08uU;>{o2>MLz| zw>GfU^Wf0A{Ns@a_-R=9ZCFpD6lA(YUg=geOKY~2dgR~yyrd(j(yPEF2OyRut7vci zV%-MJ#dYH*kIm!Lc{vNP2?~Xb92^`dMC|AYKbBXUp$#_|NLi0Q+9kv}93S}bWqW)3 zu)W#rH0l~aLHqx|O?rB2GMnuMt)G8>{^Qsfapfc8`}&yj{`KSUez49XGB-QX9H`WP zlh=k6EB_ZSo;@|yedAXn{qTB(NGt35i9qCqnGr&Q1p)p%-qN&Ynh%C!SPUM6h2SAr zfx5i%V98#|mN} z$6|?iq99QgjYnfrT!;$=!pA~vJHB18T^5W7Vr=?kF6$VGqxI8o7K>otYh-McUIqT9efwb_$=7-yn(KIkppr- z4#)vHAP@)y0)ar-W}|Q;=0$%;_zspr-zMCKMbXz-0I7Kmmj@qM$KnMsy^psn*sTxr zN+RaUi)k#8fl=&SZ%GVA(A=Bg9&Y>q$)8Jt8TV_8Fdx=||C2lRz{kPPQ&uD-F zmmm050E7TPIskqQ065M7u$@h5Jv{`l*`A*4DKx?S>A7rnRwD<911R99qX0C~FiLb7 z0K7FA5CbtaXEg>KTpiYC!PMEAg4PaKIO79O3C-`2ibW(DFE!u*dbI~LeHMCV^Hmo?+$wCuxm7u&lHH;mudvN!uruw^l}y3re#Imp%?yqs2 zn9S?rxy^#mX_#Ur(}x_}tJs_`WMViyUKo!h)3*w@Vv+QWR$`m|{(ZSz@XS|VzipDf z{)mu5p@*d%uP4>suAOk&IWVP}+Qeql*UKmA>wz8h_1C9nEL2}l@Zhl%kWfsUrNpAI z$1&^rCY?KNwc{$PmCpUf_%7Qe`8XgD2*gU}_4@jM{`F74|Ni^m0&9K! z_}~8Who?{f3~cM`#p1AFQ{LFvKmKli%{|iBBYi#6*RKqHy)2#h^7`(Rh3f0S8#FfQ zOEhWnpzm%Pb@~cTwp?Vqp}(jpl*fyFje~|Rtwt#qc@n?o0Di;}s^qoqjJXsWA{I$M8qmsvpScJpf`&=#{t0^^UnzYedhBmEQ`M!Lc;grcPLfT7*WvZZNp`4nR2hl-Q>XcBj(VcFV`N_B*VgX?Q!KUc@P{( zi$*O^67ffG7+SSO$`mPwaQN~*AMT~=#uk0CHd`YZ9fpO)nk;1^9OfmsFQY{`EN#=5 zD&wS^NQZ}99=e%84#)vHp!Olh z)(-6H5MA)9pew6;vfG5GaWy?}_-f(B=#TkD^gR!H6^&6`jV@4B5gd-58#SF%2I&HU=7rZ+{$J;78NuBk6a)UZqF`)XQJ zPKTAa$(^Lv`}Tbz`q)e5n%!+sbV$y#)L2eWU$I_%ie2a|AL=Noi>nAwF;gFXkysm0 zw&|er-kyO&o$(Eva>l{t-XrZ%HGan#xmQ{g)sbrdLoP|(SC6(vob)MTWViO@w#3wW z7t^zwx)rVB(>}#6S?B8ZeiWu;XVRkwdyCtW&+$s#4xl3lfmpsQ_TM&W*38iUtAE?@ z_2s~a58IpN)eq#c1|FDJ<``NZC>f>yEXv8ae`qz zp}P+OYrFVWWccb;N^0aCsAi2kphy4){KGkg&eRYl8k-i@3>yf@5>Fe#ne*nRpR?7eY diff --git a/package/firmware/ipq-wifi/board-zyxel_wre6606.bin b/package/firmware/ipq-wifi/board-zyxel_wre6606.bin deleted file mode 100644 index 262c07b04a898eb8e2629d2fed11d517df96b3f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc-jL100001 literal 24316 zc-rlpdr(u^9mh`~JX9RGNqEBzBtQ}uBJW1Pk_2P}+=@m70*ZhvCRei}?+_dxYYS+I zR9sestkIz=0;vzix5U=!x-;t7PXFk1X5CJoGu^4o*sbIAVS4UOU;}Dd6bicMll*c| zemCE9&pjkJC-;20YcpgqvV28cY;KG^Po~TSTCEm9wk-!VsW2+)Ygd-5E21m3nwZUM zO?8Z>a%C+2tYUk4O(pd-J~6tXyhc<0Vcp7NUC}Bcrck*mIXO02%Ygc@>azRqryhz5c}>KJ+pGfJF&#$pkM)Byy}uNJ#kl$rDBz#~s*gwsb0<{o!D`D+jz5 zVF28jn(JiPm#}Wzx39^2qU7VajYGBZ#n-2U*qF#tilpn-YFgVx}yCfOmvy{Poz zu#6IP^)~1VvPDqvV_kLeI!Wy4$=>}sb#X4-)^P73m{Uq(X@N)}n9;83AV`1&?;e?wQwM}mfc%B#aIeMvj{)qdrtPHK)Q z_P^H{tiCebaBTT5ZZ*3MAl^#cJQgik>W#5|{R4wTxwaR0HVv=}`Wu+RaB*>AP>-&z z@Y~qkfroi_nKbO~&NcCPL;I7u=MY--~RdebKi*^l??UraA7k4Lyrv^PWpdL=;wSi zG6csX)N+?`hzcqvm>?>Gg2!`|xS^qMl8cIR^kyd0i-#&KBEE)XNg(&SXdAqBn~2ca33rHm*aA={GJ@k!E?kpgcO%z3OpW< z7sua=$5QYVaS9QO$6^wEV%w$@FE38C$!UwI_*z9a&VJ0sg7IK+Fp+_0JkG#!@mz5( zk$@*WPQX&}RBk^bzpn}(bt@(r;~!)zWm(5M#)kN^pg00|HX1OkCT zAP@+|IDdbE1=29aEWhq8gV>-pjNGS}O$PJG{i#cVfI894&V&|pW28|=G~atrpSiQo)!Ap~h&A~|8_FuxhR(xB`po^Oht7^%zVWl$pWmPP3a5FzcN9R+gA%N^ z@tIJ14wR6$jn9J8^Pfa~+xQG9>RrS_=iAH~uP!L9GIoD@(sI%I*{jO$YX5MabFdIR zL>xkJK<4vIjKB#oL1co&=ZRPvo+eHs5`nVf(24W6oFD(Mhow3HDKy{A)N`LSt>=F0 zbq0f#SkTl-JHUO-_WFI_w-1j49iDqYJHTIrziz7M-fO~hPlYSz^}03;fSXhQHd8(K zA&}{7n%;BojXA$Q9k{u>Gu_-=TwQ6u9R&avZ8QDnftPyjCo#FkS@8OMd$WNzn+@2G z@bmMV6f|-kl{M44V5zg11M2Kp+rv0p+>(9QWLN z&Y$PLxU-?y;kozmd}7aivyQKB$3whmVN_VEeWCiAMEGX1VT#Cs#mLID%se8rO}X2CXfl15tErD zRjVb@)=Q>CdaX(>38MtJt_uX<(FM~UeF;gB#MmiIooS;!nT)brHFT3TicCp76m;pg zjSGHpLm&c=Moc^P1!NYP1-G@grI^eo^DS0GFIlHpB@Cdqu$3&aH|h2$)ugkgX1$V> zkuvK=LkGD2L4GM)Y*m~LYG2JAtT_6-uf);~@l#_Dnc_>iRf^(*0q*fu5 zEPrs#a>Ae^3nf96;Eq)k1;&nADor_tWJ5At$~Gh!l3+u6^!2J-iRi&a%TYrOnWu=L z1fN+&LNL~6sWRo#f^N$uQ>H;|5I?wLIS%_$D#0IJu=bf6$qYpxEw~By0sWXj0wh2J z^m`xi?qE5wzCEQmiVWH~a9r7%+7hAhSJicA?GxP7W%~-yncl8hB>U;~A zuDUW%aVTY1*jC??t9|b`i`0HfZ&|CUup_21WXsZ={XKaM$gvt@MoYBTPkHyJIR~P3fmJ?*{YO9SNUGsivT~Y_ zDh+9Sg|&f|r+PGP->+Y`g`Ioy^!B5v`}j4S(sO-H#uW{bRqR}Cx1x=@@`C@S4rAfY zM3Ps+lAb?P+qb$y*ck8udIup8Z!gnafMeP#aCkWLlKKzVt%(No6*wXzBjBCS3lHOm zhx5V?(H?vdvnfjsxfbB{dtv%-G?i1$)s diff --git a/target/linux/ipq40xx/image/Makefile b/target/linux/ipq40xx/image/Makefile index 51a5be99af6..8a42d3e780c 100644 --- a/target/linux/ipq40xx/image/Makefile +++ b/target/linux/ipq40xx/image/Makefile @@ -223,7 +223,7 @@ define Device/zyxel_nbg6617 # this minimum-size. However, the larger image can be flashed both ways. IMAGE/factory.bin := append-rootfs | pad-rootfs | pad-to 64k | check-size $$$$(ROOTFS_SIZE) | zyxel-ras-image separate-kernel IMAGE/sysupgrade.bin/squashfs := append-rootfs | pad-rootfs | check-size $$$$(ROOTFS_SIZE) | sysupgrade-tar rootfs=$$$$@ | append-metadata - DEVICE_PACKAGES := ipq-wifi-zyxel_nbg6617 uboot-envtools + DEVICE_PACKAGES := uboot-envtools endef TARGET_DEVICES += zyxel_nbg6617 @@ -232,7 +232,6 @@ define Device/zyxel_wre6606 DEVICE_TITLE := ZyXEL WRE6606 DEVICE_DTS_CONFIG := config@4 DEVICE_DTS := qcom-ipq4018-wre6606 - DEVICE_PACKAGES := ipq-wifi-zyxel_wre6606 IMAGES := sysupgrade.bin IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata endef -- 2.47.2