ath79: fix boardname of GL.iNet GL-AR300M

This device is called GL-AR300M, therefore rename the board(s)
to 'gl-ar300m-nor' and 'gl-ar300m-nand'

Signed-off-by: Paul Wassi <p.wassi@gmx.at>
[change boardname in uboot envtools as well, don't use wildcards for
boardname]
Signed-off-by: Mathias Kresin <dev@kresin.me>

diff --git a/package/boot/uboot-envtools/files/ath79 b/package/boot/uboot-envtools/files/ath79
index a306f6733bce47fee37cff75b5564e478c927eeb..bf8ca2f7cd234812b31fdebb4c176f104b23e353 100644 (file)
--- a/package/boot/uboot-envtools/files/ath79
+++ b/package/boot/uboot-envtools/files/ath79
@@ -17,7 +17,8 @@ buffalo,wzr-hp-ag300h)
         ubootenv_add_uci_config "/dev/mtd3" "0x0" "0x10000" "0x10000"
         ;;
 buffalo,bhr-4grv2|\
-glinet,ar300m|\
+glinet,gl-ar300m-nand|\
+glinet,gl-ar300m-nor|\
 ocedo,koala|\
 ocedo,raccoon|\
 openmesh,om5p-ac-v2)

diff --git a/target/linux/ath79/base-files/etc/board.d/02_network b/target/linux/ath79/base-files/etc/board.d/02_network
index 8e92c2f7801f09be22861cc711a5c030af758133..626fb2cb3097f58e7ba78ce91415e9c2e0941f02 100755 (executable)
--- a/target/linux/ath79/base-files/etc/board.d/02_network
+++ b/target/linux/ath79/base-files/etc/board.d/02_network
@@ -89,8 +89,9 @@ ath79_setup_interfaces()
        etactica,eg200)
                ucidef_set_interface_lan "eth0" "dhcp"
                ;;
-       glinet,ar300m|\
        glinet,gl-ar150|\
+       glinet,gl-ar300m-nand|\
+       glinet,gl-ar300m-nor|\
        glinet,gl-x750|\
        tplink,tl-wr810n-v1|\
        tplink,tl-wr810n-v2)

diff --git a/target/linux/ath79/dts/qca9531_glinet_ar300m-nand.dts b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m-nand.dts
similarity index 91%
rename from target/linux/ath79/dts/qca9531_glinet_ar300m-nand.dts
rename to target/linux/ath79/dts/qca9531_glinet_gl-ar300m-nand.dts
index 82f8418b312c1948ac0f7b6f21cc68110e1d1d87..9e78f83a7695c74cf326b386023e351f7c54d3ba 100644 (file)
--- a/target/linux/ath79/dts/qca9531_glinet_ar300m-nand.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m-nand.dts
@@ -1,9 +1,9 @@
 /dts-v1/;
 
-#include "qca9531_glinet_ar300m.dtsi"
+#include "qca9531_glinet_gl-ar300m.dtsi"
 
 / {
-       compatible = "glinet,ar300m-nand", "qca,qca9531";
+       compatible = "glinet,gl-ar300m-nand", "qca,qca9531";
        model = "GL.iNet GL-AR300M (NAND)";
 };
 

diff --git a/target/linux/ath79/dts/qca9531_glinet_ar300m-nor.dts b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m-nor.dts
similarity index 88%
rename from target/linux/ath79/dts/qca9531_glinet_ar300m-nor.dts
rename to target/linux/ath79/dts/qca9531_glinet_gl-ar300m-nor.dts
index 36903bdb992e2d258493f1ea9861e332d6a398a2..6b77af040142eb5fc250e503546052f44ee9ca3b 100644 (file)
--- a/target/linux/ath79/dts/qca9531_glinet_ar300m-nor.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m-nor.dts
@@ -3,10 +3,10 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#include "qca9531_glinet_ar300m.dtsi"
+#include "qca9531_glinet_gl-ar300m.dtsi"
 
 / {
-       compatible = "glinet,ar300m-nor", "qca,qca9531";
+       compatible = "glinet,gl-ar300m-nor", "qca,qca9531";
        model = "GL.iNet GL-AR300M (NOR)";
 };
 

diff --git a/target/linux/ath79/dts/qca9531_glinet_ar300m.dtsi b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
similarity index 100%
rename from target/linux/ath79/dts/qca9531_glinet_ar300m.dtsi
rename to target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi

diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk
index 600ab43e7f905ba18a80848e06395afb09acd9e3..774695b8b4b82f2c495c8569e288401afd3aba46 100644 (file)
--- a/target/linux/ath79/image/generic.mk
+++ b/target/linux/ath79/image/generic.mk
@@ -268,14 +268,14 @@ define Device/glinet_gl-ar150
 endef
 TARGET_DEVICES += glinet_gl-ar150
 
-define Device/glinet_ar300m-nor
+define Device/glinet_gl-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_gl-ar300m-nor
 
 define Device/glinet_ar750s
   ATH_SOC := qca9563

diff --git a/target/linux/ath79/image/nand.mk b/target/linux/ath79/image/nand.mk
index 5c7712308f6b235c61e082e9568c6e86bbd18674..eee419194ba751cb3ba3eafd7f5da5e647eba91a 100644 (file)
--- 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_gl-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.bin := sysupgrade-tar
   IMAGE/factory.ubi := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi
 endef
-TARGET_DEVICES += glinet_ar300m-nand
+TARGET_DEVICES += glinet_gl-ar300m-nand