hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ath79: fix GL.iNet GL-AR300M sysupgrade 

The userspace boardname derived from the dts compatible was out of sync
with the expected board added to the image metadata. This way a
sysupgrade is refused.

Sync the userspace boardname and the baordname used in the image metdata
to allow a seamless sasupgrade.

Signed-off-by: Mathias Kresin <dev@kresin.me>
openwrt-19.07
Mathias Kresin 2018-12-06 11:53:05 +01:00
parent 8d6f128d39
commit 9d8fcab77a
5 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
target/linux/ath79/dts/qca9531_glinet_ar300m_nand.dts → target/linux/ath79/dts/qca9531_glinet_ar300m-nand.dts
View File

@ -2,6 +2,11 @@
#include "qca9531_glinet_ar300m.dtsi" #include "qca9531_glinet_ar300m.dtsi"
/ {
compatible = "glinet,ar300m-nand", "qca,qca9531";
model = "GL.iNet GL-AR300M (NAND)";
};
&spi { &spi {
status = "okay"; status = "okay";
num-cs = <1>; num-cs = <1>;

5
target/linux/ath79/dts/qca9531_glinet_ar300m_nor.dts → target/linux/ath79/dts/qca9531_glinet_ar300m-nor.dts
View File

@ -5,6 +5,11 @@
#include "qca9531_glinet_ar300m.dtsi" #include "qca9531_glinet_ar300m.dtsi"
/ {
compatible = "glinet,ar300m-nor", "qca,qca9531";
model = "GL.iNet GL-AR300M (NOR)";
};
&spi { &spi {
status = "okay"; status = "okay";
num-cs = <0>; num-cs = <0>;

3
target/linux/ath79/dts/qca9531_glinet_ar300m.dtsi
View File

@ -6,9 +6,6 @@
#include "qca953x.dtsi" #include "qca953x.dtsi"
/ { / {
compatible = "glinet,ar300m", "qca,qca9531";
model = "GL.iNet GL-AR300M";
keys { keys {
compatible = "gpio-keys-polled"; compatible = "gpio-keys-polled";
poll-interval = <20>; poll-interval = <20>;

4
target/linux/ath79/image/generic.mk
View File

@ -174,14 +174,14 @@ define Device/glinet_ar150
endef endef
TARGET_DEVICES += glinet_ar150 TARGET_DEVICES += glinet_ar150
define Device/glinet_ar300m_nor define Device/glinet_ar300m-nor
ATH_SOC := qca9531 ATH_SOC := qca9531
DEVICE_TITLE := GL.iNet GL-AR300M DEVICE_TITLE := GL.iNet GL-AR300M
DEVICE_PACKAGES := kmod-usb-core kmod-usb2 DEVICE_PACKAGES := kmod-usb-core kmod-usb2
IMAGE_SIZE := 16000k IMAGE_SIZE := 16000k
SUPPORTED_DEVICES += gl-ar300m SUPPORTED_DEVICES += gl-ar300m
endef endef
TARGET_DEVICES += glinet_ar300m_nor TARGET_DEVICES += glinet_ar300m-nor
define Device/glinet_gl-x750 define Device/glinet_gl-x750
ATH_SOC := qca9531 ATH_SOC := qca9531

4
target/linux/ath79/image/nand.mk
View File

@ -1,4 +1,4 @@
define Device/glinet_ar300m_nand define Device/glinet_ar300m-nand
ATH_SOC := qca9531 ATH_SOC := qca9531
DEVICE_TITLE := GL-AR300M (NAND) DEVICE_TITLE := GL-AR300M (NAND)
DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-storage kmod-usb-ledtrig-usbport DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-storage kmod-usb-ledtrig-usbport
@ -10,4 +10,4 @@ define Device/glinet_ar300m_nand
IMAGE/sysupgrade.tar := sysupgrade-tar IMAGE/sysupgrade.tar := sysupgrade-tar
IMAGE/factory.ubi := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi IMAGE/factory.ubi := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi
endef endef
TARGET_DEVICES += glinet_ar300m_nand TARGET_DEVICES += glinet_ar300m-nand