diff --git a/atf-20220606-637ba581b/Makefile b/atf-20220606-637ba581b/Makefile index 983dfb65a..e4b139949 100644 --- a/atf-20220606-637ba581b/Makefile +++ b/atf-20220606-637ba581b/Makefile @@ -394,9 +394,9 @@ WARNINGS += -Wshift-overflow -Wshift-sign-overflow \ -Wlogical-op-parentheses endif -ifneq (${E},0) -ERRORS := -Werror -endif +#ifneq (${E},0) +#ERRORS := -Werror +#endif CPPFLAGS = ${DEFINES} ${INCLUDES} ${MBEDTLS_INC} -nostdinc \ $(ERRORS) $(WARNINGS) @@ -443,7 +443,7 @@ TF_LDFLAGS += $(subst --,-Xlinker --,$(TF_LDFLAGS_$(ARCH))) # LD = gcc-ld (ld) or llvm-ld (ld.lld) or other else -TF_LDFLAGS += --fatal-warnings -O1 +TF_LDFLAGS += -O1 TF_LDFLAGS += --gc-sections # ld.lld doesn't recognize the errata flags, # therefore don't add those in that case diff --git a/atf-20220606-637ba581b/configs/mt7981_360t7_defconfig b/atf-20220606-637ba581b/configs/mt7981_360t7_defconfig new file mode 100644 index 000000000..035050015 --- /dev/null +++ b/atf-20220606-637ba581b/configs/mt7981_360t7_defconfig @@ -0,0 +1,6 @@ +CONFIG_PLAT_MT7981=y +CONFIG_TARGET_ALL_NO_SEC_BOOT=y +CONFIG_FLASH_DEVICE_SPIM_NAND=y +CONFIG_BGA=y +CONFIG_LOG_LEVEL_INFO=y +CONFIG_DRAM_DEBUG_LOG=y diff --git a/uboot-mtk-20220606/arch/arm/dts/mt7981-360t7.dts b/uboot-mtk-20220606/arch/arm/dts/mt7981-360t7.dts new file mode 100644 index 000000000..cf819ef3f --- /dev/null +++ b/uboot-mtk-20220606/arch/arm/dts/mt7981-360t7.dts @@ -0,0 +1,101 @@ +// SPDX-License-Identifier: GPL-2.0 + +/dts-v1/; +#include "mt7981.dtsi" +#include + +/ { + #address-cells = <1>; + #size-cells = <1>; + model = "mt7981-360-t7"; + compatible = "mediatek,mt7981", "mediatek,mt7981-rfb"; + chosen { + stdout-path = &uart0; + tick-timer = &timer0; + }; + + config { + bootcmd = "mtkboardboot"; + }; + + gpio-keys-polled { + compatible = "gpio-keys"; + + power-button { + label = "reset"; + gpios = <&gpio 1 GPIO_ACTIVE_LOW>; + }; + }; + + leds { + compatible = "gpio-leds"; + + led@0 { + label = "blue:run"; /* green */ + gpios = <&gpio 7 GPIO_ACTIVE_LOW>; + }; + }; +}; + +&uart0 { + status = "okay"; +}; + +ð { + status = "okay"; + mediatek,gmac-id = <0>; + phy-mode = "sgmii"; + mediatek,switch = "mt7531"; + reset-gpios = <&gpio 39 GPIO_ACTIVE_HIGH>; + + fixed-link { + speed = <1000>; + full-duplex; + }; +}; + +&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>; + }; +}; + +&watchdog { + status = "disabled"; +}; diff --git a/uboot-mtk-20220606/cmd/glbtn.c b/uboot-mtk-20220606/cmd/glbtn.c index 12f838cab..2976f8ebd 100644 --- a/uboot-mtk-20220606/cmd/glbtn.c +++ b/uboot-mtk-20220606/cmd/glbtn.c @@ -20,7 +20,7 @@ static int do_glbtn(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[ ulong ts; run_command("ledblink blue:run 250", 0); - run_command("gpio clear 12", 0); + //run_command("gpio clear 12", 0); ret = button_get_by_label(button_label, &dev); if (ret) { printf("Button '%s' not found (err=%d)\n", button_label, ret); diff --git a/uboot-mtk-20220606/common/autoboot.c b/uboot-mtk-20220606/common/autoboot.c index cca8aeb3c..d916909cc 100644 --- a/uboot-mtk-20220606/common/autoboot.c +++ b/uboot-mtk-20220606/common/autoboot.c @@ -497,7 +497,7 @@ void autoboot_command(const char *s) bool lock; int prev; - try_auto_upgrade(); + //try_auto_upgrade(); lock = autoboot_keyed() && !IS_ENABLED(CONFIG_AUTOBOOT_KEYED_CTRLC); diff --git a/uboot-mtk-20220606/configs/mt7981_360t7_defconfig b/uboot-mtk-20220606/configs/mt7981_360t7_defconfig new file mode 100644 index 000000000..8289fed65 --- /dev/null +++ b/uboot-mtk-20220606/configs/mt7981_360t7_defconfig @@ -0,0 +1,89 @@ +CONFIG_ARM=y +CONFIG_POSITION_INDEPENDENT=y +CONFIG_ARCH_MEDIATEK=y +CONFIG_SYS_TEXT_BASE=0x41e00000 +CONFIG_SYS_MALLOC_F_LEN=0x4000 +CONFIG_NR_DRAM_BANKS=1 +CONFIG_ENV_SIZE=0x20000 +CONFIG_ENV_OFFSET=0x100000 +CONFIG_DEFAULT_DEVICE_TREE="mt7981-360t7" +CONFIG_TARGET_MT7981=y +CONFIG_ENABLE_NAND_NMBM=y +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_SYS_LOAD_ADDR=0x46000000 +CONFIG_DEBUG_UART=y +CONFIG_BOOTDELAY=0 +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_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_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),108M(ubi),1M(config),512k(factory),4M(log)" +CONFIG_CMD_UBI=y +CONFIG_CMD_GL_BTN=y +CONFIG_OF_EMBED=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_MTD=y +CONFIG_ENV_MTD_NAME="nmbm0" +CONFIG_ENV_SIZE_REDUND=0x80000 +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 +CONFIG_PHY_FIXED=y +CONFIG_DM_ETH=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_RAM=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 +CONFIG_WEBUI_FAILSAFE=y