Shiji YangandDaniel Golle
b6ecbb0374
Remove upstreamed patches: 001-pinctrl-mediatek-MT7981-fix-GPIO9-register-map.patch [1] 010-clk-mediatek-mt7622-fix-infracfg-and-pericfg-clock-o.patch [2] We also need to backport two new patches from v2026.07-rc2 to address the yaml build error[3] and MT7621 boot issue[4]. [1] https://github.com/u-boot/u-boot/commit/a1d1fc8d8c8699d80e1b9ab3214752e5882d3740 [2] https://github.com/u-boot/u-boot/commit/52d84fccfd7d8b99e91a70192eec8e0379d63b4b [3] https://github.com/u-boot/u-boot/commit/8ef8dee4f3a2b2021decfefd853dbd2a1632b77f [4] https://github.com/u-boot/u-boot/commit/de79075f0f6b8795d1f9e30ff36435583b1a119a Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
109 lines
2.8 KiB
Diff
109 lines
2.8 KiB
Diff
--- a/configs/mt7981_rfb_defconfig
|
|
+++ b/configs/mt7981_rfb_defconfig
|
|
@@ -30,6 +30,9 @@ CONFIG_CMD_MTD=y
|
|
CONFIG_CMD_SF_TEST=y
|
|
CONFIG_CMD_PING=y
|
|
CONFIG_CMD_SMC=y
|
|
+CONFIG_CMD_UBI=y
|
|
+CONFIG_CMD_UBI_RENAME=y
|
|
+CONFIG_ENV_OVERWRITE=y
|
|
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
|
CONFIG_NET_RANDOM_ETHADDR=y
|
|
CONFIG_CLK=y
|
|
--- a/configs/mt7981_snfi_nand_rfb_defconfig
|
|
+++ b/configs/mt7981_snfi_nand_rfb_defconfig
|
|
@@ -5,7 +5,6 @@ CONFIG_ARCH_MEDIATEK=y
|
|
CONFIG_TEXT_BASE=0x41e00000
|
|
CONFIG_SYS_MALLOC_F_LEN=0x4000
|
|
CONFIG_NR_DRAM_BANKS=1
|
|
-CONFIG_ENV_SIZE=0x20000
|
|
CONFIG_DEFAULT_DEVICE_TREE="mt7981-snfi-nand-rfb"
|
|
# CONFIG_BOARD_INIT is not set
|
|
CONFIG_SYS_PROMPT="MT7981> "
|
|
@@ -31,8 +30,6 @@ CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_MTD=y
|
|
CONFIG_CMD_PING=y
|
|
CONFIG_CMD_SMC=y
|
|
-CONFIG_MTDIDS_DEFAULT="spi-nand0=spi-nand0"
|
|
-CONFIG_MTDPARTS_DEFAULT="spi-nand0:1024k(bl2),512k(u-boot-env),2048k(factory),2048k(fip),65536k(ubi)"
|
|
CONFIG_CMD_UBI=y
|
|
CONFIG_CMD_UBI_RENAME=y
|
|
CONFIG_ENV_OVERWRITE=y
|
|
@@ -56,3 +53,4 @@ CONFIG_MTK_POWER_DOMAIN=y
|
|
CONFIG_DM_SERIAL=y
|
|
CONFIG_MTK_SERIAL=y
|
|
CONFIG_HEXDUMP=y
|
|
+CONFIG_LMB_MAX_REGIONS=64
|
|
--- /dev/null
|
|
+++ b/configs/mt7981_nor_rfb_defconfig
|
|
@@ -0,0 +1,69 @@
|
|
+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_DEFAULT_DEVICE_TREE="mt7981-rfb"
|
|
+# CONFIG_BOARD_INIT is not set
|
|
+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_AUTOBOOT is not set
|
|
+CONFIG_DEFAULT_FDT_FILE="mt7981-rfb"
|
|
+CONFIG_LOGLEVEL=7
|
|
+CONFIG_LOG=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_UNLZ4 is not set
|
|
+# CONFIG_CMD_UNZIP is not set
|
|
+CONFIG_CMD_GPIO=y
|
|
+CONFIG_CMD_MTD=y
|
|
+CONFIG_CMD_SF_TEST=y
|
|
+CONFIG_CMD_PING=y
|
|
+CONFIG_CMD_SMC=y
|
|
+CONFIG_ENV_OVERWRITE=y
|
|
+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
|
+CONFIG_NET_RANDOM_ETHADDR=y
|
|
+CONFIG_REGMAP=y
|
|
+CONFIG_SYSCON=y
|
|
+CONFIG_CLK=y
|
|
+# CONFIG_MMC is not set
|
|
+CONFIG_MTD=y
|
|
+CONFIG_DM_MTD=y
|
|
+CONFIG_MTD_SPI_NAND=y
|
|
+CONFIG_DM_SPI_FLASH=y
|
|
+CONFIG_SPI_FLASH_SFDP_SUPPORT=y
|
|
+CONFIG_SPI_FLASH_EON=y
|
|
+CONFIG_SPI_FLASH_GIGADEVICE=y
|
|
+CONFIG_SPI_FLASH_ISSI=y
|
|
+CONFIG_SPI_FLASH_MACRONIX=y
|
|
+CONFIG_SPI_FLASH_SPANSION=y
|
|
+CONFIG_SPI_FLASH_STMICRO=y
|
|
+CONFIG_SPI_FLASH_WINBOND=y
|
|
+CONFIG_SPI_FLASH_XMC=y
|
|
+CONFIG_SPI_FLASH_XTX=y
|
|
+CONFIG_SPI_FLASH_MTD=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_SERIAL=y
|
|
+CONFIG_MTK_SERIAL=y
|
|
+CONFIG_SPI=y
|
|
+CONFIG_DM_SPI=y
|
|
+CONFIG_MTK_SPIM=y
|
|
+CONFIG_HEXDUMP=y
|
|
+CONFIG_LMB_MAX_REGIONS=64
|