From: Mathias Kresin Date: Thu, 6 Dec 2018 10:53:05 +0000 (+0100) Subject: ath79: fix GL.iNet GL-AR300M sysupgrade X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fmkresin.git;a=commitdiff_plain;h=9d8fcab77aab6a9133cd6898a68ad512b0b31310;hp=8d6f128d390753ea8f4deae5cc9a1d75435164b4 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 --- diff --git a/target/linux/ath79/dts/qca9531_glinet_ar300m-nand.dts b/target/linux/ath79/dts/qca9531_glinet_ar300m-nand.dts new file mode 100644 index 0000000000..82f8418b31 --- /dev/null +++ b/target/linux/ath79/dts/qca9531_glinet_ar300m-nand.dts @@ -0,0 +1,68 @@ +/dts-v1/; + +#include "qca9531_glinet_ar300m.dtsi" + +/ { + compatible = "glinet,ar300m-nand", "qca,qca9531"; + model = "GL.iNet GL-AR300M (NAND)"; +}; + +&spi { + status = "okay"; + num-cs = <1>; + + flash@0 { + compatible = "winbond,w25q128", "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <25000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "u-boot"; + reg = <0x000000 0x040000>; + read-only; + }; + + partition@1 { + label = "u-boot-env"; + reg = <0x040000 0x010000>; + }; + + partition@2 { + label = "reserved"; + reg = <0x050000 0xfa0000>; + }; + + art: partition@3 { + label = "art"; + reg = <0xff0000 0x010000>; + }; + }; + }; + + flash@1 { + compatible = "spinand,mt29f"; + reg = <1>; + spi-max-frequency = <25000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "kernel"; + reg = <0x000000 0x0200000>; + }; + + partition@1 { + label = "ubi"; + reg = <0x200000 0x7e00000>; + }; + }; + }; +}; diff --git a/target/linux/ath79/dts/qca9531_glinet_ar300m-nor.dts b/target/linux/ath79/dts/qca9531_glinet_ar300m-nor.dts new file mode 100644 index 0000000000..36903bdb99 --- /dev/null +++ b/target/linux/ath79/dts/qca9531_glinet_ar300m-nor.dts @@ -0,0 +1,50 @@ +/dts-v1/; + +#include +#include + +#include "qca9531_glinet_ar300m.dtsi" + +/ { + compatible = "glinet,ar300m-nor", "qca,qca9531"; + model = "GL.iNet GL-AR300M (NOR)"; +}; + +&spi { + status = "okay"; + num-cs = <0>; + + flash@0 { + compatible = "winbond,w25q128", "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <25000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "u-boot"; + reg = <0x000000 0x040000>; + read-only; + }; + + partition@1 { + label = "u-boot-env"; + reg = <0x040000 0x010000>; + }; + + partition@2 { + compatible = "denx,uimage"; + label = "firmware"; + reg = <0x050000 0xfa0000>; + }; + + art: partition@3 { + label = "art"; + reg = <0xff0000 0x010000>; + }; + }; + }; +}; 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/dts/qca9531_glinet_ar300m_nand.dts b/target/linux/ath79/dts/qca9531_glinet_ar300m_nand.dts deleted file mode 100644 index f188ac6c33..0000000000 --- a/target/linux/ath79/dts/qca9531_glinet_ar300m_nand.dts +++ /dev/null @@ -1,63 +0,0 @@ -/dts-v1/; - -#include "qca9531_glinet_ar300m.dtsi" - -&spi { - status = "okay"; - num-cs = <1>; - - flash@0 { - compatible = "winbond,w25q128", "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <25000000>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "u-boot"; - reg = <0x000000 0x040000>; - read-only; - }; - - partition@1 { - label = "u-boot-env"; - reg = <0x040000 0x010000>; - }; - - partition@2 { - label = "reserved"; - reg = <0x050000 0xfa0000>; - }; - - art: partition@3 { - label = "art"; - reg = <0xff0000 0x010000>; - }; - }; - }; - - flash@1 { - compatible = "spinand,mt29f"; - reg = <1>; - spi-max-frequency = <25000000>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "kernel"; - reg = <0x000000 0x0200000>; - }; - - partition@1 { - label = "ubi"; - reg = <0x200000 0x7e00000>; - }; - }; - }; -}; diff --git a/target/linux/ath79/dts/qca9531_glinet_ar300m_nor.dts b/target/linux/ath79/dts/qca9531_glinet_ar300m_nor.dts deleted file mode 100644 index 1128e2da38..0000000000 --- a/target/linux/ath79/dts/qca9531_glinet_ar300m_nor.dts +++ /dev/null @@ -1,45 +0,0 @@ -/dts-v1/; - -#include -#include - -#include "qca9531_glinet_ar300m.dtsi" - -&spi { - status = "okay"; - num-cs = <0>; - - flash@0 { - compatible = "winbond,w25q128", "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <25000000>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "u-boot"; - reg = <0x000000 0x040000>; - read-only; - }; - - partition@1 { - label = "u-boot-env"; - reg = <0x040000 0x010000>; - }; - - partition@2 { - compatible = "denx,uimage"; - label = "firmware"; - reg = <0x050000 0xfa0000>; - }; - - art: partition@3 { - label = "art"; - reg = <0xff0000 0x010000>; - }; - }; - }; -}; 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