From 6e78d546d1197d7a3ec4cbc7aab22286ad49fb0f Mon Sep 17 00:00:00 2001 From: Paul Wassi Date: Mon, 31 Dec 2018 13:45:29 +0100 Subject: [PATCH] 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 [change boardname in uboot envtools as well, don't use wildcards for boardname] Signed-off-by: Mathias Kresin --- package/boot/uboot-envtools/files/ath79 | 3 ++- target/linux/ath79/base-files/etc/board.d/02_network | 3 ++- ...inet_ar300m-nand.dts => qca9531_glinet_gl-ar300m-nand.dts} | 4 ++-- ...glinet_ar300m-nor.dts => qca9531_glinet_gl-ar300m-nor.dts} | 4 ++-- ...a9531_glinet_ar300m.dtsi => qca9531_glinet_gl-ar300m.dtsi} | 0 target/linux/ath79/image/generic.mk | 4 ++-- target/linux/ath79/image/nand.mk | 4 ++-- 7 files changed, 12 insertions(+), 10 deletions(-) rename target/linux/ath79/dts/{qca9531_glinet_ar300m-nand.dts => qca9531_glinet_gl-ar300m-nand.dts} (91%) rename target/linux/ath79/dts/{qca9531_glinet_ar300m-nor.dts => qca9531_glinet_gl-ar300m-nor.dts} (88%) rename target/linux/ath79/dts/{qca9531_glinet_ar300m.dtsi => qca9531_glinet_gl-ar300m.dtsi} (100%) diff --git a/package/boot/uboot-envtools/files/ath79 b/package/boot/uboot-envtools/files/ath79 index a306f6733b..bf8ca2f7cd 100644 --- 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 8e92c2f780..626fb2cb30 100755 --- 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 82f8418b31..9e78f83a76 100644 --- 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 36903bdb99..6b77af0401 100644 --- 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 #include -#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 600ab43e7f..774695b8b4 100644 --- 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 5c7712308f..eee419194b 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_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 -- 2.30.2