From: Piotr Dymacz Date: Wed, 2 Mar 2016 14:47:01 +0000 (+0100) Subject: Use 'CN' instead of 'CH' for indicate that device is for China market, plus minor... X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=76c85b615f2c42b85e4f296b3770b0d29e2e7609;p=oweals%2Fu-boot_mod.git Use 'CN' instead of 'CH' for indicate that device is for China market, plus minor fixes in Makefiles --- diff --git a/Makefile b/Makefile index 09896eb..5f7f6ea 100644 --- a/Makefile +++ b/Makefile @@ -37,13 +37,13 @@ tplink_wr703n: @cd $(BUILD_TOPDIR)/u-boot/ && $(MAKECMD) ENDIANNESS=-EB V=1 all @make --no-print-directory show_size -tplink_wr720n_v3_CH: export UBOOT_FILE_NAME=uboot_for_tp-link_tl-wr720n_v3_CH -tplink_wr720n_v3_CH: export CONFIG_MAX_UBOOT_SIZE_KB=123 +tplink_wr720n_v3_CN: export UBOOT_FILE_NAME=uboot_for_tp-link_tl-wr720n_v3_CN +tplink_wr720n_v3_CN: export CONFIG_MAX_UBOOT_SIZE_KB=123 ifndef CONFIG_SKIP_LOWLEVEL_INIT -tplink_wr720n_v3_CH: export COMPRESSED_UBOOT=1 +tplink_wr720n_v3_CN: export COMPRESSED_UBOOT=1 endif -tplink_wr720n_v3_CH: - @cd $(BUILD_TOPDIR)/u-boot/ && $(MAKECMD) wr720n_v3_CH_config +tplink_wr720n_v3_CN: + @cd $(BUILD_TOPDIR)/u-boot/ && $(MAKECMD) wr720n_v3_CN_config @cd $(BUILD_TOPDIR)/u-boot/ && $(MAKECMD) ENDIANNESS=-EB V=1 all @make --no-print-directory show_size @@ -162,14 +162,14 @@ tplink_wa830re_v2_wa801nd_v2: @cd $(BUILD_TOPDIR)/u-boot/ && $(MAKECMD) ENDIANNESS=-EB V=1 all @make --no-print-directory show_size -tplink_wr820n_CH: export UBOOT_FILE_NAME=uboot_for_tp-link_tl-wr820n_CH -tplink_wr820n_CH: export CONFIG_MAX_UBOOT_SIZE_KB=123 +tplink_wr820n_CN: export UBOOT_FILE_NAME=uboot_for_tp-link_tl-wr820n_CN +tplink_wr820n_CN: export CONFIG_MAX_UBOOT_SIZE_KB=123 ifndef CONFIG_SKIP_LOWLEVEL_INIT -tplink_wr820n_CH: export COMPRESSED_UBOOT=1 +tplink_wr820n_CN: export COMPRESSED_UBOOT=1 endif -tplink_wr820n_CH: export ETH_CONFIG=_s27 -tplink_wr820n_CH: - @cd $(BUILD_TOPDIR)/u-boot/ && $(MAKECMD) tplink_wr820n_CH_config +tplink_wr820n_CN: export ETH_CONFIG=_s27 +tplink_wr820n_CN: + @cd $(BUILD_TOPDIR)/u-boot/ && $(MAKECMD) wr820n_CN_config @cd $(BUILD_TOPDIR)/u-boot/ && $(MAKECMD) ENDIANNESS=-EB V=1 all @make --no-print-directory show_size diff --git a/u-boot/Makefile b/u-boot/Makefile index 9bd2c1e..53f7f45 100644 --- a/u-boot/Makefile +++ b/u-boot/Makefile @@ -356,13 +356,13 @@ wr703n_config : unconfig hornet_common_config @./mkconfig -a ap121 mips mips ap121 ar7240 ar7240 -wr720n_v3_CH_config : unconfig hornet_common_config - @/bin/echo -e '\e[32m> Configuring for TP-Link TL-WR720N v3 CH at:' `date` '\e[0m' +wr720n_v3_CN_config : unconfig hornet_common_config + @/bin/echo -e '\e[32m> Configuring for TP-Link TL-WR720N v3 CN at:' `date` '\e[0m' @echo "#define CONFIG_FOR_TPLINK_WR720N_V3 1" >> include/config.h @echo "#define GPIO_RST_BUTTON_BIT 11" >> include/config.h @echo "#define DEFAULT_FLASH_SIZE_IN_MB 4" >> include/config.h @echo "#define CONFIG_TPLINK_IMAGE_HEADER 1" >> include/config.h - @echo "#define BOARD_CUSTOM_STRING \"TP-Link TL-WR720N v3 CH\"" >> include/config.h + @echo "#define BOARD_CUSTOM_STRING \"TP-Link TL-WR720N v3 CN\"" >> include/config.h @./mkconfig -a ap121 mips mips ap121 ar7240 ar7240 @@ -599,17 +599,17 @@ ap143_common_config : common_config @echo "#define CONFIG_ATHEROS 1" >> include/config.h @echo "#define CONFIG_MACH_QCA953x 1" >> include/config.h -tplink_wr820n_CH_config : unconfig ap143_common_config - @/bin/echo -e '\e[32m> Configuring for TP-Link TL-WR820N CH at:' `date` '\e[0m' +wr820n_CN_config : unconfig ap143_common_config + @/bin/echo -e '\e[32m> Configuring for TP-Link TL-WR820N CN at:' `date` '\e[0m' @echo "#define SOC_TYPE QCA_QCA953X_SOC" >> include/config.h - @echo "#define CONFIG_FOR_TPLINK_WR820N_CH 1" >> include/config.h + @echo "#define CONFIG_FOR_TPLINK_WR820N_CN 1" >> include/config.h @echo "#define CFG_ATHRS27_PHY 1" >> include/config.h @echo "#define CFG_ATH_GMAC_NMACS 2" >> include/config.h @echo "#define DEFAULT_FLASH_SIZE_IN_MB 4" >> include/config.h @echo "#define GPIO_RST_BUTTON_BIT 12" >> include/config.h @echo "#define GPIO_RST_BUTTON_IS_ACTIVE_LOW 1" >> include/config.h @echo "#define CONFIG_TPLINK_IMAGE_HEADER 1" >> include/config.h - @echo "#define BOARD_CUSTOM_STRING \"TP-Link TL-WR820N CH\"" >> include/config.h + @echo "#define BOARD_CUSTOM_STRING \"TP-Link TL-WR820N CN\"" >> include/config.h @./mkconfig -a ap143 mips mips ap143 ar7240 ar7240 diff --git a/u-boot/include/configs/ap143.h b/u-boot/include/configs/ap143.h index cfc13ce..c3db79d 100644 --- a/u-boot/include/configs/ap143.h +++ b/u-boot/include/configs/ap143.h @@ -12,7 +12,7 @@ /* * GPIO configuration */ -#if defined(CONFIG_FOR_TPLINK_WR820N_CH) +#if defined(CONFIG_FOR_TPLINK_WR820N_CN) /* LEDs */ #define CONFIG_QCA_GPIO_MASK_LEDS_ACTIVE_LO GPIO13 @@ -88,7 +88,7 @@ * Default bootargs */ #undef CONFIG_BOOTARGS -#if defined(CONFIG_FOR_TPLINK_WR820N_CH) +#if defined(CONFIG_FOR_TPLINK_WR820N_CN) #define CONFIG_BOOTARGS "console=ttyS0,115200 root=31:02 rootfstype=squashfs init=/sbin/init mtdparts=ath-nor0:32k(u-boot1),32k(u-boot2),3008k(rootfs),896k(uImage),64k(mib0),64k(ART)" #endif @@ -101,7 +101,7 @@ #undef CONFIG_LOADADDR #define CONFIG_LOADADDR 0x80800000 -#if defined(CONFIG_FOR_TPLINK_WR820N_CH) +#if defined(CONFIG_FOR_TPLINK_WR820N_CN) #define CFG_LOAD_ADDR 0x9F020000 #define UPDATE_SCRIPT_FW_ADDR "0x9F020000" #define CONFIG_BOOTCOMMAND "bootm 0x9F020000" @@ -118,7 +118,7 @@ #endif #define CFG_HZ bd->bi_cfg_hz -#if defined(CONFIG_FOR_TPLINK_WR820N_CH) +#if defined(CONFIG_FOR_TPLINK_WR820N_CN) #define CONFIG_QCA_PLL QCA_PLL_PRESET_550_400_200 #define CFG_HZ_FALLBACK (550000000LU/2) #endif @@ -140,7 +140,7 @@ #define CFG_ENV_IS_IN_FLASH 1 #undef CFG_ENV_IS_NOWHERE -#if defined(CONFIG_FOR_TPLINK_WR820N_CH) +#if defined(CONFIG_FOR_TPLINK_WR820N_CN) #define CFG_ENV_ADDR 0x9F01EC00 #define CFG_ENV_SIZE 0x1000 #define CFG_ENV_SECT_SIZE 0x10000 @@ -149,7 +149,7 @@ /* * Available commands */ -#if defined(CONFIG_FOR_TPLINK_WR820N_CH) +#if defined(CONFIG_FOR_TPLINK_WR820N_CN) #define CONFIG_COMMANDS (CFG_CMD_MEMORY | \ CFG_CMD_DHCP | \ CFG_CMD_PING | \ @@ -181,7 +181,7 @@ #define WEBFAILSAFE_UPLOAD_UBOOT_ADDRESS CFG_FLASH_BASE // Firmware partition offset -#if defined(CONFIG_FOR_TPLINK_WR820N_CH) +#if defined(CONFIG_FOR_TPLINK_WR820N_CN) #define WEBFAILSAFE_UPLOAD_KERNEL_ADDRESS WEBFAILSAFE_UPLOAD_UBOOT_ADDRESS + 0x20000 #endif @@ -189,7 +189,7 @@ #define WEBFAILSAFE_UPLOAD_UBOOT_SIZE_IN_BYTES (CONFIG_MAX_UBOOT_SIZE_KB * 1024) // TODO: should be == CONFIG_MAX_UBOOT_SIZE_KB -#if defined(CONFIG_FOR_TPLINK_WR820N_CH) +#if defined(CONFIG_FOR_TPLINK_WR820N_CN) #define UPDATE_SCRIPT_UBOOT_SIZE_IN_BYTES "0x1EC00" #define UPDATE_SCRIPT_UBOOT_BACKUP_SIZE_IN_BYTES "0x20000" #endif @@ -199,7 +199,7 @@ // max. firmware size <= (FLASH_SIZE - WEBFAILSAFE_UPLOAD_LIMITED_AREA_IN_BYTES) // TP-Link: 64k(U-Boot),64k(MAC/model/WPS pin block),64k(ART) -#if defined(CONFIG_FOR_TPLINK_WR820N_CH) +#if defined(CONFIG_FOR_TPLINK_WR820N_CN) #define WEBFAILSAFE_UPLOAD_LIMITED_AREA_IN_BYTES (192 * 1024) #endif @@ -253,7 +253,7 @@ #define CONFIG_AG7240_SPEPHY #define CONFIG_NET_MULTI #define CONFIG_PCI 1 -#if defined(CONFIG_FOR_TPLINK_WR820N_CH) +#if defined(CONFIG_FOR_TPLINK_WR820N_CN) #define WLANCAL 0x9fff1000 #define BOARDCAL 0x9fff0000 #endif @@ -263,7 +263,7 @@ #undef DEBUG /* MAC address, model and PIN number offsets in FLASH */ -#if defined(CONFIG_FOR_TPLINK_WR820N_CH) +#if defined(CONFIG_FOR_TPLINK_WR820N_CN) #define OFFSET_MAC_DATA_BLOCK 0x010000 #define OFFSET_MAC_DATA_BLOCK_LENGTH 0x010000 #define OFFSET_MAC_ADDRESS 0x00FC00 @@ -274,7 +274,7 @@ /* * PLL and clocks configurations from FLASH */ -#if defined(CONFIG_FOR_TPLINK_WR820N_CH) +#if defined(CONFIG_FOR_TPLINK_WR820N_CN) /* * All TP-Link routers have a lot of unused space * in FLASH, in second 64 KiB block.