Skip to content
Permalink
Browse files

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>
  • Loading branch information...
mkresin committed Dec 6, 2018
1 parent 8d6f128 commit 9d8fcab77aab6a9133cd6898a68ad512b0b31310
@@ -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>;
@@ -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>;
@@ -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>;
@@ -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
@@ -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

0 comments on commit 9d8fcab

Please sign in to comment.
You can’t perform that action at this time.