forked from coolsnowwolf/lede
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: kernel: bump 6.1 to 6.1.61 (coolsnowwolf#11637) autocore: unify wifi signal view mediatek: add led aliases for GL.iNet GL-MT6000 base-files: Align rootfs_data upgrades to 64KiB on eMMC Version update to R23.11.11 mediatek: add default package mediatek: improve GL-MT6000 support (coolsnowwolf#11636)
- Loading branch information
Showing
16 changed files
with
338 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| LINUX_VERSION-6.1 = .60 | ||
| LINUX_KERNEL_HASH-6.1.60 = 58520e7ae5a6af254ddf7ddbfc42e4373b0d36c67d467f6e35a3bd1672f5fb0a | ||
| LINUX_VERSION-6.1 = .61 | ||
| LINUX_KERNEL_HASH-6.1.61 = ad2c9d12fc36e2dde4796a3eec8f4ddca2e278098f4e555b6e6f5f03ef6964ce |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
274 changes: 274 additions & 0 deletions
274
package/boot/uboot-mediatek/patches/436-add-glinet-mt6000.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,274 @@ | ||
| --- /dev/null | ||
| +++ b/arch/arm/dts/mt7986a-glinet-gl-mt6000.dts | ||
| @@ -0,0 +1,135 @@ | ||
| +// SPDX-License-Identifier: GPL-2.0 | ||
| + | ||
| +/dts-v1/; | ||
| +#include <dt-bindings/input/linux-event-codes.h> | ||
| +#include <dt-bindings/gpio/gpio.h> | ||
| + | ||
| +#include "mt7986.dtsi" | ||
| + | ||
| +/ { | ||
| + model = "GL.iNet GL-MT6000"; | ||
| + compatible = "glinet,gl-mt6000", "mediatek,mt7986-emmc-rfb", "mediatek,mt7986"; | ||
| + | ||
| + chosen { | ||
| + stdout-path = &uart0; | ||
| + tick-timer = &timer0; | ||
| + }; | ||
| + | ||
| + memory@40000000 { | ||
| + device_type = "memory"; | ||
| + reg = <0x40000000 0x40000000>; | ||
| + }; | ||
| + | ||
| + reg_1p8v: regulator-1p8v { | ||
| + compatible = "regulator-fixed"; | ||
| + regulator-name = "fixed-1.8V"; | ||
| + regulator-min-microvolt = <1800000>; | ||
| + regulator-max-microvolt = <1800000>; | ||
| + regulator-boot-on; | ||
| + regulator-always-on; | ||
| + }; | ||
| + | ||
| + reg_3p3v: regulator-3p3v { | ||
| + compatible = "regulator-fixed"; | ||
| + regulator-name = "fixed-3.3V"; | ||
| + regulator-min-microvolt = <3300000>; | ||
| + regulator-max-microvolt = <3300000>; | ||
| + regulator-boot-on; | ||
| + regulator-always-on; | ||
| + }; | ||
| + | ||
| + keys { | ||
| + compatible = "gpio-keys"; | ||
| + | ||
| + wps { | ||
| + label = "reset"; | ||
| + gpios = <&gpio 9 GPIO_ACTIVE_LOW>; | ||
| + linux,code = <KEY_RESTART>; | ||
| + }; | ||
| + }; | ||
| + | ||
| + leds { | ||
| + compatible = "gpio-leds"; | ||
| + | ||
| + led_status_blue: green { | ||
| + label = "blue:status"; | ||
| + gpios = <&gpio 28 GPIO_ACTIVE_LOW>; | ||
| + }; | ||
| + | ||
| + led_status_white: blue { | ||
| + label = "white:status"; | ||
| + gpios = <&gpio 27 GPIO_ACTIVE_LOW>; | ||
| + }; | ||
| + }; | ||
| + | ||
| +}; | ||
| + | ||
| +&uart0 { | ||
| + mediatek,force-highspeed; | ||
| + status = "okay"; | ||
| +}; | ||
| + | ||
| +ð { | ||
| + status = "okay"; | ||
| + mediatek,gmac-id = <0>; | ||
| + phy-mode = "2500base-x"; | ||
| + mediatek,switch = "mt7531"; | ||
| + reset-gpios = <&gpio 18 GPIO_ACTIVE_HIGH>; | ||
| + | ||
| + fixed-link { | ||
| + speed = <2500>; | ||
| + full-duplex; | ||
| + }; | ||
| +}; | ||
| + | ||
| +&pinctrl { | ||
| + mmc0_pins_default: mmc0default { | ||
| + mux { | ||
| + function = "flash"; | ||
| + groups = "emmc_51"; | ||
| + }; | ||
| + | ||
| + conf-cmd-dat { | ||
| + pins = "EMMC_DATA_0", "EMMC_DATA_1", "EMMC_DATA_2", | ||
| + "EMMC_DATA_3", "EMMC_DATA_4", "EMMC_DATA_5", | ||
| + "EMMC_DATA_6", "EMMC_DATA_7", "EMMC_CMD"; | ||
| + input-enable; | ||
| + drive-strength = <MTK_DRIVE_4mA>; | ||
| + bias-pull-up = <MTK_PUPD_SET_R1R0_01>; | ||
| + }; | ||
| + | ||
| + conf-clk { | ||
| + pins = "EMMC_CK"; | ||
| + drive-strength = <MTK_DRIVE_6mA>; | ||
| + bias-pull-down = <MTK_PUPD_SET_R1R0_10>; | ||
| + }; | ||
| + | ||
| + conf-dsl { | ||
| + pins = "EMMC_DSL"; | ||
| + bias-pull-down = <MTK_PUPD_SET_R1R0_10>; | ||
| + }; | ||
| + | ||
| + conf-rst { | ||
| + pins = "EMMC_RSTB"; | ||
| + drive-strength = <MTK_DRIVE_4mA>; | ||
| + bias-pull-up = <MTK_PUPD_SET_R1R0_01>; | ||
| + }; | ||
| + }; | ||
| +}; | ||
| + | ||
| +&mmc0 { | ||
| + pinctrl-names = "default"; | ||
| + pinctrl-0 = <&mmc0_pins_default>; | ||
| + bus-width = <8>; | ||
| + max-frequency = <200000000>; | ||
| + cap-mmc-highspeed; | ||
| + cap-mmc-hw-reset; | ||
| + vmmc-supply = <®_3p3v>; | ||
| + vqmmc-supply = <®_1p8v>; | ||
| + non-removable; | ||
| + status = "okay"; | ||
| +}; | ||
| + | ||
| +&wmcpu_emi { | ||
| + status = "disabled"; | ||
| +}; | ||
| --- /dev/null | ||
| +++ b/configs/mt7986a_glinet_gl-mt6000_defconfig | ||
| @@ -0,0 +1,105 @@ | ||
| +CONFIG_ARM=y | ||
| +CONFIG_SYS_HAS_NONCACHED_MEMORY=y | ||
| +CONFIG_POSITION_INDEPENDENT=y | ||
| +CONFIG_ARCH_MEDIATEK=y | ||
| +CONFIG_TEXT_BASE=0x41e00000 | ||
| +CONFIG_SYS_MALLOC_F_LEN=0x4000 | ||
| +CONFIG_NR_DRAM_BANKS=1 | ||
| +CONFIG_ENV_SIZE=0x80000 | ||
| +CONFIG_ENV_OFFSET=0x400000 | ||
| +CONFIG_DEFAULT_DEVICE_TREE="mt7986a-glinet-gl-mt6000" | ||
| +CONFIG_SYS_PROMPT="MT7986> " | ||
| +CONFIG_OF_LIBFDT_OVERLAY=y | ||
| +CONFIG_TARGET_MT7986=y | ||
| +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 | ||
| +CONFIG_DEBUG_UART_BASE=0x11002000 | ||
| +CONFIG_DEBUG_UART_CLOCK=40000000 | ||
| +CONFIG_SYS_LOAD_ADDR=0x46000000 | ||
| +CONFIG_DEBUG_UART=y | ||
| +CONFIG_AHCI=y | ||
| +CONFIG_FIT=y | ||
| +CONFIG_AUTOBOOT_KEYED=y | ||
| +CONFIG_AUTOBOOT_MENU_SHOW=y | ||
| +CONFIG_DEFAULT_FDT_FILE="mediatek/mt7986a-glinet-gl-mt6000.dtb" | ||
| +CONFIG_LOGLEVEL=7 | ||
| +CONFIG_PRE_CONSOLE_BUFFER=y | ||
| +CONFIG_LOG=y | ||
| +CONFIG_BOARD_LATE_INIT=y | ||
| +CONFIG_HUSH_PARSER=y | ||
| +CONFIG_CMD_CPU=y | ||
| +CONFIG_CMD_LICENSE=y | ||
| +CONFIG_CMD_BOOTMENU=y | ||
| +CONFIG_CMD_ASKENV=y | ||
| +CONFIG_CMD_ERASEENV=y | ||
| +CONFIG_CMD_ENV_FLAGS=y | ||
| +CONFIG_CMD_STRINGS=y | ||
| +CONFIG_CMD_DM=y | ||
| +CONFIG_CMD_GPIO=y | ||
| +CONFIG_CMD_PWM=y | ||
| +CONFIG_CMD_GPT=y | ||
| +CONFIG_CMD_MMC=y | ||
| +CONFIG_CMD_PART=y | ||
| +CONFIG_CMD_USB=y | ||
| +CONFIG_CMD_DHCP=y | ||
| +CONFIG_CMD_TFTPSRV=y | ||
| +CONFIG_CMD_RARP=y | ||
| +CONFIG_CMD_PING=y | ||
| +CONFIG_CMD_CDP=y | ||
| +CONFIG_CMD_SNTP=y | ||
| +CONFIG_CMD_DNS=y | ||
| +CONFIG_CMD_LINK_LOCAL=y | ||
| +CONFIG_CMD_CACHE=y | ||
| +CONFIG_CMD_PSTORE=y | ||
| +CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000 | ||
| +CONFIG_CMD_UUID=y | ||
| +CONFIG_CMD_HASH=y | ||
| +CONFIG_CMD_SMC=y | ||
| +CONFIG_OF_EMBED=y | ||
| +CONFIG_ENV_OVERWRITE=y | ||
| +CONFIG_ENV_IS_IN_MMC=y | ||
| +CONFIG_SYS_RELOC_GD_ENV_ADDR=y | ||
| +CONFIG_USE_DEFAULT_ENV_FILE=y | ||
| +CONFIG_DEFAULT_ENV_FILE="glinet_gl-mt6000_env" | ||
| +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y | ||
| +CONFIG_VERSION_VARIABLE=y | ||
| +CONFIG_NET_RANDOM_ETHADDR=y | ||
| +CONFIG_NETCONSOLE=y | ||
| +CONFIG_USE_IPADDR=y | ||
| +CONFIG_IPADDR="192.168.1.1" | ||
| +CONFIG_USE_SERVERIP=y | ||
| +CONFIG_SERVERIP="192.168.1.254" | ||
| +CONFIG_REGMAP=y | ||
| +CONFIG_SYSCON=y | ||
| +CONFIG_BUTTON=y | ||
| +CONFIG_BUTTON_GPIO=y | ||
| +CONFIG_CLK=y | ||
| +CONFIG_GPIO_HOG=y | ||
| +CONFIG_LED=y | ||
| +CONFIG_LED_BLINK=y | ||
| +CONFIG_LED_GPIO=y | ||
| +CONFIG_SUPPORT_EMMC_BOOT=y | ||
| +CONFIG_MMC_HS200_SUPPORT=y | ||
| +CONFIG_MMC_MTK=y | ||
| +CONFIG_PHY_FIXED=y | ||
| +CONFIG_MEDIATEK_ETH=y | ||
| +CONFIG_PHY=y | ||
| +CONFIG_PHY_MTK_TPHY=y | ||
| +CONFIG_PINCTRL=y | ||
| +CONFIG_PINCONF=y | ||
| +CONFIG_PINCTRL_MT7986=y | ||
| +CONFIG_POWER_DOMAIN=y | ||
| +CONFIG_MTK_POWER_DOMAIN=y | ||
| +CONFIG_DM_REGULATOR=y | ||
| +CONFIG_DM_REGULATOR_FIXED=y | ||
| +CONFIG_DM_REGULATOR_GPIO=y | ||
| +CONFIG_DM_PWM=y | ||
| +CONFIG_PWM_MTK=y | ||
| +CONFIG_RAM=y | ||
| +CONFIG_DM_SERIAL=y | ||
| +CONFIG_MTK_SERIAL=y | ||
| +CONFIG_USB=y | ||
| +CONFIG_USB_XHCI_HCD=y | ||
| +CONFIG_USB_XHCI_MTK=y | ||
| +CONFIG_USB_STORAGE=y | ||
| +CONFIG_HEXDUMP=y | ||
| +CONFIG_LMB_MAX_REGIONS=64 | ||
| --- /dev/null | ||
| +++ b/glinet_gl-mt6000_env | ||
| @@ -0,0 +1,25 @@ | ||
| +ipaddr=192.168.1.1 | ||
| +serverip=192.168.1.254 | ||
| +loadaddr=0x46000000 | ||
| +bootdelay=3 | ||
| +bootfile_bl2=openwrt-mediatek-filogic-glinet_gl-mt6000-preloader.bin | ||
| +bootfile_fip=openwrt-mediatek-filogic-glinet_gl-mt6000-bl31-uboot.fip | ||
| +bootfile_firmware=openwrt-mediatek-filogic-glinet_gl-mt6000-squashfs-factory.bin | ||
| +bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60 | ||
| +bootmenu_title= *** U-Boot Boot Menu for GL-iNet GL-MT6000 *** | ||
| +bootmenu_0=Startup system (Default).=run boot_system | ||
| +bootmenu_1=Load Firmware via TFTP then write to eMMC.=run boot_tftp_firmware ; run bootmenu_confirm_return | ||
| +bootmenu_2=Load BL31+U-Boot FIP via TFTP then write to eMMC.=run boot_tftp_write_fip ; run bootmenu_confirm_return | ||
| +bootmenu_3=Load BL2 preloader via TFTP then write to eMMC.=run boot_tftp_write_bl2 ; run bootmenu_confirm_return | ||
| +bootmenu_4=Reboot.=reset | ||
| +bootmenu_5=Reset all settings to factory defaults.=run reset_factory ; reset | ||
| +filesize_to_blk=setexpr cnt $filesize + 0x1ff && setexpr cnt $cnt / 0x200 | ||
| +mmc_read_kernel=mmc read $loadaddr $part_addr 0x100 && imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc read $loadaddr $part_addr $image_size | ||
| +boot_system=part start mmc 0 kernel part_addr && part size mmc 0 kernel part_size && run mmc_read_kernel && bootm | ||
| +boot_tftp_firmware=tftpboot $loadaddr $bootfile_firmware && run emmc_write_firmware | ||
| +boot_tftp_write_fip=tftpboot $loadaddr $bootfile_fip && run emmc_write_fip | ||
| +boot_tftp_write_bl2=tftpboot $loadaddr $bootfile_bl2 && run emmc_write_bl2 | ||
| +emmc_write_firmware=part start mmc 0 kernel part_addr && run filesize_to_blk && mmc write $loadaddr $part_addr $cnt | ||
| +emmc_write_bl2=run filesize_to_blk && test 0x$cnt -le 0x800 && mmc partconf 0 1 1 1 && && mmc write $loadaddr 0x0 0x800 ; mmc partconf 0 1 1 0 | ||
| +emmc_write_fip=part start mmc 0 fip part_addr && part size mmc 0 fip part_size && run filesize_to_blk && test 0x$cnt -le 0x$part_size && mmc write $loadaddr $part_addr $cnt | ||
| +reset_factory=eraseenv && reset |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.