diff --git a/atf-20220606-637ba581b/configs/gl_mt3000_defconfig b/atf-20220606-637ba581b/configs/mt7981_glinet_gl-mt3000_defconfig similarity index 77% rename from atf-20220606-637ba581b/configs/gl_mt3000_defconfig rename to atf-20220606-637ba581b/configs/mt7981_glinet_gl-mt3000_defconfig index 6f246fbb5..880de25cf 100644 --- a/atf-20220606-637ba581b/configs/gl_mt3000_defconfig +++ b/atf-20220606-637ba581b/configs/mt7981_glinet_gl-mt3000_defconfig @@ -1,5 +1,5 @@ CONFIG_PLAT_MT7981=y -CONFIG_TARGET_ALL_NO_SEC_BOOT=y +CONFIG_TARGET_FIP_NO_SEC_BOOT=y CONFIG_FLASH_DEVICE_SPIM_NAND=y CONFIG_BGA=y CONFIG_LOG_LEVEL_NONE=y diff --git a/uboot-mtk-20220606/arch/arm/dts/mt7981-glinet-gl-mt3000.dts b/uboot-mtk-20220606/arch/arm/dts/mt7981-glinet-gl-mt3000.dts new file mode 100644 index 000000000..ba8f7b8a1 --- /dev/null +++ b/uboot-mtk-20220606/arch/arm/dts/mt7981-glinet-gl-mt3000.dts @@ -0,0 +1,115 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2021 MediaTek Inc. + * Author: Sam Shih + */ + +/dts-v1/; +#include "mt7981.dtsi" +#include + +/ { + #address-cells = <1>; + #size-cells = <1>; + model = "mt7981-glinet_gl-mt3000"; + compatible = "mediatek,mt7981", "mediatek,mt7981-rfb"; + chosen { + stdout-path = &uart0; + tick-timer = &timer0; + }; + + config { + bootcmd = "mtkboardboot"; + blink_led = "blue:run"; + system_led = "white:system"; + gpio_power_clr = <12>; + }; + + gpio-keys { + compatible = "gpio-keys"; + + button-reset { + label = "reset"; + gpios = <&gpio 1 GPIO_ACTIVE_LOW>; + }; + }; + + gpio-leds { + compatible = "gpio-leds"; + + led-0 { + label = "white:system"; + gpios = <&gpio 30 GPIO_ACTIVE_LOW>; + }; + + led-1 { + label = "blue:run"; + gpios = <&gpio 31 GPIO_ACTIVE_LOW>; + }; + }; +}; + +ð { + status = "okay"; + mediatek,gmac-id = <1>; + phy-mode = "gmii"; + phy-handle = <&phy0>; + + mdio { + phy0: ethernet-phy@0 { + compatible = "ethernet-phy-id03a2.9461"; + reg = <0x0>; + phy-mode = "gmii"; + }; + }; +}; + +&pinctrl { + spi_flash_pins: spi0-pins-func-1 { + mux { + function = "flash"; + groups = "spi0", "spi0_wp_hold"; + }; + + conf-pu { + pins = "SPI0_CS", "SPI0_HOLD", "SPI0_WP"; + drive-strength = ; + bias-pull-up = ; + }; + + conf-pd { + pins = "SPI0_CLK", "SPI0_MOSI", "SPI0_MISO"; + drive-strength = ; + bias-pull-down = ; + }; + }; +}; + +&spi0 { + #address-cells = <1>; + #size-cells = <0>; + pinctrl-names = "default"; + pinctrl-0 = <&spi_flash_pins>; + status = "okay"; + must_tx; + enhance_timing; + dma_ext; + ipm_design; + support_quad; + tick_dly = <2>; + sample_sel = <0>; + + spi_nand@0 { + compatible = "spi-nand"; + reg = <0>; + spi-max-frequency = <52000000>; + }; +}; + +&uart0 { + status = "okay"; +}; + +&watchdog { + status = "disabled"; +}; diff --git a/uboot-mtk-20220606/configs/gl_mt3000_defconfig b/uboot-mtk-20220606/configs/mt7981_glinet_gl-mt3000_defconfig similarity index 78% rename from uboot-mtk-20220606/configs/gl_mt3000_defconfig rename to uboot-mtk-20220606/configs/mt7981_glinet_gl-mt3000_defconfig index 40fcc4539..c0bd5456d 100644 --- a/uboot-mtk-20220606/configs/gl_mt3000_defconfig +++ b/uboot-mtk-20220606/configs/mt7981_glinet_gl-mt3000_defconfig @@ -6,30 +6,50 @@ CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0x100000 -CONFIG_DEFAULT_DEVICE_TREE="gl-mt3000" +CONFIG_DEFAULT_DEVICE_TREE="mt7981-glinet-gl-mt3000" CONFIG_TARGET_MT7981=y CONFIG_ENABLE_NAND_NMBM=y CONFIG_NMBM_MAX_BLOCKS=32 CONFIG_MEDIATEK_BOOTMENU=y +CONFIG_MEDIATEK_BOOTMENU_DELAY=3 CONFIG_MEDIATEK_LOAD_FROM_RAM=y CONFIG_MT7981_BOOTMENU_UBI=y CONFIG_DEBUG_UART_BASE=0x11002000 CONFIG_DEBUG_UART_CLOCK=40000000 -CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x46000000 -CONFIG_FIT=y -CONFIG_DEFAULT_FDT_FILE="gl-mt3000" +CONFIG_DEBUG_UART=y +CONFIG_BOOTDELAY=3 +CONFIG_AUTOBOOT_MENU_SHOW=y +CONFIG_AUTOBOOT_MENU_MTK_SHOW=y +CONFIG_DEFAULT_FDT_FILE="mt7981-glinet-gl-mt3000" CONFIG_LOGLEVEL=7 CONFIG_LOG=y +CONFIG_POLLER=y +CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="MT7981> " +# CONFIG_BOOTM_NETBSD is not set +# CONFIG_BOOTM_PLAN9 is not set +# CONFIG_BOOTM_RTEMS is not set +# CONFIG_BOOTM_VXWORKS is not set +CONFIG_CMD_MEMINFO=y +# CONFIG_CMD_UNLZ4 is not set +# CONFIG_CMD_UNZIP is not set +# CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y +CONFIG_CMD_GPIO_READ=y CONFIG_CMD_MTD=y +# CONFIG_CMD_NAND_EXT is not set CONFIG_CMD_NMBM=y -CONFIG_CMD_SF_TEST=y +CONFIG_CMD_TFTPPUT=y +# CONFIG_CMD_NFS is not set CONFIG_CMD_PING=y +CONFIG_CMD_LED_BLINK=y CONFIG_CMD_SMC=y +CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nmbm0=nmbm0" -CONFIG_MTDPARTS_DEFAULT="nmbm0:1024k(bl2),512k(u-boot-env),2048k(factory),2048k(fip),256k(log),-(ubi)" +CONFIG_MTDPARTS_DEFAULT="nmbm0:1024k(bl2),512k(u-boot-env),2048k(factory),2048k(fip),256k(log),252160k(ubi)" +CONFIG_CMD_UBI=y +CONFIG_CMD_GL_BTN=y CONFIG_OF_EMBED=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MTD=y @@ -39,7 +59,14 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_REGMAP=y CONFIG_SYSCON=y +CONFIG_BUTTON=y +CONFIG_BUTTON_GPIO=y CONFIG_CLK=y +# CONFIG_I2C is not set +# CONFIG_INPUT is not set +CONFIG_LED=y +CONFIG_LED_BLINK=y +CONFIG_LED_GPIO=y # CONFIG_MMC is not set CONFIG_DM_MTD=y CONFIG_MTD_SPI_NAND=y @@ -59,36 +86,6 @@ CONFIG_DM_SPI=y CONFIG_MTK_SPIM=y CONFIG_TIMER=y CONFIG_MTK_TIMER=y -CONFIG_LZO=y CONFIG_HEXDUMP=y CONFIG_WEBUI_FAILSAFE=y -CONFIG_BUTTON=y -CONFIG_BUTTON_GPIO=y -CONFIG_LED=y -CONFIG_LED_GPIO=y -CONFIG_LED_BLINK=y -# CMD_CONSOLE is not set -# CONFIG_BOOTM_NETBSD is not set -# CONFIG_BOOTM_PLAN9 is not set -# CONFIG_BOOTM_RTEMS is not set -# CONFIG_BOOTM_VXWORKS is not set -# CONFIG_CMD_BOOTEFI is not set -# CONFIG_CMD_FDT is not set -# CONFIG_CMD_UNLZ4 is not set -# CONFIG_CMD_UNZIP is not set -# CONFIG_CMD_FLASH is not set -# CONFIG_CMD_NAND_EXT is not set -# CONFIG_CMD_SF is not set -# CONFIG_CMD_NFS is not set -# CONFIG_INPUT is not set -CONFIG_AUTOBOOT_KEYED=y -CONFIG_AUTOBOOT_PROMPT="Enter \"gl\" to stop autoboot in %d seconds\n" -CONFIG_AUTOBOOT_STOP_STR="gl" -CONFIG_POLLER=y -CONFIG_ENV_VARS_UBOOT_CONFIG=y -CONFIG_ENV_IMPORT_FDT=y -CONFIG_CMD_GL_BTN=y -CONFIG_CMD_LED_BLINK=y -CONFIG_HUSH_PARSER=y -CONFIG_ARP_TIMEOUT=1000 -CONFIG_NET_RETRY_COUNT=3 +CONFIG_WEBUI_FAILSAFE_ON_AUTOBOOT_FAIL=y diff --git a/uboot-mtk-20220606/arch/arm/dts/gl-mt3000.dts b/uboot-mtk-20230718-09eda825/arch/arm/dts/mt7981-glinet-gl-mt3000.dts similarity index 85% rename from uboot-mtk-20220606/arch/arm/dts/gl-mt3000.dts rename to uboot-mtk-20230718-09eda825/arch/arm/dts/mt7981-glinet-gl-mt3000.dts index 4d633e456..5c8104693 100644 --- a/uboot-mtk-20220606/arch/arm/dts/gl-mt3000.dts +++ b/uboot-mtk-20230718-09eda825/arch/arm/dts/mt7981-glinet-gl-mt3000.dts @@ -11,7 +11,7 @@ / { #address-cells = <1>; #size-cells = <1>; - model = "mt7981-rfb"; + model = "mt7981-glinet_gl-mt3000"; compatible = "mediatek,mt7981", "mediatek,mt7981-rfb"; chosen { stdout-path = &uart0; @@ -20,43 +20,43 @@ config { bootcmd = "mtkboardboot"; - blink_led = "blue:run"; system_led = "white:system"; gpio_power_clr = <12>; - - environment { - lu = "mtkupgrade fip uboot-gl-mt3000.bin"; - lf = "mtkupgrade fw openwrt-gl-mt3000.bin"; - }; }; - gpio-keys-polled { + gpio-keys { compatible = "gpio-keys"; - power-button { + button-reset { label = "reset"; + linux,code = ; gpios = <&gpio 1 GPIO_ACTIVE_LOW>; }; }; - leds { + gpio-leds { compatible = "gpio-leds"; - led@0 { + led-0 { label = "white:system"; gpios = <&gpio 30 GPIO_ACTIVE_LOW>; }; - led@1 { + led-1 { label = "blue:run"; gpios = <&gpio 31 GPIO_ACTIVE_LOW>; }; }; -}; -&uart0 { - status = "okay"; + memory@40000000 { + device_type = "memory"; + reg = <0x40000000 0x20000000>; + }; + + bl2_verify { + bl2_compatible = "spim-nand"; + }; }; ð { @@ -93,13 +93,6 @@ bias-pull-down = ; }; }; - - spic_pins: spi1-pins-func-1 { - mux { - function = "spi"; - groups = "spi1_1"; - }; - }; }; &spi0 { @@ -122,3 +115,11 @@ spi-max-frequency = <52000000>; }; }; + +&uart0 { + status = "okay"; +}; + +&watchdog { + status = "disabled"; +}; diff --git a/uboot-mtk-20230718-09eda825/configs/mt7981_glinet_gl-mt3000_defconfig b/uboot-mtk-20230718-09eda825/configs/mt7981_glinet_gl-mt3000_defconfig new file mode 100644 index 000000000..9027fa0cb --- /dev/null +++ b/uboot-mtk-20230718-09eda825/configs/mt7981_glinet_gl-mt3000_defconfig @@ -0,0 +1,101 @@ +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=0x20000 +CONFIG_ENV_OFFSET=0x0 +CONFIG_DEFAULT_DEVICE_TREE="mt7981-glinet-gl-mt3000" +CONFIG_SYS_PROMPT="MT7981> " +CONFIG_TARGET_MT7981=y +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=40000000 +CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_DEBUG_UART=y +CONFIG_MEDIATEK_BOOTMENU=y +CONFIG_MEDIATEK_BOOTMENU_DELAY=3 +CONFIG_MTK_WEB_FAILSAFE=y +CONFIG_MTK_WEB_FAILSAFE_AFTER_BOOT_FAILURE=y +CONFIG_MTK_UBI_SUPPORT=y +CONFIG_MTK_UPGRADE_BL2_VERIFY=y +# CONFIG_MTK_UPGRADE_IMAGE_VERIFY is not set +CONFIG_ENABLE_NAND_NMBM=y +CONFIG_NMBM_MAX_BLOCKS=32 +CONFIG_FIT=y +CONFIG_AUTOBOOT_MENU_SHOW=y +CONFIG_AUTOBOOT_MENU_MTK_SHOW=y +CONFIG_DEFAULT_FDT_FILE="mt7981-spim-nand-rfb" +CONFIG_LOGLEVEL=7 +CONFIG_LOG=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_CBSIZE=512 +CONFIG_SYS_PBSIZE=1049 +# CONFIG_BOOTM_NETBSD is not set +# CONFIG_BOOTM_PLAN9 is not set +# CONFIG_BOOTM_RTEMS is not set +# CONFIG_BOOTM_VXWORKS is not set +# CONFIG_CMD_ELF is not set +CONFIG_CMD_MEMINFO=y +# CONFIG_CMD_UNLZ4 is not set +# CONFIG_CMD_UNZIP is not set +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_GPIO=y +CONFIG_CMD_GPIO_READ=y +CONFIG_CMD_PWM=y +CONFIG_CMD_MTD=y +CONFIG_CMD_NMBM=y +CONFIG_CMD_TFTPPUT=y +CONFIG_CMD_PING=y +CONFIG_CMD_SMC=y +CONFIG_CMD_MTDPARTS=y +CONFIG_MTDIDS_DEFAULT="nmbm0=nmbm0" +CONFIG_MTDPARTS_DEFAULT="nmbm0:1024k(bl2),512k(u-boot-env),2048k(factory),2048k(fip),256k(log),252160k(ubi)" +CONFIG_CMD_GL_BTN=y +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_MTD=y +CONFIG_ENV_MTD_NAME="u-boot-env" +CONFIG_ENV_SIZE_REDUND=0x80000 +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_NETMASK=y +CONFIG_NETMASK="255.255.255.0" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.2" +CONFIG_PROT_TCP=y +CONFIG_REGMAP=y +CONFIG_SYSCON=y +CONFIG_BUTTON=y +CONFIG_BUTTON_GPIO=y +CONFIG_CLK=y +# CONFIG_I2C is not set +CONFIG_LED=y +CONFIG_LED_BLINK=y +CONFIG_LED_GPIO=y +# CONFIG_MMC is not set +CONFIG_DM_MTD=y +CONFIG_MTD_SPI_NAND=y +CONFIG_PHY_FIXED=y +CONFIG_MEDIATEK_ETH=y +CONFIG_PINCTRL=y +CONFIG_PINCONF=y +CONFIG_PINCTRL_MT7981=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_DM_SERIAL=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y +CONFIG_MTK_SPIM=y +CONFIG_TIMER=y +CONFIG_MTK_TIMER=y +CONFIG_HEXDUMP=y