mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-12-12 07:32:10 -05:00
011ba05fd3
The most relevant change is the removal of the empty board_init() functions by u-boot/u-boot@70a4d1fa1d, which makes many patches not apply anymore and also requires most board defconfigs to be updated by adding "# CONFIG_BOARD_INIT is not set" to them. Also some config symbols have been renamed and downstream boards had to be adapted accordingly: u-boot/u-boot@0fd9a3480a ("env: Rename OVERWRITE_ETHADDR_ONCE to ENV_OVERWRITE_ETHADDR_ONCE") u-boot/u-boot@5fb88fa725 ("env: Rename SYS_REDUNDAND_ENVIRONMENT to ENV_REDUNDANT") u-boot/u-boot@123682c765 ("env: Rename SYS_RELOC_GD_ENV_ADDR to ENV_RELOC_GD_ENV_ADDR") u-boot/u-boot@0f44d5549e ("env: Rename SYS_MMC_ENV_DEV to ENV_MMC_DEVICE_INDEX") u-boot/u-boot@31617b880a ("env: Rename SYS_MMC_ENV_PART to ENV_MMC_EMMC_HW_PARTITION") u-boot/u-boot@ffc4914703 ("env: Rename ENV_MMC_PARTITION to ENV_MMC_SW_PARTITION") u-boot/u-boot@fb5235239a ("env: Rename DEFAULT_ENV_FILE to ENV_DEFAULT_ENV_TEXT_FILE") (also renamed USE_DEFAULT_ENV_FILE to USE_ENV_DEFAULT_ENV_TEXT_FILE) Remove upstreamed patches: * 001-mtd-spinand-winbond-add-Winbond-W25N04KV-flash-suppo.patch u-boot/u-boot@fe37fb8214 * 002-mtd-spinand-gigadevice-sync-supported-chips-with-lin.patch u-boot/u-boot@506ceddffd * 003-net-mediatek-correct-the-AN8855-TPID-value-in-port-i.patch u-boot/u-boot@70db2be9fb * 004-01-serial-mediatek-fix-register-names-and-offsets.patch u-boot/u-boot@6e15d3f91a * 004-02-serial-mediatek-enable-baudrate-accuracy-compensatio.patch u-boot/u-boot@6952209ef2 * 005-clk-mediatek-add-dummy-clk-enable-disable-ops-for-ap.patch u-boot/u-boot@1bf2121297 * 006-env-Fix-possible-out-of-bound-access-in-env_do_env_s.patch u-boot/u-boot@0ffd456516 * 130-01-env-mtd-add-the-missing-put_mtd_device.patch u-boot/u-boot@39ae954b04 * 130-02-env-mtd-initialize-saved_buf-pointer.patch u-boot/u-boot@7e842bd331 * 170-cmd-bootmenu-permit-to-select-bootmenu-entry-with.patch u-boot/u-boot@8c986521c3 Signed-off-by: Daniel Golle <daniel@makrotopia.org>
109 lines
2.8 KiB
Diff
109 lines
2.8 KiB
Diff
--- a/configs/mt7981_rfb_defconfig
|
|
+++ b/configs/mt7981_rfb_defconfig
|
|
@@ -31,6 +31,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_REGMAP=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
|