[OpenWrt-Devel] [PATCH] ath79: add support for GL.iNet GL-X1200
mail at adrianschmutzler.de
mail at adrianschmutzler.de
Wed Apr 15 11:01:19 EDT 2020
Hi,
> -----Original Message-----
> From: openwrt-devel [mailto:openwrt-devel-bounces at lists.openwrt.org]
> On Behalf Of guilin.wang at gl-inet.com
> Sent: Freitag, 10. April 2020 06:50
> To: openwrt-devel at lists.openwrt.org
> Cc: guilin.wang at gl-inet.com
> Subject: [OpenWrt-Devel] [PATCH] ath79: add support for GL.iNet GL-X1200
>
> This patch adds supports for GL-X1200.
>
> Specification:
> - SOC: QCA9563 (775MHz)
> - Flash: 16 MiB
> - RAM: 128 MiB DDR2
> - Ethernet: 4x 1Gbps LAN + 1x 1Gbps WAN
> - Wireless: QCA9563(2.4GHz) and QCA9886(5GHz)
> - SIM: 2x SIM card slots
> - MicroSD: 1x microSD slot
> - Antenna: 2x external 5dBi antennas
> - USB: 1x USB 2.0 port
> - Button: 1x reset button
> - LED: 16x LEDs (3x GPIO controllable)
> - UART: 1x UART on PCB (JP1: 3.3V, RX, TX, GND)
> - OEM U-Boot supplies HTTP/GUI access
>
> Implementation Notes
> ====================
>
> Both the NOR and NAND variants boot off a NOR-based kernel, consistent
> with the OEM's firmware.
>
> The mode LEDs are
> * Boot, Running system
> * Failsafe 2G
> * Upgrade 5G
>
> Installation
> ============
>
> Using sysupgrade
> ----------------
>
> sysupgrade may be used to install a NAND image on a device running a NAND
> image or a NOR image on a device running a NOR image. It is recommended
> to *not* preserve config when upgrading from OEM firmware or previous
> versions of OpenWrt. No supported sysupgrade path should require "force".
> Transitioning from NOR to NAND can be accomplished
>
> using U-Boot.
>
> To glinet_gl-x1200-nand:
>
> gl-x1200 OEM NAND, Self-built from OEM source NAND
>
> To glinet_gl-x1200-nor:
>
> gl-x1200 Self-built from OEM source NOR
> glinet_gl-x1200 OpenWrt NOR (prior builds)
>
> Using U-Boot
> ------------
>
> The OEM U-Boot can be put into a graphical, firmware-upload mode by
> holding down the button on the side of the router while applying power and
> for a bit more than five seconds following with the current OEM U-Boot. The
> power LED will come on, then the 5G LED will flash five times, about once a
> second. When the 5G LED stops flashing and the 2G LED lights solid, the
> router's U-Boot will provide an upload page at http://192.168.1.1/ Either a
> browser may be used to upload an image, or a utility such as curl may be
> used:
>
> curl -X POST -F gl_firmware=\@*-nand-squashfs-factory.img \
> http://192.168.1.1/index.html
> or
> curl -X POST -F gl_firmware=\@*-nor-squashfs-sysupgrade.bin \
> http://192.168.1.1/index.html
>
> Note that NOR vs. NAND is based on the file name extension.
>
> Signed-off-by: guilin.wang at gl-inet.com <guilin.wang at gl-inet.com>
> ---
> .../ath79/dts/qca9563_glinet_gl-x1200-nor-nand.dts | 18 ++
> .../ath79/dts/qca9563_glinet_gl-x1200-nor.dts | 18 ++
> .../linux/ath79/dts/qca9563_glinet_gl-x1200.dtsi | 199
> +++++++++++++++++++++
> target/linux/ath79/image/nand.mk | 34 ++++
> .../ath79/nand/base-files/etc/board.d/02_network | 5 +
> .../etc/hotplug.d/firmware/11-ath10k-caldata | 10 ++
> .../ath79/nand/base-files/lib/upgrade/platform.sh | 4 +-
> 7 files changed, 287 insertions(+), 1 deletion(-) create mode 100644
> target/linux/ath79/dts/qca9563_glinet_gl-x1200-nor-nand.dts
> create mode 100644 target/linux/ath79/dts/qca9563_glinet_gl-x1200-nor.dts
> create mode 100644 target/linux/ath79/dts/qca9563_glinet_gl-x1200.dtsi
>
> diff --git a/target/linux/ath79/dts/qca9563_glinet_gl-x1200-nor-nand.dts
> b/target/linux/ath79/dts/qca9563_glinet_gl-x1200-nor-nand.dts
> new file mode 100644
> index 0000000..1fefd4f
> --- /dev/null
> +++ b/target/linux/ath79/dts/qca9563_glinet_gl-x1200-nor-nand.dts
> @@ -0,0 +1,18 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> +
> +/dts-v1/;
> +
> +#include "qca9563_glinet_gl-x1200.dtsi"
> +
> +/ {
> + compatible = "glinet,gl-x1200-nor-nand", "qca,qca9563";
> + model = "GL.iNet GL-X1200 (NOR/NAND)"; };
> +
> +&nor_kernel {
> + label = "kernel";
> +};
> +
> +&nand_ubi {
> + label = "ubi";
> +};
> diff --git a/target/linux/ath79/dts/qca9563_glinet_gl-x1200-nor.dts
> b/target/linux/ath79/dts/qca9563_glinet_gl-x1200-nor.dts
> new file mode 100644
> index 0000000..4eded21
> --- /dev/null
> +++ b/target/linux/ath79/dts/qca9563_glinet_gl-x1200-nor.dts
> @@ -0,0 +1,18 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> +
> +/dts-v1/;
> +
> +#include "qca9563_glinet_gl-x1200.dtsi"
> +
> +/ {
> + compatible = "glinet,gl-x1200-nor", "qca,qca9563";
> + model = "GL.iNet GL-X1200 (NOR)";
> +};
> +
> +/delete-node/ &nor_kernel;
> +/delete-node/ &nor_reserved;
> +
> +&nor_firmware {
> + compatible = "denx,uimage";
> + label = "firmware";
> +};
> diff --git a/target/linux/ath79/dts/qca9563_glinet_gl-x1200.dtsi
> b/target/linux/ath79/dts/qca9563_glinet_gl-x1200.dtsi
> new file mode 100644
> index 0000000..60e3dba
> --- /dev/null
> +++ b/target/linux/ath79/dts/qca9563_glinet_gl-x1200.dtsi
> @@ -0,0 +1,199 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> +
> +#include <dt-bindings/gpio/gpio.h>
> +#include <dt-bindings/input/input.h>
> +
> +#include "qca956x.dtsi"
> +
> +/ {
> + compatible = "glinet,gl-x1200", "qca,qca9563";
> + model = "GL.iNet GL-X1200";
I would remove those two lines from the DTSI, as we require them in the DTS anyway, and the DTSI is not describing an actual device.
> +
> + chosen {
> + bootargs = "console=ttyS0,115200n8";
> + };
> +
> + aliases {
> + led-boot = &led_system;
> + led-failsafe = &led_system;
> + led-running = &led_system;
> + led-upgrade = &led_system;
> + label-mac-device = ð0;
> + };
> +
> + keys {
> + compatible = "gpio-keys";
> +
> + pinctrl-names = "default";
> + pinctrl-0 = <&jtag_disable_pins>;
> +
> + reset {
> + label = "reset";
> + linux,code = <KEY_RESTART>;
> + gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
> + };
> + };
> +
> + leds {
> + compatible = "gpio-leds";
> +
> + led_system: system {
> + label = "gl-x1200:red:system";
> + gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
> + default-state = "keep";
> + };
> +
> + led_wlan2g: wlan2g {
Typically, we don't add DT labels when they are not used.
> + label = "gl-x1200:green:wlan2g";
> + gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
> + linux,default-trigger = "phy1tpt";
> + };
> +
> + led_wlan5g: wlan5g {
> + label = "gl-x1200:green:wlan5g";
> + gpios = <&gpio 20 GPIO_ACTIVE_HIGH>;
ACTIVE_HIGH used by intention?
> + linux,default-trigger = "phy0tpt";
> + };
> + };
Add empty line between nodes.
> + gpio-export {
> + compatible = "gpio-export";
> +
> + gpio_modem1_power {
> + gpio-export,name = "gl-x1200:4g1:power";
> + gpio-export,output = <1>;
> + gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
> + };
> +
> + gpio_usb_power {
> + gpio-export,name = "gl-x1200:usb:power";
> + gpio-export,output = <1>;
> + gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
> + };
> +
> + gpio_modem2_power {
> + gpio-export,name = "gl-x1200:4g2:power";
> + gpio-export,output = <1>;
> + gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
> + };
> + };
> +};
> +
> +&spi {
> + status = "okay";
> +
> + num-cs = <2>;
> +
> + flash_nor: flash at 0 {
> + compatible = "jedec,spi-nor";
> + reg = <0>;
> + spi-max-frequency = <25000000>;
> +
> + nor_partitions: partitions {
> + compatible = "fixed-partitions";
> + #address-cells = <1>;
> + #size-cells = <1>;
> +
> + partition at 0 {
> + label = "u-boot";
> + reg = <0x000000 0x040000>;
> + read-only;
> + };
> +
> + partition at 40000 {
> + label = "u-boot-env";
> + reg = <0x040000 0x010000>;
> + };
> +
> + art: partition at 50000 {
> + label = "art";
> + reg = <0x050000 0x010000>;
> + read-only;
> + };
> +
> + nor_firmware: partition at 60000 {
> + label = "nor_firmware";
> + reg = <0x060000 0xfa0000>;
> + };
> +
> + nor_kernel: partition_alt at 60000 {
> + label = "nor_kernel";
> + reg = <0x060000 0x400000>;
> + };
> +
> + nor_reserved: parition_alt at 460000 {
Typo partition_alt
> + label = "nor_reserved";
> + reg = <0x460000 0xba0000>;
> + };
> + };
> + };
> +
> + flash_nand: flash at 1 {
> + compatible = "spi-nand";
> + reg = <1>;
> + spi-max-frequency = <25000000>;
> +
> + nand_partitions: partitions {
> + compatible = "fixed-partitions";
> + #address-cells = <1>;
> + #size-cells = <1>;
> +
> + nand_ubi: partition at 0 {
> + label = "nand_ubi";
> + reg = <0x000000 0x8000000>;
Either use 0x0 or 0x0000000 here, please.
> + };
> + };
> + };
> +};
> +
> +ð0 {
> + status = "okay";
> +
> + phy-handle = <&phy0>;
I'd prefer an empty line after phy-handle.
> + mtd-mac-address = <&art 0x0>;
> +};
> +
> +&mdio0 {
> + status = "okay";
> +
> + phy-mask = <0>;
> +
> + phy0: ethernet-phy at 0 {
> + reg = <0>;
> + phy-mode = "sgmii";
> + qca,ar8327-initvals = <
> + 0x04 0x00080080 /* PORT0 PAD MODE CTRL */
> + 0x7c 0x0000007e /* PORT0_STATUS */
> + >;
> + };
> +};
> +
> +&pcie {
> + status = "okay";
> +};
> +
> +&uart {
> + status = "okay";
> +};
> +
> +&usb0 {
> + status = "okay";
> +};
> +
> +&usb1 {
> + status = "okay";
> +};
> +
> +&usb_phy0 {
> + status = "okay";
> +};
> +
> +&usb_phy1 {
> + status = "okay";
> +};
> +
> +
Remove second empty line.
> +&wmac {
> + status = "okay";
> +
> + mtd-cal-data = <&art 0x1000>;
Correct MAC address reliably set in caldata?
> +};
> diff --git a/target/linux/ath79/image/nand.mk
> b/target/linux/ath79/image/nand.mk
> index 3ccd199..712e90d 100644
> --- a/target/linux/ath79/image/nand.mk
> +++ b/target/linux/ath79/image/nand.mk
> @@ -130,6 +130,40 @@ define Device/glinet_gl-ar750s-nor endef
> TARGET_DEVICES += glinet_gl-ar750s-nor
>
> +define Device/glinet_gl-x1200-common
> + SOC := qca9563
> + DEVICE_VENDOR := GL.iNet
> + DEVICE_MODEL := GL-X1200
> + DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9888-ct kmod-
> usb2 kmod-leds-gpio\
> + kmod-usb-storage block-mount kmod-usb-net-qmi-wwan
> + KERNEL_SIZE := 2048k
> + IMAGE_SIZE := 16000k
> + PAGESIZE := 2048
> + VID_HDR_OFFSET := 2048
> +endef
> +
> +# NB: The kernel size is intentionally restricted at this time; see
> +commit message define Device/glinet_gl-x1200-nor-nand
> + $(Device/glinet_gl-x1200-common)
> + DEVICE_VARIANT := NOR/NAND
> + BLOCKSIZE := 128k
> + GL_UBOOT_UBI_OFFSET := 2048k
> + IMAGES += factory.img
> + IMAGE/factory.img := append-kernel | pad-to
> $$$$(GL_UBOOT_UBI_OFFSET) | \
> + append-ubi | check-kernel-size $$$$(GL_UBOOT_UBI_OFFSET)
> + IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
> + SUPPORTED_DEVICES += glinet,gl-x1200-nor endef TARGET_DEVICES +=
> +glinet_gl-x1200-nor-nand
> +
> +define Device/glinet_gl-x1200-nor
> + $(Device/glinet_gl-x1200-common)
> + DEVICE_VARIANT := NOR
> + BLOCKSIZE := 64k
> + SUPPORTED_DEVICES += gl-x1200 glinet,gl-x1200
Why "gl-x1200" and "glinet,gl-x1200"?
Is one of those used in vendor firmware?
> +glinet,gl-x1200-nor-nand endef TARGET_DEVICES += glinet_gl-x1200-nor
> +
> # fake rootfs is mandatory, pad-offset 129 equals (2 * uimage_header +
> 0xff) define Device/netgear_ath79_nand
> DEVICE_VENDOR := NETGEAR
> diff --git a/target/linux/ath79/nand/base-files/etc/board.d/02_network
> b/target/linux/ath79/nand/base-files/etc/board.d/02_network
> index b2191ee..cd1e0a7 100755
> --- a/target/linux/ath79/nand/base-files/etc/board.d/02_network
> +++ b/target/linux/ath79/nand/base-files/etc/board.d/02_network
> @@ -20,6 +20,11 @@ ath79_setup_interfaces()
> ucidef_add_switch "switch0" \
> "0 at eth0" "2:lan:2" "3:lan:1" "1:wan"
> ;;
> + glinet,gl-x1200-nor|\
> + glinet,gl-x1200-nor-nand)
> + ucidef_add_switch "switch0" \
> + "0 at eth0" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1"
> "5:wan"
WAN and LAN are supposed to have the same MAC address?
> + ;;
> netgear,wndr3700-v4|\
> netgear,wndr4300|\
> netgear,wndr4300-v2|\
> diff --git a/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/11-
> ath10k-caldata b/target/linux/ath79/nand/base-
> files/etc/hotplug.d/firmware/11-ath10k-caldata
> index d5fd3db..02f226c 100644
> --- a/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/11-ath10k-
> caldata
> +++ b/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/11-ath10
> +++ k-caldata
> @@ -24,6 +24,16 @@ case "$FIRMWARE" in
> ;;
> esac
> ;;
> +"ath10k/pre-cal-pci-0000:00:00.0.bin")
> + case $board in
> + glinet,gl-x1200-nor|\
> + glinet,gl-x1200-nor-nand)
> + caldata_extract "art" 0x5000 0x2f20
> + ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
> + /lib/firmware/ath10k/QCA9888/hw2.0/board.bin
Correct MAC address reliably set in caldata?
> + ;;
> + esac
> + ;;
> *)
> exit 1
> ;;
> diff --git a/target/linux/ath79/nand/base-files/lib/upgrade/platform.sh
> b/target/linux/ath79/nand/base-files/lib/upgrade/platform.sh
> index ea77345..4ea2287 100644
> --- a/target/linux/ath79/nand/base-files/lib/upgrade/platform.sh
> +++ b/target/linux/ath79/nand/base-files/lib/upgrade/platform.sh
> @@ -19,7 +19,9 @@ platform_do_upgrade() {
> glinet_nand_nor_do_upgrade "$1"
> ;;
> glinet,gl-ar750s-nor|\
> - glinet,gl-ar750s-nor-nand)
> + glinet,gl-ar750s-nor-nand |\
Nitpick: No space before the pipe symbol.
Best
Adrian
> + glinet,gl-x1200-nor|\
> + glinet,gl-x1200-nor-nand)
> nand_nor_do_upgrade "$1"
> ;;
> *)
> --
> 2.7.4
>
>
>
>
> _______________________________________________
> openwrt-devel mailing list
> openwrt-devel at lists.openwrt.org
> https://lists.openwrt.org/mailman/listinfo/openwrt-devel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: openpgp-digital-signature.asc
Type: application/pgp-signature
Size: 834 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/openwrt-devel/attachments/20200415/134f6819/attachment.sig>
-------------- next part --------------
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
More information about the openwrt-devel
mailing list