aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorMathias Kresin <dev@kresin.me>2018-12-06 11:53:05 +0100
committerMathias Kresin <dev@kresin.me>2018-12-06 13:28:22 +0100
commit9d8fcab77aab6a9133cd6898a68ad512b0b31310 (patch)
tree746dea6a49e36d61499915c0396ddad735dfd472 /target
parent8d6f128d390753ea8f4deae5cc9a1d75435164b4 (diff)
downloadupstream-9d8fcab77aab6a9133cd6898a68ad512b0b31310.tar.gz
upstream-9d8fcab77aab6a9133cd6898a68ad512b0b31310.tar.bz2
upstream-9d8fcab77aab6a9133cd6898a68ad512b0b31310.zip
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>
Diffstat (limited to 'target')
-rw-r--r--target/linux/ath79/dts/qca9531_glinet_ar300m-nand.dts (renamed from target/linux/ath79/dts/qca9531_glinet_ar300m_nand.dts)5
-rw-r--r--target/linux/ath79/dts/qca9531_glinet_ar300m-nor.dts (renamed from target/linux/ath79/dts/qca9531_glinet_ar300m_nor.dts)5
-rw-r--r--target/linux/ath79/dts/qca9531_glinet_ar300m.dtsi3
-rw-r--r--target/linux/ath79/image/generic.mk4
-rw-r--r--target/linux/ath79/image/nand.mk4
5 files changed, 14 insertions, 7 deletions
diff --git a/target/linux/ath79/dts/qca9531_glinet_ar300m_nand.dts b/target/linux/ath79/dts/qca9531_glinet_ar300m-nand.dts
index f188ac6c33..82f8418b31 100644
--- a/target/linux/ath79/dts/qca9531_glinet_ar300m_nand.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_ar300m-nand.dts
@@ -2,6 +2,11 @@
#include "qca9531_glinet_ar300m.dtsi"
+/ {
+ compatible = "glinet,ar300m-nand", "qca,qca9531";
+ model = "GL.iNet GL-AR300M (NAND)";
+};
+
&spi {
status = "okay";
num-cs = <1>;
diff --git a/target/linux/ath79/dts/qca9531_glinet_ar300m_nor.dts b/target/linux/ath79/dts/qca9531_glinet_ar300m-nor.dts
index 1128e2da38..36903bdb99 100644
--- a/target/linux/ath79/dts/qca9531_glinet_ar300m_nor.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_ar300m-nor.dts
@@ -5,6 +5,11 @@
#include "qca9531_glinet_ar300m.dtsi"
+/ {
+ compatible = "glinet,ar300m-nor", "qca,qca9531";
+ model = "GL.iNet GL-AR300M (NOR)";
+};
+
&spi {
status = "okay";
num-cs = <0>;
diff --git a/target/linux/ath79/dts/qca9531_glinet_ar300m.dtsi b/target/linux/ath79/dts/qca9531_glinet_ar300m.dtsi
index 986177df01..34fcfb32c3 100644
--- a/target/linux/ath79/dts/qca9531_glinet_ar300m.dtsi
+++ b/target/linux/ath79/dts/qca9531_glinet_ar300m.dtsi
@@ -6,9 +6,6 @@
#include "qca953x.dtsi"
/ {
- compatible = "glinet,ar300m", "qca,qca9531";
- model = "GL.iNet GL-AR300M";
-
keys {
compatible = "gpio-keys-polled";
poll-interval = <20>;
diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk
index f0c7691102..d5d527fa44 100644
--- a/target/linux/ath79/image/generic.mk
+++ b/target/linux/ath79/image/generic.mk
@@ -174,14 +174,14 @@ define Device/glinet_ar150
endef
TARGET_DEVICES += glinet_ar150
-define Device/glinet_ar300m_nor
+define Device/glinet_ar300m-nor
ATH_SOC := qca9531
DEVICE_TITLE := GL.iNet GL-AR300M
DEVICE_PACKAGES := kmod-usb-core kmod-usb2
IMAGE_SIZE := 16000k
SUPPORTED_DEVICES += gl-ar300m
endef
-TARGET_DEVICES += glinet_ar300m_nor
+TARGET_DEVICES += glinet_ar300m-nor
define Device/glinet_gl-x750
ATH_SOC := qca9531
diff --git a/target/linux/ath79/image/nand.mk b/target/linux/ath79/image/nand.mk
index 1852ca4179..e5694b8af4 100644
--- a/target/linux/ath79/image/nand.mk
+++ b/target/linux/ath79/image/nand.mk
@@ -1,4 +1,4 @@
-define Device/glinet_ar300m_nand
+define Device/glinet_ar300m-nand
ATH_SOC := qca9531
DEVICE_TITLE := GL-AR300M (NAND)
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/factory.ubi := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi
endef
-TARGET_DEVICES += glinet_ar300m_nand
+TARGET_DEVICES += glinet_ar300m-nand