From: Piotr Dymacz Date: Fri, 11 Nov 2016 18:33:57 +0000 (+0100) Subject: Add support for GL Innovations GL-AR150 (AR9331 based) X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f34b98206d5ab739734f8382eae5b74f96b05a02;p=oweals%2Fu-boot_mod.git Add support for GL Innovations GL-AR150 (AR9331 based) --- diff --git a/Makefile b/Makefile index 446d60b..ce60c29 100644 --- a/Makefile +++ b/Makefile @@ -218,7 +218,8 @@ $(COMMON_ETHS27_TARGETS): @$(call build,123,1,ETH_CONFIG=_s27) 8devices_carambola2 \ -alfa-network_hornet-ub: +alfa-network_hornet-ub \ +gl-innovations_gl-ar150: @$(call build,256,1) comfast_cf-e314n \ diff --git a/README.md b/README.md index 1c176d0..7f2a2d5 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,8 @@ Currently supported devices: - GS-Oolite/Elink EL-M150 module with dev board ([photos in my gallery](http://galeria.tech-blog.pl/Elink_EL-M150_Development-Board/)) - Dragino 2 (MS14) - Village Telco Mesh Potato 2 (based on Dragino MS14) - - GL.iNet 64xxA ([photos in my gallery](http://galeria.tech-blog.pl/GLiNet/)) + - GL Innovations GL-AR150 + - GL Innovations GL.iNet 64xxA ([photos in my gallery](http://galeria.tech-blog.pl/GLiNet/)) - Black Swift - **Atheros AR1311 (similar to AR9331)** @@ -128,7 +129,8 @@ More information about supported devices: | GS-Oolite/Elink EL-M150 module | AR9331 | 4/8/16 MiB | 64 MiB DDR2 | 64 KiB, LZMA | RO | | [Dragino 2 (MS14)](http://wiki.openwrt.org/toh/dragino/ms14) | AR9331 | 16 MiB | 64 MiB DDR1 | 192 KiB | R/W | | Village Telco Mesh Potato 2 | AR9331 | 16 MiB | 64 MiB DDR1 | 192 KiB | R/W | -| [GL.iNet](http://wiki.openwrt.org/toh/gl-inet/gl-inet) | AR9331 | 8/16 MiB | 64 MiB DDR1 | 64 KiB | RO | +| GL Innovations GL-AR150 | AR9331 | 16 MiB | 64 MiB DDR2 | 256 KiB | 64 KiB, R/W | +| [GL Innovations GL.iNet 64xxA](http://wiki.openwrt.org/toh/gl-inet/gl-inet) | AR9331 | 8/16 MiB | 64 MiB DDR1 | 64 KiB | RO | | [Black Swift](http://www.black-swift.com) | AR9331 | 16 MiB | 64 MiB DDR2 | 128 KiB, LZMA | R/W | | [TP-Link TL-MR3420 v2](http://wikidevi.com/wiki/TP-LINK_TL-MR3420_v2) | AR9341 | 4 MiB | 32 MiB DDR1 | 64 KiB, LZMA | RO | | [TP-Link TL-WR841N/D v8](http://wiki.openwrt.org/toh/tp-link/tl-wr841nd) | AR9341 | 4 MiB | 32 MiB DDR1 | 64 KiB, LZMA | RO | diff --git a/READMEPL.md b/READMEPL.md index c1e7948..c75981a 100644 --- a/READMEPL.md +++ b/READMEPL.md @@ -75,7 +75,8 @@ Lista obecnie wspieranych urządzeń: - Moduł GS-Oolite/Elink EL-M150 na płytce developerskiej ([zdjęcia w mojej galerii](http://galeria.tech-blog.pl/Elink_EL-M150_Development-Board/)) - Dragino 2 (MS14) - Village Telco Mesh Potato 2 (bazuje na Dragino MS14) - - GL.iNet 64xxA ([zdjęcia w mojej galerii](http://galeria.tech-blog.pl/GLiNet/)) + - GL Innovations GL-AR150 + - GL Innovations GL.iNet 64xxA ([zdjęcia w mojej galerii](http://galeria.tech-blog.pl/GLiNet/)) - Black Swift - **Atheros AR1311 (bliźniaczy układ AR9331)** @@ -125,7 +126,8 @@ Dodatkowe informacje o wspieranych urządzeniach: | GS-Oolite/Elink EL-M150 module | AR9331 | 4/8/16 MiB | 64 MiB DDR2 | 64 KiB, LZMA | RO | | [Dragino 2 (MS14)](http://wiki.openwrt.org/toh/dragino/ms14) | AR9331 | 16 MiB | 64 MiB DDR1 | 192 KiB | R/W | | Village Telco Mesh Potato 2 | AR9331 | 16 MiB | 64 MiB DDR1 | 192 KiB | R/W | -| [GL.iNet](http://wiki.openwrt.org/toh/gl-inet/gl-inet) | AR9331 | 8/16 MiB | 64 MiB DDR1 | 64 KiB | RO | +| GL Innovations GL-AR150 | AR9331 | 16 MiB | 64 MiB DDR2 | 256 KiB | 64 KiB, R/W | +| [GL Innovations GL.iNet 64xxA](http://wiki.openwrt.org/toh/gl-inet/gl-inet) | AR9331 | 8/16 MiB | 64 MiB DDR1 | 64 KiB | RO | | [Black Swift](http://www.black-swift.com) | AR9331 | 16 MiB | 64 MiB DDR2 | 128 KiB, LZMA | R/W | | [TP-Link TL-MR3420 v2](http://wikidevi.com/wiki/TP-LINK_TL-MR3420_v2) | AR9341 | 4 MiB | 32 MiB DDR1 | 64 KiB, LZMA | RO | | [TP-Link TL-WR841N/D v8](http://wiki.openwrt.org/toh/tp-link/tl-wr841nd) | AR9341 | 4 MiB | 32 MiB DDR1 | 64 KiB, LZMA | RO | diff --git a/u-boot/Makefile b/u-boot/Makefile index 5931af4..e30c740 100644 --- a/u-boot/Makefile +++ b/u-boot/Makefile @@ -443,8 +443,13 @@ gainstrong_oolite_v1_dev: ar933x_common @$(call define_add,CONFIG_FOR_GS_OOLITE_V1_DEV,1) @$(MKCONFIG) -a ap121 mips mips ap121 ar7240 ar7240 +gl-innovations_gl-ar150: ar933x_common + @$(call config_init,GL Innovations GL-AR150,gl-ar150,16,11,,QCA_AR933X_SOC) + @$(call define_add,CONFIG_FOR_GL_AR150,1) + @$(MKCONFIG) -a ap121 mips mips ap121 ar7240 ar7240 + gl-innovations_gl-inet-6416: ar933x_common - @$(call config_init,GL-Innovations GL.iNet 6416,glinet-6416,8,11,,QCA_AR933X_SOC) + @$(call config_init,GL Innovations GL.iNet 6416,glinet-6416,8,11,,QCA_AR933X_SOC) @$(call define_add,CONFIG_FOR_GL_INET,1) @$(MKCONFIG) -a ap121 mips mips ap121 ar7240 ar7240 diff --git a/u-boot/include/configs/ap121.h b/u-boot/include/configs/ap121.h index 9581dc4..e025864 100644 --- a/u-boot/include/configs/ap121.h +++ b/u-boot/include/configs/ap121.h @@ -68,6 +68,16 @@ #define CONFIG_QCA_GPIO_MASK_OUT_INIT_H CONFIG_QCA_GPIO_MASK_LED_ACT_L #define CONFIG_QCA_GPIO_MASK_OUT_INIT_L CONFIG_QCA_GPIO_MASK_LED_ACT_H +#elif defined(CONFIG_FOR_GL_AR150) + + #define CONFIG_QCA_GPIO_MASK_LED_ACT_H GPIO0 | GPIO13 | GPIO15 + #define CONFIG_QCA_GPIO_MASK_OUT GPIO6 |\ + CONFIG_QCA_GPIO_MASK_LED_ACT_H + #define CONFIG_QCA_GPIO_MASK_IN GPIO1 | GPIO7 | GPIO8 | GPIO11 |\ + GPIO14 | GPIO16 | GPIO17 + #define CONFIG_QCA_GPIO_MASK_OUT_INIT_H GPIO6 + #define CONFIG_QCA_GPIO_MASK_OUT_INIT_L CONFIG_QCA_GPIO_MASK_LED_ACT_H + #elif defined(CONFIG_FOR_GL_INET) #define CONFIG_QCA_GPIO_MASK_LED_ACT_H GPIO0 | GPIO13 @@ -204,6 +214,12 @@ "rootfstype=squashfs init=/sbin/init "\ "mtdparts=ar7240-nor0:192k(u-boot),64k(u-boot-env),16064k(firmware),64k(art)" +#elif defined(CONFIG_FOR_GL_AR150) + + #define CONFIG_BOOTARGS "console=ttyATH0,115200 board=domino root=31:03 "\ + "rootfstype=squashfs,jffs2 noinitrd "\ + "mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,1280k(kernel),14656k(rootfs),64k(nvram),64k(art)ro,15936k@0x50000(firmware)" + #elif defined(CONFIG_FOR_GL_INET) ||\ defined(CONFIG_FOR_TPLINK_MR10U_V1) ||\ defined(CONFIG_FOR_TPLINK_MR13U_V1) ||\ @@ -237,8 +253,9 @@ * Load address and boot command * ============================= */ -#if defined(CONFIG_FOR_8DEVICES_CARAMBOLA2) ||\ - defined(CONFIG_FOR_ALFA_NETWORK_HORNET_UB) +#if defined(CONFIG_FOR_8DEVICES_CARAMBOLA2) ||\ + defined(CONFIG_FOR_ALFA_NETWORK_HORNET_UB) ||\ + defined(CONFIG_FOR_GL_AR150) #define CFG_LOAD_ADDR 0x9F050000 #elif defined(CONFIG_FOR_BLACK_SWIFT_BOARD) #define CFG_LOAD_ADDR 0x9F030000 @@ -262,8 +279,9 @@ * Environment configuration * ========================= */ -#if defined(CONFIG_FOR_8DEVICES_CARAMBOLA2) ||\ - defined(CONFIG_FOR_ALFA_NETWORK_HORNET_UB) +#if defined(CONFIG_FOR_8DEVICES_CARAMBOLA2) ||\ + defined(CONFIG_FOR_ALFA_NETWORK_HORNET_UB) ||\ + defined(CONFIG_FOR_GL_AR150) #define CFG_ENV_ADDR 0x9F040000 #define CFG_ENV_SIZE 0x8000 #define CFG_ENV_SECT_SIZE 0x10000 @@ -310,7 +328,8 @@ #define OFFSET_MAC_DATA_BLOCK_LENGTH 0x010000 #define OFFSET_MAC_ADDRESS 0x000000 #define OFFSET_MAC_ADDRESS2 0x000006 -#elif defined(CONFIG_FOR_BLACK_SWIFT_BOARD) +#elif defined(CONFIG_FOR_BLACK_SWIFT_BOARD) ||\ + defined(CONFIG_FOR_GL_AR150) #define OFFSET_MAC_DATA_BLOCK 0xFF0000 #define OFFSET_MAC_DATA_BLOCK_LENGTH 0x010000 #define OFFSET_MAC_ADDRESS 0x000000 @@ -339,6 +358,7 @@ !defined(CONFIG_FOR_BLACK_SWIFT_BOARD) &&\ !defined(CONFIG_FOR_DLINK_DIR505_A1) &&\ !defined(CONFIG_FOR_DRAGINO_V2) &&\ + !defined(CONFIG_FOR_GL_AR150) &&\ !defined(CONFIG_FOR_GL_INET) &&\ !defined(CONFIG_FOR_GS_OOLITE_V1_DEV) &&\ !defined(CONFIG_FOR_MESH_POTATO_V2) @@ -395,7 +415,8 @@ #endif /* Firmware size limit */ -#if defined(CONFIG_FOR_8DEVICES_CARAMBOLA2) +#if defined(CONFIG_FOR_8DEVICES_CARAMBOLA2) ||\ + defined(CONFIG_FOR_GL_AR150) #define WEBFAILSAFE_UPLOAD_LIMITED_AREA_IN_BYTES (384 * 1024) #elif defined(CONFIG_FOR_ALFA_NETWORK_HORNET_UB) #define WEBFAILSAFE_UPLOAD_LIMITED_AREA_IN_BYTES (448 * 1024) @@ -419,8 +440,9 @@ */ #define CONFIG_QCA_PLL QCA_PLL_PRESET_400_400_200 -#if defined(CONFIG_FOR_8DEVICES_CARAMBOLA2) ||\ - defined(CONFIG_FOR_ALFA_NETWORK_HORNET_UB) +#if defined(CONFIG_FOR_8DEVICES_CARAMBOLA2) ||\ + defined(CONFIG_FOR_ALFA_NETWORK_HORNET_UB) ||\ + defined(CONFIG_FOR_GL_AR150) #define CONFIG_QCA_PLL_IN_FLASH_BLOCK_OFFSET 0x40000 #define CONFIG_QCA_PLL_IN_FLASH_BLOCK_SIZE 0x10000 @@ -454,6 +476,7 @@ !defined(CONFIG_FOR_BLACK_SWIFT_BOARD) &&\ !defined(CONFIG_FOR_DLINK_DIR505_A1) &&\ !defined(CONFIG_FOR_DRAGINO_V2) &&\ + !defined(CONFIG_FOR_GL_AR150) &&\ !defined(CONFIG_FOR_MESH_POTATO_V2) #define CONFIG_UPG_SCRIPTS_UBOOT_SIZE_BCKP_HEX 0x20000 #endif