From c3d9fe96dc081f412a9d2adc4da5b7d3d2a45d5b Mon Sep 17 00:00:00 2001 From: Mathias Kresin Date: Mon, 8 Jan 2018 23:24:44 +0100 Subject: [PATCH] ipq806x: drop partitial supported boards There are only artifacts for these boards in our tree and not even partial support. Drop teh stale files. Signed-off-by: Mathias Kresin --- package/firmware/ipq-wifi/Makefile | 4 +- package/firmware/ipq-wifi/board-nbg6617.bin | Bin 24276 -> 0 bytes package/firmware/ipq-wifi/board-rt-ac58u.bin | Bin 24276 -> 0 bytes .../arm/boot/dts/qcom-ipq4019-nbg6617.dts | 135 ------------ .../arm/boot/dts/qcom-ipq4019-rt-ac58u.dts | 197 ------------------ .../0069-arm-boot-add-dts-files.patch | 4 +- ...dd-quirk-to-autoload-ubi-on-rt-ac58u.patch | 29 --- 7 files changed, 2 insertions(+), 367 deletions(-) delete mode 100644 package/firmware/ipq-wifi/board-nbg6617.bin delete mode 100644 package/firmware/ipq-wifi/board-rt-ac58u.bin delete mode 100644 target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq4019-nbg6617.dts delete mode 100644 target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq4019-rt-ac58u.dts delete mode 100644 target/linux/ipq806x/patches-4.9/400-mtd-ubi-add-quirk-to-autoload-ubi-on-rt-ac58u.patch diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile index aec8bf27c2..95c56270fe 100644 --- a/package/firmware/ipq-wifi/Makefile +++ b/package/firmware/ipq-wifi/Makefile @@ -13,7 +13,7 @@ endef define Build/Compile endef -ALLWIFIBOARDS:=rt-ac58u fritz4040 nbg6617 +ALLWIFIBOARDS:=fritz4040 ALLWIFIPACKAGES:=$(foreach BOARD,$(ALLWIFIBOARDS),ipq-wifi-$(BOARD)) define Package/ipq-wifi-default @@ -47,8 +47,6 @@ Don't install it for any other device! PREV_BOARD+=ipq-wifi-$(1) endef -$(eval $(call generate-ipq-wifi-package,rt-ac58u,board-rt-ac58u.bin,ASUS RT-AC58U/RT-ACRH13)) $(eval $(call generate-ipq-wifi-package,fritz4040,board-fritz4040.bin,AVM FRITZBox 4040)) -$(eval $(call generate-ipq-wifi-package,nbg6617,board-nbg6617.bin,ZyXEL NBG6617)) $(foreach PACKAGE,$(ALLWIFIPACKAGES),$(eval $(call BuildPackage,$(PACKAGE)))) diff --git a/package/firmware/ipq-wifi/board-nbg6617.bin b/package/firmware/ipq-wifi/board-nbg6617.bin deleted file mode 100644 index ab4d43e8cbc949c06f74e332807b8d92239a7de0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24276 zcmeHPdr(tX8b3f3b+K|ohzNKIAwYrF7CNWZXS>;2@eZ$zi`g^ z&f`1hJHLB!bMHMr?mLO`A@RFK;bEyE3F+|}LLisR0hFvzEC#?IhC)Tzj)J1X;6k}H z$kafo#Pjxb%W@MuBlek>cl71}w#whU;;2(38j-~gOzsF9giA3;4Z$_HSbvnx~p zfbkmV)5WavuD}pVn)D-q7f`0x5$896 z6O4EeFQmY^=s$Q{%tu@|rLlAO*whKs))~iT0R6|J8fIuz^O9Jav$ON6RjZuL1b{ns z%+wurXCCM}fBc%drBa@~J2_!| zKz*jZRQgWx*6~58l}R&_-~0v2gKs#2VEi+6ePv;GGOQd{H&sfrcO}P+_hZdq86O%n z)K_GSlcRM84+De1_*L~;IKtb>QRAOO1DVdC4|YwuE=nJur<-iCsTr~`qS-l_LmN^6qj+*j^V8!Rrw?NO4W$5EiiUA`QZW62=V1%TiRwSfQ?B|P|$!;5g6pQQSmfLhf$%TR4(-q74bwpxt?NI z)D`hS6VL>1!lMKv1x?|mh~v;WM1=BC9+&rshipf;bGM7b&@hCL8lBKwvaSLaD@-r! zEAv-%vx5^13h1-0;?ooej5A(D)!QhYM$MZ*r5UBwsL{+->phsYbwk~rx*=Yu7uQRi zh$cQwL{iaIZmKu}jd&V?M5EE%XmM3dRSmv0^aq5=4Cq6)g}N%@FHc z)6c*VV{5ngBh8R`@Smrc{j^wBt$knSTJ}0zlah0=<>-?rkth)$KrRgeU@VGPBuW+t zkQovI5&;qc5&;qc5`h(rz((Fi#E1G8?=2*qx{bFDiKVW=1!NR9UmCe@9_#M4?T%)S zu@;vF8)F3@LUQVMBJg~M*xA8iHMez#z}9w)<>w;xE6y!ajXnkdrpHx1qmQSj@KG%G z>^p$PT;dw`)L8H7($tnHev7oM7OdMifB?52IJE$Tg8<0S34m-M79>G2VZhQRYB*pr zy}g;!q!pIWEM+otTUbC4>;Qf`3P7tf;t&@J0DBDr1VBK^UyT4qcgJ!X;{dg)Mu=X_MD;IXqo1w>b9l>$h3( z>yPjp93Z*=c$1Fp?cM_^NBNMa?W{)unT=mBvEbK(1?1OX!;b@=&Xr$}+24QU0)!6w z58fZnuSek|O`_+yJFj+HMKLnn0l5CcUfR74{Cd-%P+I_AKRmqwEZ_pav;YgZ*qL7s z1vi~*$|N+5qxH~!PrK{RpzosB(uYl65?WYR3>w6;lqhFOeIaT!d-;mowk0P$`@#TV z38G|++hiLO0TKZcf#r&Ti63u`U;m$f{Pj=YfBy$KIX&kds{{63o=iHP0dhEUp-U1HbcVV}Uijh`tR7ifk5gj|Z_|_@$)=Le~Mqtuv zU7gj;mS-ieAHQClg+0{1^VsqZ!<3uty!ze9M60G;nJEeV?#6^#Q?1OC@F%WoE+|VR zNqql_5pAzZDUoR6b|&y0$}ADoYo!FoQ4e zaUe?9CfYS+sywA|atv0MDRX5h(9Mew%Q!v?YdbX+vP97)oxuY*2YX}*Uh0!B*>V6$ zlt`2a5O^Jy2Eo+G;uVWP+sKj2v8^F>Uga0Hzf}v*1y*l5a_mCVNluApp-a-;-UDZM zDE$s?lw2G+b~&LXw9ZR0GJH^za(>J2ypEph$!rX-V#qe6ecgY!Ij+`Uz9~;Nyr-Lg z-lv)>tLx9}WxJzb=s-$WA1y`@4V4p*u1@l@xFV`S2vUc>FU4}bh-Ab;!<=yvz)rGzCHbPWVwgL zMRaX&-^ct9edO+WeOhU^@Ek*dR>rNep@=1RE9KTv7UVSfoyClm6hBp9+gM9mSy_{NI z_{x;(IP#7Z14kY>2q8Z|D2i3$N(l$fwd)v`fx?)hQ>57|Kmg;vQy~96tL@5z#o)g$ z_7sSC^?3QO$*sr6Ci(SdEPFy8v|;m&lgc1^X2{jAHkef%K!iX diff --git a/package/firmware/ipq-wifi/board-rt-ac58u.bin b/package/firmware/ipq-wifi/board-rt-ac58u.bin deleted file mode 100644 index 379bdc8ce20b5760dbbdbf9790ca9f5b20c4df3b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24276 zcmeHPTT~NC8ZMBVib^Np7D5w}00~P11QsJi2_Z58qA;u?MAt<`B>@%$ zIyy20j35UUx%9fqVRdGd+0}8KJ(}b0%e?urZ}T8~JbU)|uku!Snfhp`x;>{ldUufO<_%qsy7N~JVdeM7>-*zdBWjo>9~Vk=v=jo~ zzH8TS*n}_xgG0l@BdAaOxf1`3ofE2;O$l#^;2n~Or>Ca}p08Qs?d|O|Bfj@~YSi4P zC-Q|Xfq)NxqIi*!d|o7vSLo$O+*a8PMORiDfeRPv>v!$aWXZt#^*%nNH<>7k&*MeF z3d{FDZ{EHQgc@nXjp6>jo?c%6Bbs^ud;Q5#RxYm@gZCqF_?p(PF+Aa(;%p=~Rv1kh zma4_hNObh_X!cM+Pz1?9Gmu0y5ve)e+}eJo>(bzS1;}S4+9`#BG9-*=41|rcC2UOq z8i0hLN>nLPK2st&XpSUDqd*mi8kM3_iS(HiNkvm7shR{d0g<6p5IyGEcx+X`rC^EW zE?wo#UPP{ab?GjwMzHU~%4*ei>8jPZ_Ejdze8oh<&@f4uCKJtkm5Jn{xsqH>5}NcX z2}wiKBx#!FR=6~JtaEfoAP{hWnH*ocHD}CY)+uUy*PO1k#$ZznsKh2?_(_`%jRPhUqX87?t;J!hvB``akSlg2Xd_jntkQQiRS>o zve7s&@%-JA51-p}QIr$P;`6y&l*0}Qf|~2tcux9*NojNCbQY@}(fbh6i~&RFXrx(p&UG=_~p> zOn6D8051giws~`h;rW*@egZ%K_!Cj$I-Y1*eF*$~+n?p>RR(t;0Pyhi^7{(PH7FDk z_n<7rrYV9St^*T4EL6rsM+rV;B6se{y*hGtPLsc@XkSTLx$(l6Jy!;XhR1GC+cK?4Wi*iTzKFw1e6Kbsoe8d$>QkAJIZ^ zr%)Z)Gu~Oa|8Q6L)f?F4)L$3U-3b%xxv<`{5Dvo>y*;&UVU z^`o~vJRrHg@dCm24jh0dN&pD-g(VbtOG)tS0r2u7Ew(xTH}m=RkY|uirN#2=p_lJ$ zJpr&3e*L3o{y^nH9@MyajJS?c2BNgjb6*UlLg4)(h6Z0`r5~f^G*fBS0hIMhKLYXbVYxJ%bUjft;9={Q45I|Aq~ougU(04^v~Z+3=of z*~K2eUN|GskZvpx@VMbY(E|KgKK_V&DKZni zl;&IN%a=pS%JS=}P~`I2U}%*B#VJS}c~(NM1?!w}MfzFs9ACTE+Dt>xGSK@At*pHhsoYiD}GJ7b3%QtcU11%ER77`=y$9;t6g-IUFx6p-O!~mbLGB#Rh$6vni#CF-LB>d1KFLXyi>{bA;tdcyQ9CmEIScV6}W$* z=h(sQZE<|2&xpCcE?Xm&1%^%Z*LG#L#8m|qJpDt?*|?_A!vTA4cQ@v?+_iaR59S9YEgHiR5nwF`%yIE{cCAh6W8ZTMP?9XyD)Z8U1-Qejk-0RF%?ZE*RK zk-W%4Zo&dK$FG-2 zBw}$Ke7Q`tD{I2p_*_tf=t05pb3x737xFM6{ivpO^!K)M!ZF lMMS -#include - -/ { - model = "ZyXEL NBG6617"; - compatible = "zyxel,nbg6617", "qcom,ipq4019"; - - memory { - device_type = "memory"; - reg = <0x80000000 0x10000000>; - }; - - aliases { - led-boot = &power; - led-failsafe = &power; - led-running = &power; - led-upgrade = &power; - }; - - reserved-memory { - #address-cells = <0x1>; - #size-cells = <0x1>; - ranges; - - rsvd1@87000000 { - reg = <0x87000000 0x0500000>; - no-map; - }; - - wifi_dump@87500000 { - reg = <0x87500000 0x600000>; - no-map; - }; - - rsvd2@87B00000 { - reg = <0x87b00000 0x500000>; - no-map; - }; - }; - - soc { - pinctrl@1000000 { - led_pinmux { - mux { - pins = "gpio0", "gpio1", "gpio3", "gpio5", "gpio58"; - drive-strength = <0x8>; - bias-pull-up; - output-high; - }; - }; - }; - }; - - gpio-keys { - compatible = "gpio-keys"; - - wlan { - label = "wlan"; - gpios = <&tlmm 0x2 GPIO_ACTIVE_HIGH>; - linux,code = ; - }; - - wps { - label = "wps"; - gpios = <&tlmm 0x3f GPIO_ACTIVE_LOW>; - linux,code = ; - }; - - reset { - label = "reset"; - gpios = <&tlmm 0x4 GPIO_ACTIVE_LOW>; - linux,code = ; - }; - }; - - gpio-leds { - compatible = "gpio-leds"; - - power: power { - label = "nbg6617:green:power"; - gpios = <&tlmm 0x3 GPIO_ACTIVE_HIGH>; - }; - - wps { - label = "nbg6617:green:wps"; - gpios = <&tlmm 0x1 GPIO_ACTIVE_HIGH>; - }; - - wlan2G { - label = "nbg6617:green:wlan2G"; - gpios = <&tlmm 0x3a GPIO_ACTIVE_HIGH>; - }; - - wlan5G { - label = "nbg6617:green:wlan5G"; - gpios = <&tlmm 0x5 GPIO_ACTIVE_HIGH>; - }; - }; -}; - -&spi_0 { /* BLSP1 QUP1 */ - n25q128a11@0 { - status = "okay"; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition0@0 { - label = "all"; - reg = <0x00000000 0x08000000>; - read-only; /* for now */ - }; - }; - }; -}; diff --git a/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq4019-rt-ac58u.dts b/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq4019-rt-ac58u.dts deleted file mode 100644 index 6efd0df19b..0000000000 --- a/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq4019-rt-ac58u.dts +++ /dev/null @@ -1,197 +0,0 @@ -/* Copyright (c) 2015, The Linux Foundation. All rights reserved. - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - */ - -#include "qcom-ipq4019-ap.dk01.1.dtsi" -#include "qcom-ipq4019-bus.dtsi" -#include -#include - -/ { - model = "ASUS RT-AC58U"; - compatible = "asus,rt-ac58u", "qcom,ipq4019"; - - memory { - device_type = "memory"; - reg = <0x80000000 0x8000000>; - }; - - aliases { - led-boot = &power; - led-failsafe = &power; - led-running = &power; - led-upgrade = &power; - }; - - reserved-memory { - #address-cells = <0x1>; - #size-cells = <0x1>; - ranges; - - rsvd1@87E00000 { - reg = <0x87e00000 0x200000>; - no-map; - }; - }; - - gpio-keys { - compatible = "gpio-keys"; - - reset { - label = "reset"; - gpios = <&tlmm 4 GPIO_ACTIVE_LOW>; - linux,code = ; - }; - - wps { - label = "wps"; - gpios = <&tlmm 63 GPIO_ACTIVE_LOW>; - linux,code = ; - }; - }; - - gpio-leds { - compatible = "gpio-leds"; - - power: status { - label = "rt-ac58u:blue:status"; - gpios = <&tlmm 3 GPIO_ACTIVE_HIGH>; - }; - - wan { - label = "rt-ac58u:blue:wan"; - gpios = <&tlmm 1 GPIO_ACTIVE_HIGH>; - }; - - wlan2G { - label = "rt-ac58u:blue:wlan2G"; - gpios = <&tlmm 58 GPIO_ACTIVE_HIGH>; - }; - - wan5G { - label = "rt-ac58u:blue:wlan5G"; - gpios = <&tlmm 5 GPIO_ACTIVE_HIGH>; - }; - - usb { - label = "rt-ac58u:blue:usb"; - gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>; - }; - - lan { - label = "rt-ac58u:blue:lan"; - gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>; - }; - }; -}; - -&spi_0_pins { - pinmux_cs { - function = "gpio"; - pins = "gpio54", "gpio59"; - }; - pinconf_cs { - pins = "gpio54", "gpio59"; - drive-strength = <2>; - bias-disable; - output-high; - }; -}; - -&spi_0 { /* BLSP1 QUP1 */ - cs-gpios = <&tlmm 54 0>, - <&tlmm 59 0>; - - m25p80@0 { - #address-cells = <1>; - #size-cells = <0>; - /* - * U-boot looks for "n25q128a11" node, - * if we don't have it, it will spit out the following warning: - * "ipq: fdt fixup unable to find compatible node". - */ - compatible = "mx25l1606e", "n25q128a11"; - reg = <0>; - linux,modalias = "m25p80", "mx25l1606e", "n25q128a11"; - spi-max-frequency = <24000000>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition0@0 { - label = "SBL1"; - reg = <0x00000000 0x00040000>; - read-only; - }; - partition1@40000 { - label = "MIBIB"; - reg = <0x00040000 0x00020000>; - read-only; - }; - partition2@60000 { - label = "QSEE"; - reg = <0x00060000 0x00060000>; - read-only; - }; - partition3@c0000 { - label = "CDT"; - reg = <0x000c0000 0x00010000>; - read-only; - }; - partition4@d0000 { - label = "DDRPARAMS"; - reg = <0x000d0000 0x00010000>; - read-only; - }; - partition5@e0000 { - label = "APPSBLENV"; /* uboot env*/ - reg = <0x000e0000 0x00010000>; - read-only; - }; - partition5@f0000 { - label = "APPSBL"; /* uboot */ - reg = <0x000f0000 0x00080000>; - read-only; - }; - partition5@170000 { - label = "ART"; - reg = <0x00170000 0x00010000>; - read-only; - }; - /* 0x00180000 - 0x00200000 unused */ - }; - }; - - mt29f@1 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "spinand,mt29f", "w25n01gv"; - reg = <1>; - spi-max-frequency = <24000000>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition0@0 { - label = "ubi"; - reg = <0x00000000 0x08000000>; - }; - }; - }; -}; diff --git a/target/linux/ipq806x/patches-4.9/0069-arm-boot-add-dts-files.patch b/target/linux/ipq806x/patches-4.9/0069-arm-boot-add-dts-files.patch index bab2808789..a6c66d703c 100644 --- a/target/linux/ipq806x/patches-4.9/0069-arm-boot-add-dts-files.patch +++ b/target/linux/ipq806x/patches-4.9/0069-arm-boot-add-dts-files.patch @@ -10,13 +10,11 @@ Signed-off-by: John Crispin --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -618,7 +618,18 @@ dtb-$(CONFIG_ARCH_QCOM) += \ +@@ -618,7 +618,16 @@ dtb-$(CONFIG_ARCH_QCOM) += \ qcom-apq8084-mtp.dtb \ qcom-ipq4019-ap.dk01.1-c1.dtb \ qcom-ipq4019-ap.dk04.1-c1.dtb \ + qcom-ipq4019-fritz4040.dtb \ -+ qcom-ipq4019-nbg6617.dtb \ -+ qcom-ipq4019-rt-ac58u.dtb \ qcom-ipq8064-ap148.dtb \ + qcom-ipq8064-c2600.dtb \ + qcom-ipq8064-d7800.dtb \ diff --git a/target/linux/ipq806x/patches-4.9/400-mtd-ubi-add-quirk-to-autoload-ubi-on-rt-ac58u.patch b/target/linux/ipq806x/patches-4.9/400-mtd-ubi-add-quirk-to-autoload-ubi-on-rt-ac58u.patch deleted file mode 100644 index ee19f363bd..0000000000 --- a/target/linux/ipq806x/patches-4.9/400-mtd-ubi-add-quirk-to-autoload-ubi-on-rt-ac58u.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b8f3a7ccbeca5bdbd1b6210b94b38d3fef2dd0bd Mon Sep 17 00:00:00 2001 -From: Christian Lamparter -Date: Thu, 19 Jan 2017 01:57:22 +0100 -Subject: [PATCH 16/38] mtd: ubi: add auto_attach HACK for the ASUS RT-AC58U - -This patch adds a hack that allows UBI's autoattach feature -to work with the custom ASUS UBI_DEV partition name. - -This is necessary because the vendor's u-boot doesn't leave -the bootargs / cmdline alone, so the it can't be overwritten -easily otherwise. - -Signed-off-by: Christian Lamparter ---- - drivers/mtd/ubi/build.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/drivers/mtd/ubi/build.c -+++ b/drivers/mtd/ubi/build.c -@@ -1225,6 +1225,9 @@ static void __init ubi_auto_attach(void) - mtd = open_mtd_device("ubi"); - if (IS_ERR(mtd)) - mtd = open_mtd_device("data"); -+ /* Hack for the Asus RT-AC58U */ -+ if (IS_ERR(mtd)) -+ mtd = open_mtd_device("UBI_DEV"); - - if (!IS_ERR(mtd)) { - size_t len; -- 2.30.2