From e0f87c19ed5143faab3998b18f3261563828abaf Mon Sep 17 00:00:00 2001 From: Piotr Dymacz Date: Thu, 9 Nov 2017 20:11:14 +0100 Subject: [PATCH] Cosmetic: be consistent with vendor and board names --- Makefile | 4 +- README.md | 14 ++-- u-boot/Makefile | 28 +++---- u-boot/cpu/mips/ar7240/qca_dram.c | 4 +- u-boot/include/configs/ap121.h | 130 +++++++++++++++--------------- u-boot/include/configs/db12x.h | 16 ++-- u-boot/lib_mips/mips_linux.c | 2 +- 7 files changed, 99 insertions(+), 99 deletions(-) diff --git a/Makefile b/Makefile index f5edb2b..0de734a 100644 --- a/Makefile +++ b/Makefile @@ -261,10 +261,10 @@ comfast_cf-e520n \ comfast_cf-e530n: @$(call build,64,1,ETH_CONFIG=_s27) -d-link_dir-505: +d-link_dir-505_a1: @$(call build,64,1) -dragino_v2_ms14: +dragino_ms14: @$(call build,192,1,DEVICE_VENDOR=dragino) engenius_ens202ext \ diff --git a/README.md b/README.md index 2761c6a..8ad8eaf 100644 --- a/README.md +++ b/README.md @@ -63,11 +63,11 @@ Currently supported devices: - **Atheros AR9331**: - 8devices Carambola 2 (for version with development board, [photos in my gallery](http://galeria.tech-blog.pl/8devices_Carambola_2/)) - - ALFA NETWORK AP121F - - ALFA NETWORK Hornet-UB/Hornet-UB-64 (aka Hornet-UB x2) + - ALFA Network AP121F + - ALFA Network Hornet-UB/Hornet-UB-64 (aka Hornet-UB x2) - Black Swift - CreatComm Technology D3321 - - Dragino 2 (MS14) + - Dragino MS14/N - GL.iNet 64xxA ([photos in my gallery](http://galeria.tech-blog.pl/GLiNet/)) - GL.iNet GL-AR150 - GL.iNet GL-USB150 @@ -81,7 +81,7 @@ Currently supported devices: - TP-Link TL-WR710N v1 (version for European market, [photos in my gallery](http://galeria.tech-blog.pl/TP-Link_TL-WR710N-EU/)) - TP-Link TL-WR720N v3 (version for Chinese market) - TP-Link TL-WR740N v4 (and similar, like TL-WR741ND v4) - - Village Telco Mesh Potato 2 (based on Dragino MS14) + - Village Telco Mesh Potato 2 (based on Dragino MS14/N) - **Atheros AR1311 (similar to AR9331)** - D-Link DIR-505 H/W ver. A1 ([photos in my gallery](http://galeria.tech-blog.pl/D-Link_DIR-505/)) @@ -131,15 +131,15 @@ More information about supported devices: | Model | SoC | FLASH | RAM | U-Boot image | U-Boot env | |:--- | :--- | ---: | ---: | ---: | ---: | | [8devices Carambola 2](http://8devices.com/carambola-2) | AR9331 | 16 MiB | 64 MiB DDR2 | 256 KiB | R/W | -| ALFA NETWORK AP121F | AR9331 | 16 MiB | 64 MiB DDR1 | 192 KiB, LZMA | R/W | -| [ALFA NETWORK Hornet-UB](https://wiki.openwrt.org/toh/alfa.network/hornet-ub) | AR9331 | 8/16 MiB | 32/64 MiB DDR1 | 256 KiB | R/W | +| ALFA Network AP121F | AR9331 | 16 MiB | 64 MiB DDR1 | 192 KiB, LZMA | R/W | +| [ALFA Network Hornet-UB](https://wiki.openwrt.org/toh/alfa.network/hornet-ub) | AR9331 | 8/16 MiB | 32/64 MiB DDR1 | 256 KiB | R/W | | [Black Swift](http://www.black-swift.com) | AR9331 | 16 MiB | 64 MiB DDR2 | 128 KiB, LZMA | R/W | | Comfast CF-E314N | QCA9531 | 16 MiB | 64 MiB DDR2 | 64 KiB, LZMA | RO | | Comfast CF-E320N v2 | QCA9531 | 16 MiB | 64 MiB DDR2 | 64 KiB, LZMA | RO | | Comfast CF-E520N/CF-E530N | QCA9531 | 8 MiB | 32 MiB DDR2 | 64 KiB, LZMA | RO | | CreatComm Technology D3321 | AR9331 | 8 MiB | 32 MiB DDR1 | 256 KiB | RW | | [D-Link DIR-505 H/W ver. A1](http://wiki.openwrt.org/toh/d-link/dir-505) | AR1311 | 8 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 | +| [Dragino MS14/N](http://wiki.openwrt.org/toh/dragino/ms14) | AR9331 | 16 MiB | 64 MiB DDR1 | 192 KiB | R/W | | [EnGenius ENS202EXT](https://wiki.openwrt.org/toh/engenius/engenius_ens202ext_1.0.0) | AR9341 | 16 MiB | 64 MiB DDR1 | 256 KiB | R/W | | [GL.iNet 64xxA](http://wiki.openwrt.org/toh/gl-inet/gl-inet) | AR9331 | 8/16 MiB | 64 MiB DDR1 | 64 KiB | RO | | GL.iNet GL-AR150 | AR9331 | 16 MiB | 64 MiB DDR2 | 256 KiB | R/W | diff --git a/u-boot/Makefile b/u-boot/Makefile index e27ec7c..0e39f09 100644 --- a/u-boot/Makefile +++ b/u-boot/Makefile @@ -397,12 +397,12 @@ lsdk_kernel: @$(MKCONFIG) -a ap121 mips mips ap121 ar7240 ar7240 alfa-network_ap121f: ar933x_common - @$(call config_init,ALFA NETWORK AP121F,ap121f,16,12,1,QCA_AR933X_SOC) + @$(call config_init,ALFA Network AP121F,ap121f,16,12,1,QCA_AR933X_SOC) @$(call define_add,CONFIG_FOR_ALFA_NETWORK_AP121F,1) @$(MKCONFIG) -a ap121 mips mips ap121 ar7240 ar7240 alfa-network_hornet-ub: ar933x_common - @$(call config_init,ALFA NETWORK Hornet-UB,hornet-ub,8,12,1,QCA_AR933X_SOC) + @$(call config_init,ALFA Network Hornet-UB,hornet-ub,8,12,1,QCA_AR933X_SOC) @$(call define_add,CONFIG_FOR_ALFA_NETWORK_HORNET_UB,1) @$(MKCONFIG) -a ap121 mips mips ap121 ar7240 ar7240 @@ -440,14 +440,14 @@ creatcomm-technology_d3321: ar933x_common @$(call define_add,CONFIG_FOR_CREATCOMM_D3321,1) @$(MKCONFIG) -a ap121 mips mips ap121 ar7240 ar7240 -d-link_dir-505: ar933x_common - @$(call config_init,D-Link DIR-505,dir-505,8,11,1,QCA_AR933X_SOC) +d-link_dir-505_a1: ar933x_common + @$(call config_init,D-Link DIR-505 A1,dir-505-a1,8,11,1,QCA_AR933X_SOC) @$(call define_add,CONFIG_FOR_DLINK_DIR505_A1,1) @$(MKCONFIG) -a ap121 mips mips ap121 ar7240 ar7240 -dragino_v2_ms14: ar933x_common - @$(call config_init,Dragino v2 (MS14),dragino-v2,16,11,1,QCA_AR933X_SOC) - @$(call define_add,CONFIG_FOR_DRAGINO_V2,1) +dragino_ms14: ar933x_common + @$(call config_init,Dragino MS14/N,ms14,16,11,1,QCA_AR933X_SOC) + @$(call define_add,CONFIG_FOR_DRAGINO_MS14,1) @$(call define_add,WEBFAILSAFE_DISABLE_ART_UPGRADE,1) @$(call define_add,WEBFAILSAFE_DISABLE_UBOOT_UPGRADE,1) @$(MKCONFIG) -a ap121 mips mips ap121 ar7240 ar7240 @@ -466,24 +466,24 @@ gainstrong_oolite_v1_dev: ar933x_common gl-inet_6416: ar933x_common @$(call config_init,GL.iNet 6416,glinet-6416,8,11,,QCA_AR933X_SOC) - @$(call define_add,CONFIG_FOR_GL_INET,1) + @$(call define_add,CONFIG_FOR_GLINET_6416,1) @$(MKCONFIG) -a ap121 mips mips ap121 ar7240 ar7240 gl-inet_gl-ar150: ar933x_common @$(call config_init,GL.iNet GL-AR150,gl-ar150,16,11,,QCA_AR933X_SOC) - @$(call define_add,CONFIG_FOR_GL_AR150,1) + @$(call define_add,CONFIG_FOR_GLINET_GL_AR150,1) @$(MKCONFIG) -a ap121 mips mips ap121 ar7240 ar7240 gl-inet_gl-ar300: ar934x_common @$(call config_init,GL.iNet GL-AR300,gl-ar300,16,16,1,QCA_AR9344_SOC) - @$(call define_add,CONFIG_FOR_GL_AR300,1) + @$(call define_add,CONFIG_FOR_GLINET_GL_AR300,1) @$(call define_add,CFG_ATHRS27_PHY,1) @$(call define_add,CFG_AG7240_NMACS,2) @$(MKCONFIG) -a db12x mips mips db12x ar7240 ar7240 gl-inet_gl-usb150: ar933x_common @$(call config_init,GL.iNet GL-USB150,gl-usb150,16,11,,QCA_AR933X_SOC) - @$(call define_add,CONFIG_FOR_GL_USB150,1) + @$(call define_add,CONFIG_FOR_GLINET_GL_USB150,1) @$(MKCONFIG) -a ap121 mips mips ap121 ar7240 ar7240 p2w_cpe505n: qca953x_common @@ -702,13 +702,13 @@ tp-link_tl-wr902ac_v1: qca953x_common lsdk_kernel @$(MKCONFIG) -a ap143 mips mips ap143 ar7240 ar7240 unwireddevices_unwired-one: ar933x_common - @$(call config_init,Black Swift aka Unwired One,black-swift,16,11,1,QCA_AR933X_SOC) - @$(call define_add,CONFIG_FOR_BLACK_SWIFT_BOARD,1) + @$(call config_init,Unwired Devices Unwired One,unwired-one,16,11,1,QCA_AR933X_SOC) + @$(call define_add,CONFIG_FOR_UNWIRED_DEVICES_UNWIRED_ONE,1) @$(MKCONFIG) -a ap121 mips mips ap121 ar7240 ar7240 village-telco_mesh-potato_v2: ar933x_common @$(call config_init,Village Telco Mesh Potato 2,mesh-potato-v2,16,11,1,QCA_AR933X_SOC) - @$(call define_add,CONFIG_FOR_MESH_POTATO_V2,1) + @$(call define_add,CONFIG_FOR_VILLAGE_TELCO_MP2,1) @$(call define_add,WEBFAILSAFE_DISABLE_ART_UPGRADE,1) @$(call define_add,WEBFAILSAFE_DISABLE_UBOOT_UPGRADE,1) @$(MKCONFIG) -a ap121 mips mips ap121 ar7240 ar7240 diff --git a/u-boot/cpu/mips/ar7240/qca_dram.c b/u-boot/cpu/mips/ar7240/qca_dram.c index dd4f702..5e5bc71 100644 --- a/u-boot/cpu/mips/ar7240/qca_dram.c +++ b/u-boot/cpu/mips/ar7240/qca_dram.c @@ -83,7 +83,7 @@ u32 qca_dram_type(void) >> QCA_RST_BOOTSTRAP_MEM_TYPE_SHIFT); /* - * There are two major different versions of Dragino 2. Initial one uses DDR1 + * There are two major different versions of Dragino MS14. Initial one uses DDR1 * and a custom PCB. The new one is based on Dragino HE module which has DDR2. * * Both versions have a "bug" in DRAM type detection. They don't use both GPIOs @@ -91,7 +91,7 @@ u32 qca_dram_type(void) * * Therefore, use a custom DRAM type detection here (ignore LSB bit) */ -#if defined(CONFIG_FOR_DRAGINO_V2) || defined(CONFIG_FOR_MESH_POTATO_V2) +#if defined(CONFIG_FOR_DRAGINO_MS14) || defined(CONFIG_FOR_VILLAGE_TELCO_MP2) dram_type = dram_type >> 1; if (dram_type) diff --git a/u-boot/include/configs/ap121.h b/u-boot/include/configs/ap121.h index 6f4ff56..5c2af1c 100644 --- a/u-boot/include/configs/ap121.h +++ b/u-boot/include/configs/ap121.h @@ -56,7 +56,7 @@ 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_BLACK_SWIFT_BOARD) +#elif defined(CONFIG_FOR_UNWIRED_DEVICES_UNWIRED_ONE) #define CONFIG_QCA_GPIO_MASK_LED_ACT_L GPIO27 #define CONFIG_QCA_GPIO_MASK_OUT CONFIG_QCA_GPIO_MASK_LED_ACT_L @@ -81,8 +81,8 @@ #define CONFIG_QCA_GPIO_MASK_IN GPIO11 #define CONFIG_QCA_GPIO_MASK_OUT_INIT_H CONFIG_QCA_GPIO_MASK_LED_ACT_L -#elif defined(CONFIG_FOR_DRAGINO_V2) ||\ - defined(CONFIG_FOR_MESH_POTATO_V2) +#elif defined(CONFIG_FOR_DRAGINO_MS14) ||\ + defined(CONFIG_FOR_VILLAGE_TELCO_MP2) #define CONFIG_QCA_GPIO_MASK_LED_ACT_H GPIO0 | GPIO28 #define CONFIG_QCA_GPIO_MASK_LED_ACT_L GPIO13 | GPIO17 @@ -92,7 +92,7 @@ #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) +#elif defined(CONFIG_FOR_GLINET_GL_AR150) #define CONFIG_QCA_GPIO_MASK_LED_ACT_H GPIO0 | GPIO13 | GPIO15 #define CONFIG_QCA_GPIO_MASK_OUT GPIO6 |\ @@ -102,14 +102,14 @@ #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) +#elif defined(CONFIG_FOR_GLINET_6416) #define CONFIG_QCA_GPIO_MASK_LED_ACT_H GPIO0 | GPIO13 #define CONFIG_QCA_GPIO_MASK_OUT CONFIG_QCA_GPIO_MASK_LED_ACT_H #define CONFIG_QCA_GPIO_MASK_IN GPIO11 #define CONFIG_QCA_GPIO_MASK_OUT_INIT_L CONFIG_QCA_GPIO_MASK_LED_ACT_H -#elif defined(CONFIG_FOR_GL_USB150) +#elif defined(CONFIG_FOR_GLINET_GL_USB150) #define CONFIG_QCA_GPIO_MASK_LED_ACT_H GPIO0 #define CONFIG_QCA_GPIO_MASK_OUT GPIO7 | GPIO13 |\ @@ -235,7 +235,7 @@ "rootfstype=squashfs init=/sbin/init "\ "mtdparts=ar7240-nor0:256k(u-boot),64k(u-boot-env),6144k(rootfs),1600k(uImage),64k(NVRAM),64k(ART)" -#elif defined(CONFIG_FOR_BLACK_SWIFT_BOARD) +#elif defined(CONFIG_FOR_UNWIRED_DEVICES_UNWIRED_ONE) #define CONFIG_BOOTARGS "console=ttyS0,115200 root=31:02 "\ "rootfstype=squashfs init=/sbin/init "\ @@ -253,21 +253,21 @@ "rootfstype=squashfs init=/sbin/init "\ "mtdparts=ar7240-nor0:64k(u-boot),64k(art),64k(mac),64k(nvram),256k(language),1024k(uImage),6656k(rootfs)" -#elif defined(CONFIG_FOR_DRAGINO_V2) ||\ - defined(CONFIG_FOR_MESH_POTATO_V2) +#elif defined(CONFIG_FOR_DRAGINO_MS14) ||\ + defined(CONFIG_FOR_VILLAGE_TELCO_MP2) #define CONFIG_BOOTARGS "console=ttyS0,115200 root=31:02 "\ "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) ||\ - defined(CONFIG_FOR_GL_USB150) +#elif defined(CONFIG_FOR_GLINET_GL_AR150) ||\ + defined(CONFIG_FOR_GLINET_GL_USB150) #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) ||\ +#elif defined(CONFIG_FOR_GLINET_6416) ||\ defined(CONFIG_FOR_TPLINK_MR10U_V1) ||\ defined(CONFIG_FOR_TPLINK_MR13U_V1) ||\ defined(CONFIG_FOR_TPLINK_MR3020_V1) ||\ @@ -304,15 +304,15 @@ defined(CONFIG_FOR_ALFA_NETWORK_AP121F) ||\ defined(CONFIG_FOR_ALFA_NETWORK_HORNET_UB) ||\ defined(CONFIG_FOR_CREATCOMM_D3321) ||\ - defined(CONFIG_FOR_GL_AR150) ||\ - defined(CONFIG_FOR_GL_USB150) + defined(CONFIG_FOR_GLINET_GL_AR150) ||\ + defined(CONFIG_FOR_GLINET_GL_USB150) #define CFG_LOAD_ADDR 0x9F050000 -#elif defined(CONFIG_FOR_BLACK_SWIFT_BOARD) +#elif defined(CONFIG_FOR_UNWIRED_DEVICES_UNWIRED_ONE) #define CFG_LOAD_ADDR 0x9F030000 #elif defined(CONFIG_FOR_DLINK_DIR505_A1) #define CFG_LOAD_ADDR 0x9F080000 -#elif defined(CONFIG_FOR_DRAGINO_V2) ||\ - defined(CONFIG_FOR_MESH_POTATO_V2) +#elif defined(CONFIG_FOR_DRAGINO_MS14) ||\ + defined(CONFIG_FOR_VILLAGE_TELCO_MP2) #define CFG_LOAD_ADDR 0x9F040000 #else #define CFG_LOAD_ADDR 0x9F020000 @@ -332,15 +332,15 @@ #if defined(CONFIG_FOR_8DEVICES_CARAMBOLA2) ||\ defined(CONFIG_FOR_ALFA_NETWORK_HORNET_UB) ||\ defined(CONFIG_FOR_CREATCOMM_D3321) ||\ - defined(CONFIG_FOR_GL_AR150) ||\ - defined(CONFIG_FOR_GL_USB150) + defined(CONFIG_FOR_GLINET_GL_AR150) ||\ + defined(CONFIG_FOR_GLINET_GL_USB150) #define CFG_ENV_ADDR 0x9F040000 #define CFG_ENV_SIZE 0x8000 #define CFG_ENV_SECT_SIZE 0x10000 #elif defined(CONFIG_FOR_ALFA_NETWORK_AP121F) #define CFG_ENV_ADDR 0x9F030000 #define CFG_ENV_SIZE 0x10000 -#elif defined(CONFIG_FOR_BLACK_SWIFT_BOARD) +#elif defined(CONFIG_FOR_UNWIRED_DEVICES_UNWIRED_ONE) #define CFG_ENV_ADDR 0x9F020000 #define CFG_ENV_SIZE 0x8000 #define CFG_ENV_SECT_SIZE 0x10000 @@ -348,8 +348,8 @@ #define CFG_ENV_ADDR 0x9F028000 #define CFG_ENV_SIZE 0x7C00 #define CFG_ENV_SECT_SIZE 0x10000 -#elif defined(CONFIG_FOR_DRAGINO_V2) ||\ - defined(CONFIG_FOR_MESH_POTATO_V2) +#elif defined(CONFIG_FOR_DRAGINO_MS14) ||\ + defined(CONFIG_FOR_VILLAGE_TELCO_MP2) #define CFG_ENV_ADDR 0x9F030000 #define CFG_ENV_SIZE 0x8000 #define CFG_ENV_SECT_SIZE 0x10000 @@ -378,8 +378,8 @@ #if defined(CONFIG_FOR_8DEVICES_CARAMBOLA2) ||\ defined(CONFIG_FOR_ALFA_NETWORK_HORNET_UB) ||\ defined(CONFIG_FOR_CREATCOMM_D3321) ||\ - defined(CONFIG_FOR_DRAGINO_V2) ||\ - defined(CONFIG_FOR_MESH_POTATO_V2) + defined(CONFIG_FOR_DRAGINO_MS14) ||\ + defined(CONFIG_FOR_VILLAGE_TELCO_MP2) #define OFFSET_MAC_DATA_BLOCK 0xFF0000 #define OFFSET_MAC_DATA_BLOCK_LENGTH 0x010000 #define OFFSET_MAC_ADDRESS 0x000000 @@ -388,9 +388,9 @@ #define OFFSET_MAC_DATA_BLOCK 0x40000 #define OFFSET_MAC_DATA_BLOCK_LENGTH 0x10000 #define OFFSET_MAC_ADDRESS 0x00000 -#elif defined(CONFIG_FOR_BLACK_SWIFT_BOARD) ||\ - defined(CONFIG_FOR_GL_AR150) ||\ - defined(CONFIG_FOR_GL_USB150) +#elif defined(CONFIG_FOR_UNWIRED_DEVICES_UNWIRED_ONE) ||\ + defined(CONFIG_FOR_GLINET_GL_AR150) ||\ + defined(CONFIG_FOR_GLINET_GL_USB150) #define OFFSET_MAC_DATA_BLOCK 0xFF0000 #define OFFSET_MAC_DATA_BLOCK_LENGTH 0x010000 #define OFFSET_MAC_ADDRESS 0x000000 @@ -414,18 +414,18 @@ #define OFFSET_MAC_ADDRESS 0x00FC00 #endif -#if !defined(CONFIG_FOR_8DEVICES_CARAMBOLA2) &&\ - !defined(CONFIG_FOR_ALFA_NETWORK_AP121F) &&\ - !defined(CONFIG_FOR_ALFA_NETWORK_HORNET_UB) &&\ - !defined(CONFIG_FOR_BLACK_SWIFT_BOARD) &&\ - !defined(CONFIG_FOR_CREATCOMM_D3321) &&\ - !defined(CONFIG_FOR_DLINK_DIR505_A1) &&\ - !defined(CONFIG_FOR_DRAGINO_V2) &&\ - !defined(CONFIG_FOR_GL_AR150) &&\ - !defined(CONFIG_FOR_GL_INET) &&\ - !defined(CONFIG_FOR_GL_USB150) &&\ - !defined(CONFIG_FOR_GS_OOLITE_V1_DEV) &&\ - !defined(CONFIG_FOR_MESH_POTATO_V2) +#if !defined(CONFIG_FOR_8DEVICES_CARAMBOLA2) &&\ + !defined(CONFIG_FOR_ALFA_NETWORK_AP121F) &&\ + !defined(CONFIG_FOR_ALFA_NETWORK_HORNET_UB) &&\ + !defined(CONFIG_FOR_UNWIRED_DEVICES_UNWIRED_ONE) &&\ + !defined(CONFIG_FOR_CREATCOMM_D3321) &&\ + !defined(CONFIG_FOR_DLINK_DIR505_A1) &&\ + !defined(CONFIG_FOR_DRAGINO_MS14) &&\ + !defined(CONFIG_FOR_GLINET_GL_AR150) &&\ + !defined(CONFIG_FOR_GLINET_6416) &&\ + !defined(CONFIG_FOR_GLINET_GL_USB150) &&\ + !defined(CONFIG_FOR_GS_OOLITE_V1_DEV) &&\ + !defined(CONFIG_FOR_VILLAGE_TELCO_MP2) #define OFFSET_ROUTER_MODEL 0xFD00 #endif @@ -442,8 +442,8 @@ * ========================= */ -/* Dragino 2 uses different IP addresses */ -#if defined(CONFIG_FOR_DRAGINO_V2) +/* Dragino MS14 uses different IP addresses */ +#if defined(CONFIG_FOR_DRAGINO_MS14) #undef CONFIG_IPADDR #define CONFIG_IPADDR 192.168.255.1 @@ -451,12 +451,12 @@ #define CONFIG_SERVERIP 192.168.255.2 #endif -/* Dragino 2 and Black Swift boards use different prompts */ -#if defined(CONFIG_FOR_BLACK_SWIFT_BOARD) +/* Dragino MS14 and Unwired One boards use different prompts */ +#if defined(CONFIG_FOR_UNWIRED_DEVICES_UNWIRED_ONE) #undef CFG_PROMPT #define CFG_PROMPT "BSB> " -#elif defined(CONFIG_FOR_DRAGINO_V2) ||\ - defined(CONFIG_FOR_MESH_POTATO_V2) +#elif defined(CONFIG_FOR_DRAGINO_MS14) ||\ + defined(CONFIG_FOR_VILLAGE_TELCO_MP2) #undef CFG_PROMPT #define CFG_PROMPT "dr_boot> " #endif @@ -482,16 +482,16 @@ /* Firmware size limit */ #if defined(CONFIG_FOR_8DEVICES_CARAMBOLA2) ||\ - defined(CONFIG_FOR_GL_AR150) ||\ - defined(CONFIG_FOR_GL_USB150) + defined(CONFIG_FOR_GLINET_GL_AR150) ||\ + defined(CONFIG_FOR_GLINET_GL_USB150) #define WEBFAILSAFE_UPLOAD_LIMITED_AREA_IN_BYTES (384 * 1024) #elif defined(CONFIG_FOR_ALFA_NETWORK_AP121F) ||\ - defined(CONFIG_FOR_DRAGINO_V2) ||\ - defined(CONFIG_FOR_MESH_POTATO_V2) + defined(CONFIG_FOR_DRAGINO_MS14) ||\ + defined(CONFIG_FOR_VILLAGE_TELCO_MP2) #define WEBFAILSAFE_UPLOAD_LIMITED_AREA_IN_BYTES (320 * 1024) #elif defined(CONFIG_FOR_ALFA_NETWORK_HORNET_UB) #define WEBFAILSAFE_UPLOAD_LIMITED_AREA_IN_BYTES (448 * 1024) -#elif defined(CONFIG_FOR_BLACK_SWIFT_BOARD) +#elif defined(CONFIG_FOR_UNWIRED_DEVICES_UNWIRED_ONE) #define WEBFAILSAFE_UPLOAD_LIMITED_AREA_IN_BYTES (256 * 1024) #elif defined(CONFIG_FOR_CREATCOMM_D3321) #define WEBFAILSAFE_UPLOAD_LIMITED_AREA_IN_BYTES (1856 * 1024) @@ -514,20 +514,20 @@ defined(CONFIG_FOR_ALFA_NETWORK_AP121F) ||\ defined(CONFIG_FOR_ALFA_NETWORK_HORNET_UB) ||\ defined(CONFIG_FOR_CREATCOMM_D3321) ||\ - defined(CONFIG_FOR_GL_AR150) ||\ - defined(CONFIG_FOR_GL_USB150) + defined(CONFIG_FOR_GLINET_GL_AR150) ||\ + defined(CONFIG_FOR_GLINET_GL_USB150) #define CONFIG_QCA_PLL_IN_FLASH_BLOCK_OFFSET 0x40000 #define CONFIG_QCA_PLL_IN_FLASH_BLOCK_SIZE 0x10000 -#elif defined(CONFIG_FOR_BLACK_SWIFT_BOARD) ||\ +#elif defined(CONFIG_FOR_UNWIRED_DEVICES_UNWIRED_ONE) ||\ defined(CONFIG_FOR_DLINK_DIR505_A1) #define CONFIG_QCA_PLL_IN_FLASH_BLOCK_OFFSET 0x20000 #define CONFIG_QCA_PLL_IN_FLASH_BLOCK_SIZE 0x10000 -#elif defined(CONFIG_FOR_DRAGINO_V2) ||\ - defined(CONFIG_FOR_MESH_POTATO_V2) +#elif defined(CONFIG_FOR_DRAGINO_MS14) ||\ + defined(CONFIG_FOR_VILLAGE_TELCO_MP2) #define CONFIG_QCA_PLL_IN_FLASH_BLOCK_OFFSET 0x30000 #define CONFIG_QCA_PLL_IN_FLASH_BLOCK_SIZE 0x10000 @@ -544,16 +544,16 @@ * For upgrade scripts in environment * ================================== */ -#if !defined(CONFIG_FOR_8DEVICES_CARAMBOLA2) &&\ - !defined(CONFIG_FOR_ALFA_NETWORK_AP121F) &&\ - !defined(CONFIG_FOR_ALFA_NETWORK_HORNET_UB) &&\ - !defined(CONFIG_FOR_BLACK_SWIFT_BOARD) &&\ - !defined(CONFIG_FOR_CREATCOMM_D3321) &&\ - !defined(CONFIG_FOR_DLINK_DIR505_A1) &&\ - !defined(CONFIG_FOR_DRAGINO_V2) &&\ - !defined(CONFIG_FOR_GL_AR150) &&\ - !defined(CONFIG_FOR_GL_USB150) &&\ - !defined(CONFIG_FOR_MESH_POTATO_V2) +#if !defined(CONFIG_FOR_8DEVICES_CARAMBOLA2) &&\ + !defined(CONFIG_FOR_ALFA_NETWORK_AP121F) &&\ + !defined(CONFIG_FOR_ALFA_NETWORK_HORNET_UB) &&\ + !defined(CONFIG_FOR_UNWIRED_DEVICES_UNWIRED_ONE) &&\ + !defined(CONFIG_FOR_CREATCOMM_D3321) &&\ + !defined(CONFIG_FOR_DLINK_DIR505_A1) &&\ + !defined(CONFIG_FOR_DRAGINO_MS14) &&\ + !defined(CONFIG_FOR_GLINET_GL_AR150) &&\ + !defined(CONFIG_FOR_GLINET_GL_USB150) &&\ + !defined(CONFIG_FOR_VILLAGE_TELCO_MP2) #define CONFIG_UPG_SCRIPTS_UBOOT_SIZE_BCKP_HEX 0x20000 #endif diff --git a/u-boot/include/configs/db12x.h b/u-boot/include/configs/db12x.h index 15bf6a2..8aead8f 100644 --- a/u-boot/include/configs/db12x.h +++ b/u-boot/include/configs/db12x.h @@ -29,7 +29,7 @@ #define CONFIG_QCA_GPIO_MASK_IN GPIO1 #define CONFIG_QCA_GPIO_MASK_OUT_INIT_H CONFIG_QCA_GPIO_MASK_LED_ACT_L -#elif defined(CONFIG_FOR_GL_AR300) +#elif defined(CONFIG_FOR_GLINET_GL_AR300) #define CONFIG_QCA_GPIO_MASK_LED_ACT_L GPIO13 | GPIO14 #define CONFIG_QCA_GPIO_MASK_OUT CONFIG_QCA_GPIO_MASK_LED_ACT_L @@ -116,7 +116,7 @@ "rootfstype=squashfs init=/etc/preinit "\ "mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env),320k(custom),1536k(kernel),12096k(rootfs),2048k(failsafe),64k(art)ro" -#elif defined(CONFIG_FOR_GL_AR300) +#elif defined(CONFIG_FOR_GLINET_GL_AR300) #define CONFIG_BOOTARGS "console=ttyATH0,115200 root=31:02 "\ "rootfstype=squashfs init=/sbin/init "\ @@ -152,7 +152,7 @@ */ #if defined(CONFIG_FOR_ENGENIUS_ENS202EXT) #define CFG_LOAD_ADDR 0x9F0A0000 -#elif defined(CONFIG_FOR_GL_AR300) +#elif defined(CONFIG_FOR_GLINET_GL_AR300) #define CFG_LOAD_ADDR 0x9F050000 #elif defined(CONFIG_FOR_YUNCORE_CPE870) #define CFG_LOAD_ADDR 0x9F680000 @@ -171,7 +171,7 @@ #define CFG_ENV_ADDR 0x9F040000 #define CFG_ENV_SIZE 0x10000 #define CFG_ENV_SECT_SIZE 0x10000 -#elif defined(CONFIG_FOR_GL_AR300) +#elif defined(CONFIG_FOR_GLINET_GL_AR300) #define CFG_ENV_ADDR 0x9F040000 #define CFG_ENV_SIZE 0xFC00 #define CFG_ENV_SECT_SIZE 0x10000 @@ -199,7 +199,7 @@ * MAC address/es, model and WPS pin offsets in FLASH * ================================================== */ -#if defined(CONFIG_FOR_GL_AR300) ||\ +#if defined(CONFIG_FOR_GLINET_GL_AR300) ||\ defined(CONFIG_FOR_YUNCORE_CPE870) #define OFFSET_MAC_DATA_BLOCK 0xFF0000 #define OFFSET_MAC_DATA_BLOCK_LENGTH 0x010000 @@ -246,7 +246,7 @@ /* Firmware size limit */ #if defined(CONFIG_FOR_ENGENIUS_ENS202EXT) #define WEBFAILSAFE_UPLOAD_LIMITED_AREA_IN_BYTES (2752 * 1024) -#elif defined(CONFIG_FOR_GL_AR300) +#elif defined(CONFIG_FOR_GLINET_GL_AR300) #define WEBFAILSAFE_UPLOAD_LIMITED_AREA_IN_BYTES (384 * 1024) #elif defined(CONFIG_FOR_YUNCORE_CPE870) #define WEBFAILSAFE_UPLOAD_LIMITED_AREA_IN_BYTES (256 * 1024) @@ -261,7 +261,7 @@ */ #define CONFIG_QCA_PLL QCA_PLL_PRESET_550_400_200 -#if defined(CONFIG_FOR_GL_AR300) +#if defined(CONFIG_FOR_GLINET_GL_AR300) #define CONFIG_QCA_PLL_IN_FLASH_BLOCK_OFFSET 0x40000 #define CONFIG_QCA_PLL_IN_FLASH_BLOCK_SIZE 0x10000 @@ -287,7 +287,7 @@ * ================================== */ #if !defined(CONFIG_FOR_ENGENIUS_ENS202EXT) &&\ - !defined(CONFIG_FOR_GL_AR300) &&\ + !defined(CONFIG_FOR_GLINET_GL_AR300) &&\ !defined(CONFIG_FOR_YUNCORE_CPE870) #define CONFIG_UPG_UBOOT_SIZE_BACKUP_HEX 0x20000 #endif diff --git a/u-boot/lib_mips/mips_linux.c b/u-boot/lib_mips/mips_linux.c index bf35cbc..4e37d19 100644 --- a/u-boot/lib_mips/mips_linux.c +++ b/u-boot/lib_mips/mips_linux.c @@ -182,7 +182,7 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) wasp_set_cca(); #endif -#if defined(CONFIG_FOR_DRAGINO_V2) || defined(CONFIG_FOR_MESH_POTATO_V2) +#if defined(CONFIG_FOR_DRAGINO_MS14) || defined(CONFIG_FOR_VILLAGE_TELCO_MP2) /* Restore WAN/LAN LEDs (BIT 3 and 7 in GPIO_FUNCTION_1) */ ar7240_reg_wr(AR7240_GPIO_FUNC, (ar7240_reg_rd(AR7240_GPIO_FUNC) | 0x88)); -- 2.25.1