1 --- a/configs/mt7981_emmc_rfb_defconfig
2 +++ b/configs/mt7981_emmc_rfb_defconfig
3 @@ -13,7 +13,22 @@ CONFIG_DEBUG_UART_BASE=0x11002000
4 CONFIG_DEBUG_UART_CLOCK=40000000
5 CONFIG_SYS_LOAD_ADDR=0x46000000
7 -# CONFIG_AUTOBOOT is not set
8 +CONFIG_OF_LIBFDT_OVERLAY=y
9 +CONFIG_SMBIOS_PRODUCT_NAME=""
10 +CONFIG_CFB_CONSOLE_ANSI=y
11 +CONFIG_BOARD_LATE_INIT=y
15 +CONFIG_CMD_ENV_FLAGS=y
17 +CONFIG_FIT_ENABLE_SHA256_SUPPORT=y
22 +CONFIG_BOOTSTD_DEFAULTS=y
23 +CONFIG_BOOTSTD_FULL=y
24 CONFIG_DEFAULT_FDT_FILE="mt7981-emmc-rfb"
27 @@ -24,9 +39,23 @@ CONFIG_SYS_PBSIZE=1049
28 # CONFIG_BOOTM_PLAN9 is not set
29 # CONFIG_BOOTM_RTEMS is not set
30 # CONFIG_BOOTM_VXWORKS is not set
31 -# CONFIG_CMD_ELF is not set
32 # CONFIG_CMD_UNLZ4 is not set
33 # CONFIG_CMD_UNZIP is not set
34 +CONFIG_CMD_BOOTMENU=y
45 +CONFIG_CMD_ENV_READMEM=y
46 +CONFIG_CMD_ERASEENV=y
51 CONFIG_CMD_GPT_RENAME=y
52 @@ -36,13 +65,35 @@ CONFIG_CMD_PART=y
56 +CONFIG_CMD_TFTPBOOT=y
67 CONFIG_CMD_FS_GENERIC=y
72 +CONFIG_CMD_LINK_LOCAL=y
74 +CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000
79 CONFIG_PARTITION_TYPE_GUID=y
80 CONFIG_ENV_OVERWRITE=y
81 CONFIG_ENV_IS_IN_MMC=y
82 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
83 CONFIG_NET_RANDOM_ETHADDR=y
88 --- a/configs/mt7981_rfb_defconfig
89 +++ b/configs/mt7981_rfb_defconfig
90 @@ -11,7 +11,23 @@ CONFIG_DEBUG_UART_BASE=0x11002000
91 CONFIG_DEBUG_UART_CLOCK=40000000
92 CONFIG_SYS_LOAD_ADDR=0x46000000
94 -# CONFIG_AUTOBOOT is not set
95 +CONFIG_OF_LIBFDT_OVERLAY=y
96 +CONFIG_SMBIOS_PRODUCT_NAME=""
97 +CONFIG_CFB_CONSOLE_ANSI=y
98 +CONFIG_BOARD_LATE_INIT=y
100 +CONFIG_BUTTON_GPIO=y
102 +CONFIG_CMD_ENV_FLAGS=y
104 +CONFIG_FIT_ENABLE_SHA256_SUPPORT=y
110 +CONFIG_BOOTSTD_DEFAULTS=y
111 +CONFIG_BOOTSTD_FULL=y
112 CONFIG_DEFAULT_FDT_FILE="mt7981-rfb"
115 @@ -22,23 +38,74 @@ CONFIG_SYS_PBSIZE=1049
116 # CONFIG_BOOTM_PLAN9 is not set
117 # CONFIG_BOOTM_RTEMS is not set
118 # CONFIG_BOOTM_VXWORKS is not set
119 -# CONFIG_CMD_ELF is not set
120 # CONFIG_CMD_UNLZ4 is not set
121 # CONFIG_CMD_UNZIP is not set
122 +CONFIG_CMD_BOOTMENU=y
133 +CONFIG_CMD_ENV_READMEM=y
134 +CONFIG_CMD_ERASEENV=y
136 +CONFIG_CMD_FS_GENERIC=y
137 +CONFIG_CMD_FS_UUID=y
140 -CONFIG_CMD_SF_TEST=y
144 +CONFIG_CMD_LICENSE=y
145 +CONFIG_CMD_LINK_LOCAL=y
148 +# CONFIG_MTD_RAW_NAND is not set
149 +CONFIG_CMD_NAND_TRIMFFS=y
152 +CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000
156 +CONFIG_CMD_SF_TEST=y
159 CONFIG_CMD_UBI_RENAME=y
161 +CONFIG_CMD_TFTPBOOT=y
162 +CONFIG_CMD_TFTPSRV=y
165 +CONFIG_CMD_SETEXPR=y
169 +CONFIG_CMD_STRINGS=y
171 +CONFIG_ENV_IS_IN_UBI=y
172 +CONFIG_ENV_UBI_PART="ubi"
173 +CONFIG_ENV_SIZE=0x1f000
174 +CONFIG_ENV_SIZE_REDUND=0x1f000
175 +CONFIG_ENV_UBI_VOLUME="ubootenv"
176 +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2"
177 +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
178 CONFIG_ENV_OVERWRITE=y
179 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
180 CONFIG_NET_RANDOM_ETHADDR=y
185 # CONFIG_MMC is not set
186 +CONFIG_HUSH_PARSER=y
187 +CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
188 +CONFIG_SYS_RELOC_GD_ENV_ADDR=y
191 CONFIG_MTD_SPI_NAND=y
192 --- a/configs/mt7981_sd_rfb_defconfig
193 +++ b/configs/mt7981_sd_rfb_defconfig
194 @@ -13,7 +13,22 @@ CONFIG_DEBUG_UART_BASE=0x11002000
195 CONFIG_DEBUG_UART_CLOCK=40000000
196 CONFIG_SYS_LOAD_ADDR=0x46000000
198 -# CONFIG_AUTOBOOT is not set
199 +CONFIG_OF_LIBFDT_OVERLAY=y
200 +CONFIG_SMBIOS_PRODUCT_NAME=""
201 +CONFIG_CFB_CONSOLE_ANSI=y
202 +CONFIG_BOARD_LATE_INIT=y
204 +CONFIG_BUTTON_GPIO=y
206 +CONFIG_CMD_ENV_FLAGS=y
208 +CONFIG_FIT_ENABLE_SHA256_SUPPORT=y
213 +CONFIG_BOOTSTD_DEFAULTS=y
214 +CONFIG_BOOTSTD_FULL=y
215 CONFIG_DEFAULT_FDT_FILE="mt7981-sd-rfb"
218 @@ -24,9 +39,23 @@ CONFIG_SYS_PBSIZE=1049
219 # CONFIG_BOOTM_PLAN9 is not set
220 # CONFIG_BOOTM_RTEMS is not set
221 # CONFIG_BOOTM_VXWORKS is not set
222 -# CONFIG_CMD_ELF is not set
223 # CONFIG_CMD_UNLZ4 is not set
224 # CONFIG_CMD_UNZIP is not set
225 +CONFIG_CMD_BOOTMENU=y
236 +CONFIG_CMD_ENV_READMEM=y
237 +CONFIG_CMD_ERASEENV=y
239 +CONFIG_CMD_FS_UUID=y
242 CONFIG_CMD_GPT_RENAME=y
243 @@ -36,13 +65,35 @@ CONFIG_CMD_PART=y
247 +CONFIG_CMD_TFTPBOOT=y
248 +CONFIG_CMD_TFTPSRV=y
251 +CONFIG_CMD_SETEXPR=y
255 +CONFIG_CMD_STRINGS=y
258 CONFIG_CMD_FS_GENERIC=y
262 +CONFIG_CMD_LICENSE=y
263 +CONFIG_CMD_LINK_LOCAL=y
265 +CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000
267 +CONFIG_CMD_SF_TEST=y
270 CONFIG_PARTITION_TYPE_GUID=y
271 CONFIG_ENV_OVERWRITE=y
272 CONFIG_ENV_IS_IN_MMC=y
273 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
274 CONFIG_NET_RANDOM_ETHADDR=y
279 --- a/configs/mt7981_snfi_nand_rfb_defconfig
280 +++ b/configs/mt7981_snfi_nand_rfb_defconfig
281 @@ -12,7 +12,23 @@ CONFIG_DEBUG_UART_BASE=0x11002000
282 CONFIG_DEBUG_UART_CLOCK=40000000
283 CONFIG_SYS_LOAD_ADDR=0x46000000
285 -# CONFIG_AUTOBOOT is not set
286 +CONFIG_OF_LIBFDT_OVERLAY=y
287 +CONFIG_SMBIOS_PRODUCT_NAME=""
288 +CONFIG_CFB_CONSOLE_ANSI=y
289 +CONFIG_BOARD_LATE_INIT=y
291 +CONFIG_BUTTON_GPIO=y
293 +CONFIG_CMD_ENV_FLAGS=y
295 +CONFIG_FIT_ENABLE_SHA256_SUPPORT=y
301 +CONFIG_BOOTSTD_DEFAULTS=y
302 +CONFIG_BOOTSTD_FULL=y
303 CONFIG_DEFAULT_FDT_FILE="mt7981-snfi-nand-rfb"
306 @@ -22,22 +38,73 @@ CONFIG_SYS_PBSIZE=1049
307 # CONFIG_BOOTM_PLAN9 is not set
308 # CONFIG_BOOTM_RTEMS is not set
309 # CONFIG_BOOTM_VXWORKS is not set
310 -# CONFIG_CMD_ELF is not set
311 # CONFIG_CMD_UNLZ4 is not set
312 # CONFIG_CMD_UNZIP is not set
313 +CONFIG_CMD_BOOTMENU=y
324 +CONFIG_CMD_ENV_READMEM=y
325 +CONFIG_CMD_ERASEENV=y
327 +CONFIG_CMD_FS_GENERIC=y
328 +CONFIG_CMD_FS_UUID=y
334 +CONFIG_CMD_LICENSE=y
335 +CONFIG_CMD_LINK_LOCAL=y
338 +# CONFIG_MTD_RAW_NAND is not set
339 +CONFIG_CMD_NAND_TRIMFFS=y
342 +CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000
344 +CONFIG_CMD_SF_TEST=y
349 CONFIG_CMD_UBI_RENAME=y
351 +CONFIG_CMD_TFTPBOOT=y
352 +CONFIG_CMD_TFTPSRV=y
355 +CONFIG_CMD_SETEXPR=y
359 +CONFIG_CMD_STRINGS=y
361 CONFIG_ENV_OVERWRITE=y
362 +CONFIG_ENV_IS_IN_UBI=y
363 +CONFIG_ENV_UBI_PART="ubi"
364 +CONFIG_ENV_SIZE=0x1f000
365 +CONFIG_ENV_SIZE_REDUND=0x1f000
366 +CONFIG_ENV_UBI_VOLUME="ubootenv"
367 +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2"
368 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
369 CONFIG_NET_RANDOM_ETHADDR=y
374 # CONFIG_MMC is not set
375 +CONFIG_HUSH_PARSER=y
376 +CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
377 +CONFIG_SYS_RELOC_GD_ENV_ADDR=y
380 CONFIG_MTK_SPI_NAND=y
381 --- a/configs/mt7981_nor_rfb_defconfig
382 +++ b/configs/mt7981_nor_rfb_defconfig
383 @@ -12,7 +12,22 @@ CONFIG_DEBUG_UART_BASE=0x11002000
384 CONFIG_DEBUG_UART_CLOCK=40000000
385 CONFIG_SYS_LOAD_ADDR=0x46000000
387 -# CONFIG_AUTOBOOT is not set
388 +CONFIG_OF_LIBFDT_OVERLAY=y
389 +CONFIG_SMBIOS_PRODUCT_NAME=""
390 +CONFIG_CFB_CONSOLE_ANSI=y
391 +CONFIG_BOARD_LATE_INIT=y
393 +CONFIG_BUTTON_GPIO=y
395 +CONFIG_CMD_ENV_FLAGS=y
397 +CONFIG_FIT_ENABLE_SHA256_SUPPORT=y
402 +CONFIG_BOOTSTD_DEFAULTS=y
403 +CONFIG_BOOTSTD_FULL=y
404 CONFIG_DEFAULT_FDT_FILE="mt7981-rfb"
407 @@ -22,21 +37,66 @@ CONFIG_SYS_PBSIZE=1049
408 # CONFIG_BOOTM_PLAN9 is not set
409 # CONFIG_BOOTM_RTEMS is not set
410 # CONFIG_BOOTM_VXWORKS is not set
411 -# CONFIG_CMD_ELF is not set
412 # CONFIG_CMD_UNLZ4 is not set
413 # CONFIG_CMD_UNZIP is not set
414 +CONFIG_CMD_BOOTMENU=y
425 +CONFIG_CMD_ENV_READMEM=y
426 +CONFIG_CMD_ERASEENV=y
428 +CONFIG_CMD_FS_GENERIC=y
429 +CONFIG_CMD_FS_UUID=y
435 +CONFIG_CMD_LICENSE=y
436 +CONFIG_CMD_LINK_LOCAL=y
440 +CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000
446 +CONFIG_CMD_TFTPBOOT=y
447 +CONFIG_CMD_TFTPSRV=y
450 +CONFIG_CMD_SETEXPR=y
454 +CONFIG_CMD_STRINGS=y
456 +CONFIG_ENV_IS_IN_MTD=y
457 +CONFIG_ENV_MTD_NAME="u-boot-env"
458 +CONFIG_ENV_SIZE_REDUND=0x4000
459 +CONFIG_ENV_SIZE=0x4000
460 +CONFIG_ENV_OFFSET=0x0
461 CONFIG_ENV_OVERWRITE=y
462 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
463 CONFIG_NET_RANDOM_ETHADDR=y
468 # CONFIG_MMC is not set
469 +CONFIG_HUSH_PARSER=y
470 +CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
471 +CONFIG_SYS_RELOC_GD_ENV_ADDR=y
474 CONFIG_MTD_SPI_NAND=y