| Message ID | 8657fdac-f013-7025-e5f1-634665246af8@wagsky.com |
|---|---|
| State | Rejected, archived |
| Delegated to: | Petr Štetiar |
| Headers | show |
| Series | [OpenWrt-Devel] ath79: glinet_gl-ar750s: Use QCA9887 firmware | expand |
Jeff Kletsky <lede@allycomm.com> [2019-04-20 18:33:10]: > This patch corrects the firmware selection for the ath79 AR750S > > The ar71xx AR750S already uses the QCA9887 firmware. > > $ fgrep -A 3 Device/gl-ar750s target/linux/ar71xx/image/generic.mk > define Device/gl-ar750s > DEVICE_TITLE := GL.iNet GL-AR750S > DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9887-ct kmod-usb-core \ > kmod-usb2 kmod-usb-storage > > > Jeff > > > > From cb6e411f8d172a8dde5ca7e075cef67994ac0062 Mon Sep 17 00:00:00 2001 > From: Jeff Kletsky <git-commits@allycomm.com> > Date: Sun, 27 Jan 2019 20:17:16 -0800 > Subject: [PATCH] ath79: glinet_gl-ar750s: Use QCA9887 firmware > > The GL.iNet AR750S is based around the QCA9563 > and uses the QCA9887 firmware for operation. > > Signed-off-by: Jeff Kletsky <git-commits@allycomm.com> > --- > target/linux/ath79/image/generic.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk > index 8588e7cdf6..8e162e1d0e 100644 > --- a/target/linux/ath79/image/generic.mk > +++ b/target/linux/ath79/image/generic.mk > @@ -363,7 +363,7 @@ TARGET_DEVICES += glinet_gl-ar300m-nor > define Device/glinet_gl-ar750s > ATH_SOC := qca9563 > DEVICE_TITLE := GL.iNet GL-AR750S > - DEVICE_PACKAGES := kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca988x-ct > + DEVICE_PACKAGES := kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca9887-ct > IMAGE_SIZE := 16000k > SUPPORTED_DEVICES += gl-ar750s > endef > -- > 2.11.0 something probably went wrong with this patch: ../maintainer-tools/patchwork-apply.sh 1088433 Saved patch to OpenWrt-Devel-ath79-glinet_gl-ar750s-Use-QCA9887-firmware Patch is empty. Was it split wrong? If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". Failed to apply patch 1088433 -- ynezz
On 5/3/19 11:19 AM, Petr Štetiar wrote: > Jeff Kletsky <lede@allycomm.com> [2019-04-20 18:33:10]: > >> This patch corrects the firmware selection for the ath79 AR750S >> >> The ar71xx AR750S already uses the QCA9887 firmware. >> >> $ fgrep -A 3 Device/gl-ar750s target/linux/ar71xx/image/generic.mk >> define Device/gl-ar750s >> DEVICE_TITLE := GL.iNet GL-AR750S >> DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9887-ct kmod-usb-core \ >> kmod-usb2 kmod-usb-storage >> >> >> Jeff >> >> >> >> From cb6e411f8d172a8dde5ca7e075cef67994ac0062 Mon Sep 17 00:00:00 2001 >> From: Jeff Kletsky <git-commits@allycomm.com> >> Date: Sun, 27 Jan 2019 20:17:16 -0800 >> Subject: [PATCH] ath79: glinet_gl-ar750s: Use QCA9887 firmware >> >> The GL.iNet AR750S is based around the QCA9563 >> and uses the QCA9887 firmware for operation. >> >> Signed-off-by: Jeff Kletsky <git-commits@allycomm.com> >> --- >> target/linux/ath79/image/generic.mk | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk >> index 8588e7cdf6..8e162e1d0e 100644 >> --- a/target/linux/ath79/image/generic.mk >> +++ b/target/linux/ath79/image/generic.mk >> @@ -363,7 +363,7 @@ TARGET_DEVICES += glinet_gl-ar300m-nor >> define Device/glinet_gl-ar750s >> ATH_SOC := qca9563 >> DEVICE_TITLE := GL.iNet GL-AR750S >> - DEVICE_PACKAGES := kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca988x-ct >> + DEVICE_PACKAGES := kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca9887-ct >> IMAGE_SIZE := 16000k >> SUPPORTED_DEVICES += gl-ar750s >> endef >> -- >> 2.11.0 > something probably went wrong with this patch: > > ../maintainer-tools/patchwork-apply.sh 1088433 > Saved patch to OpenWrt-Devel-ath79-glinet_gl-ar750s-Use-QCA9887-firmware > Patch is empty. Was it split wrong? > If you would prefer to skip this patch, instead run "git am --skip". > To restore the original branch and stop patching run "git am --abort". > Failed to apply patch 1088433 > > -- ynezz > That's strange -- perhaps another patch updated it? jeff@deb-devel:~/devel/openwrt$ git pull Already up-to-date. jeff@deb-devel:~/devel/openwrt$ git log -1 --pretty=oneline 2c3dd70741 (HEAD -> master, openwrt/master, openwrt/HEAD) procd: add procd_running() helper for checking running state jeff@deb-devel:~/devel/openwrt$ fgrep -iA6 ar750s target/linux/ath79/image/generic.mk define Device/glinet_gl-ar750s ATH_SOC := qca9563 DEVICE_TITLE := GL.iNet GL-AR750S DEVICE_PACKAGES := kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca988x-ct IMAGE_SIZE := 16000k SUPPORTED_DEVICES += gl-ar750s endef TARGET_DEVICES += glinet_gl-ar750s jeff@deb-devel:~/devel/openwrt$ git remote -v show openwrt * remote openwrt Fetch URL: https://git.openwrt.org/openwrt/openwrt.git Jeff
Jeff Kletsky <lede@allycomm.com> [2019-05-03 12:11:48]:
> That's strange -- perhaps another patch updated it?
no, if you look at the patchwork, the patch was simply sent out broken.
-- ynezz
On 5/3/19 12:20 PM, Petr Štetiar wrote: > Jeff Kletsky <lede@allycomm.com> [2019-05-03 12:11:48]: > >> That's strange -- perhaps another patch updated it? > no, if you look at the patchwork, the patch was simply sent out broken. > > -- ynezz My apologies, resend due to broken patch (Only applies to and impacts `master` as on ath79 target) From c553a3becef8c774c7f725cf84035773b868b809 Mon Sep 17 00:00:00 2001 From: Jeff Kletsky <git-commits@allycomm.com> Date: Sun, 27 Jan 2019 20:17:16 -0800 Subject: [PATCH] ath79: glinet_gl-ar750s: Use QCA9887 firmware The GL.iNet AR750S is based around the QCA9563 and requires the QCA9887 firmware for operation. Signed-off-by: Jeff Kletsky <git-commits@allycomm.com> --- target/linux/ath79/image/generic.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index 8588e7cdf6..8e162e1d0e 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -363,7 +363,7 @@ TARGET_DEVICES += glinet_gl-ar300m-nor define Device/glinet_gl-ar750s ATH_SOC := qca9563 DEVICE_TITLE := GL.iNet GL-AR750S - DEVICE_PACKAGES := kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca988x-ct + DEVICE_PACKAGES := kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca9887-ct IMAGE_SIZE := 16000k SUPPORTED_DEVICES += gl-ar750s endef
diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index 8588e7cdf6..8e162e1d0e 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -363,7 +363,7 @@ TARGET_DEVICES += glinet_gl-ar300m-nor define Device/glinet_gl-ar750s ATH_SOC := qca9563 DEVICE_TITLE := GL.iNet GL-AR750S - DEVICE_PACKAGES := kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca988x-ct + DEVICE_PACKAGES := kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca9887-ct IMAGE_SIZE := 16000k SUPPORTED_DEVICES += gl-ar750s endef