-
Notifications
You must be signed in to change notification settings - Fork 19.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
uboot-mediatek: update to U-Boot 2024.01 release
Rebase local patches on top of quarterly timed release, allowing to drop numerous patches which have been accepted upstream since the release of U-Boot 2023.07.02. Signed-off-by: Daniel Golle <[email protected]>
- Loading branch information
Showing
82 changed files
with
2,639 additions
and
10,672 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,9 +18,9 @@ Signed-off-by: Weijie Gao <[email protected]> | |
| CONFIG_DEFAULT_DEVICE_TREE="mt7622-rfb" | ||
| +CONFIG_ENV_SIZE=0x20000 | ||
| +CONFIG_ENV_OFFSET=0x280000 | ||
| CONFIG_SYS_PROMPT="MT7622> " | ||
| CONFIG_DEBUG_UART_BASE=0x11002000 | ||
| CONFIG_DEBUG_UART_CLOCK=25000000 | ||
| CONFIG_SYS_LOAD_ADDR=0x4007ff28 | ||
| @@ -25,6 +27,9 @@ CONFIG_CMD_SF_TEST=y | ||
| CONFIG_CMD_PING=y | ||
| CONFIG_CMD_SMC=y | ||
|
|
||
43 changes: 0 additions & 43 deletions
43
package/boot/uboot-mediatek/patches/100-00-clk-remove-log_ret-from-clk_get_rate.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -783,7 +783,7 @@ Signed-off-by: Weijie Gao <[email protected]> | |
| +} | ||
| --- /dev/null | ||
| +++ b/drivers/mtd/mtk-snand/mtk-snand-ids.c | ||
| @@ -0,0 +1,515 @@ | ||
| @@ -0,0 +1,519 @@ | ||
| +// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause | ||
| +/* | ||
| + * Copyright (C) 2020 MediaTek Inc. All Rights Reserved. | ||
|
|
@@ -901,6 +901,10 @@ Signed-off-by: Weijie Gao <[email protected]> | |
| + SNAND_MEMORG_1G_2K_64, | ||
| + &snand_cap_read_from_cache_quad_q2d, | ||
| + &snand_cap_program_load_x4), | ||
| + SNAND_INFO("GD5F1GQ5UExxG", SNAND_ID(SNAND_ID_ADDR, 0xc8, 0x51), | ||
| + SNAND_MEMORG_1G_2K_128, | ||
| + &snand_cap_read_from_cache_quad, | ||
| + &snand_cap_program_load_x4), | ||
| + SNAND_INFO("GD5F2GQ4UExIG", SNAND_ID(SNAND_ID_ADDR, 0xc8, 0xd2), | ||
| + SNAND_MEMORG_2G_2K_128, | ||
| + &snand_cap_read_from_cache_quad_q2d, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,37 +17,18 @@ Signed-off-by: Weijie Gao <[email protected]> | |
| 7 files changed, 299 insertions(+), 3 deletions(-) | ||
| create mode 100644 env/mtd.c | ||
|
|
||
| --- a/cmd/nvedit.c | ||
| +++ b/cmd/nvedit.c | ||
| @@ -48,6 +48,7 @@ DECLARE_GLOBAL_DATA_PTR; | ||
| defined(CONFIG_ENV_IS_IN_MMC) || \ | ||
| defined(CONFIG_ENV_IS_IN_FAT) || \ | ||
| defined(CONFIG_ENV_IS_IN_EXT4) || \ | ||
| + defined(CONFIG_ENV_IS_IN_MTD) || \ | ||
| defined(CONFIG_ENV_IS_IN_NAND) || \ | ||
| defined(CONFIG_ENV_IS_IN_NVRAM) || \ | ||
| defined(CONFIG_ENV_IS_IN_ONENAND) || \ | ||
| @@ -61,7 +62,7 @@ DECLARE_GLOBAL_DATA_PTR; | ||
|
|
||
| #if !defined(ENV_IS_IN_DEVICE) && \ | ||
| !defined(CONFIG_ENV_IS_NOWHERE) | ||
| -# error Define one of CONFIG_ENV_IS_IN_{EEPROM|FLASH|MMC|FAT|EXT4|\ | ||
| +# error Define one of CONFIG_ENV_IS_IN_{EEPROM|FLASH|MMC|FAT|EXT4|MTD|\ | ||
| NAND|NVRAM|ONENAND|SATA|SPI_FLASH|REMOTE|UBI} or CONFIG_ENV_IS_NOWHERE | ||
| #endif | ||
|
|
||
| --- a/env/Kconfig | ||
| +++ b/env/Kconfig | ||
| @@ -62,7 +62,7 @@ config ENV_IS_NOWHERE | ||
| @@ -61,7 +61,7 @@ config ENV_IS_DEFAULT | ||
| !ENV_IS_IN_MMC && !ENV_IS_IN_NAND && \ | ||
| !ENV_IS_IN_NVRAM && !ENV_IS_IN_ONENAND && \ | ||
| !ENV_IS_IN_REMOTE && !ENV_IS_IN_SPI_FLASH && \ | ||
| - !ENV_IS_IN_UBI | ||
| + !ENV_IS_IN_UBI && !ENV_IS_IN_MTD | ||
| help | ||
| Define this if you don't want to or can't have an environment stored | ||
| on a storage medium. In this case the environment will still exist | ||
| @@ -251,6 +251,27 @@ config ENV_IS_IN_MMC | ||
| select ENV_IS_NOWHERE | ||
|
|
||
| config ENV_IS_NOWHERE | ||
| @@ -254,6 +254,27 @@ config ENV_IS_IN_MMC | ||
| offset: "u-boot,mmc-env-offset", "u-boot,mmc-env-offset-redundant". | ||
| CONFIG_ENV_OFFSET and CONFIG_ENV_OFFSET_REDUND are not used. | ||
|
|
||
|
|
@@ -75,7 +56,7 @@ Signed-off-by: Weijie Gao <[email protected]> | |
| config ENV_IS_IN_NAND | ||
| bool "Environment in a NAND device" | ||
| depends on !CHAIN_OF_TRUST | ||
| @@ -558,10 +579,16 @@ config ENV_ADDR_REDUND | ||
| @@ -561,10 +582,16 @@ config ENV_ADDR_REDUND | ||
| Offset from the start of the device (or partition) of the redundant | ||
| environment location. | ||
|
|
||
|
|
@@ -93,7 +74,7 @@ Signed-off-by: Weijie Gao <[email protected]> | |
| default 0x3f8000 if ARCH_ROCKCHIP && ENV_IS_IN_MMC | ||
| default 0x140000 if ARCH_ROCKCHIP && ENV_IS_IN_SPI_FLASH | ||
| default 0xF0000 if ARCH_SUNXI | ||
| @@ -609,6 +636,12 @@ config ENV_SECT_SIZE | ||
| @@ -622,6 +649,12 @@ config ENV_SECT_SIZE | ||
| help | ||
| Size of the sector containing the environment. | ||
|
|
||
|
|
@@ -118,7 +99,7 @@ Signed-off-by: Weijie Gao <[email protected]> | |
| obj-$(CONFIG_$(SPL_TPL_)ENV_IS_IN_FLASH) += flash.o | ||
| --- a/env/env.c | ||
| +++ b/env/env.c | ||
| @@ -69,6 +69,9 @@ static enum env_location env_locations[] | ||
| @@ -46,6 +46,9 @@ static enum env_location env_locations[] | ||
| #ifdef CONFIG_ENV_IS_IN_MMC | ||
| ENVL_MMC, | ||
| #endif | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,7 +13,7 @@ Signed-off-by: Weijie Gao <[email protected]> | |
|
|
||
| --- a/common/board_r.c | ||
| +++ b/common/board_r.c | ||
| @@ -388,6 +388,20 @@ static int initr_nand(void) | ||
| @@ -373,6 +373,20 @@ static int initr_nand(void) | ||
| } | ||
| #endif | ||
|
|
||
|
|
@@ -34,7 +34,7 @@ Signed-off-by: Weijie Gao <[email protected]> | |
| #if defined(CONFIG_CMD_ONENAND) | ||
| /* go init the NAND */ | ||
| static int initr_onenand(void) | ||
| @@ -696,6 +710,9 @@ static init_fnc_t init_sequence_r[] = { | ||
| @@ -675,6 +689,9 @@ static init_fnc_t init_sequence_r[] = { | ||
| #ifdef CONFIG_CMD_ONENAND | ||
| initr_onenand, | ||
| #endif | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,7 +15,7 @@ Signed-off-by: Weijie Gao <[email protected]> | |
|
|
||
| --- a/cmd/Kconfig | ||
| +++ b/cmd/Kconfig | ||
| @@ -1353,6 +1353,12 @@ config CMD_NAND_TORTURE | ||
| @@ -1392,6 +1392,12 @@ config CMD_NAND_TORTURE | ||
|
|
||
| endif # CMD_NAND | ||
|
|
||
|
|
@@ -30,7 +30,7 @@ Signed-off-by: Weijie Gao <[email protected]> | |
| depends on NVME | ||
| --- a/cmd/Makefile | ||
| +++ b/cmd/Makefile | ||
| @@ -125,6 +125,7 @@ obj-y += legacy-mtd-utils.o | ||
| @@ -127,6 +127,7 @@ obj-y += legacy-mtd-utils.o | ||
| endif | ||
| obj-$(CONFIG_CMD_MUX) += mux.o | ||
| obj-$(CONFIG_CMD_NAND) += nand.o | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -63,15 +63,15 @@ Signed-off-by: SkyLake.Huang <[email protected]> | |
| #ifdef CONFIG_AUTO_COMPLETE | ||
| static int mtd_name_complete(int argc, char *const argv[], char last_char, | ||
| int maxv, char *cmdv[]) | ||
| @@ -552,6 +588,7 @@ static char mtd_help_text[] = | ||
| @@ -551,6 +587,7 @@ U_BOOT_LONGHELP(mtd, | ||
| "\n" | ||
| "Specific functions:\n" | ||
| "mtd bad <name>\n" | ||
| + "mtd markbad <name> <off>\n" | ||
| "\n" | ||
| "With:\n" | ||
| "\t<name>: NAND partition/chip name (or corresponding DM device name or OF path)\n" | ||
| @@ -577,4 +614,6 @@ U_BOOT_CMD_WITH_SUBCMDS(mtd, "MTD utils" | ||
| @@ -575,4 +612,6 @@ U_BOOT_CMD_WITH_SUBCMDS(mtd, "MTD utils" | ||
| U_BOOT_SUBCMD_MKENT_COMPLETE(erase, 4, 0, do_mtd_erase, | ||
| mtd_name_complete), | ||
| U_BOOT_SUBCMD_MKENT_COMPLETE(bad, 2, 1, do_mtd_bad, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,37 +17,17 @@ Signed-off-by: Weijie Gao <[email protected]> | |
| 7 files changed, 180 insertions(+), 3 deletions(-) | ||
| create mode 100644 env/nmbm.c | ||
|
|
||
| --- a/cmd/nvedit.c | ||
| +++ b/cmd/nvedit.c | ||
| @@ -50,6 +50,7 @@ DECLARE_GLOBAL_DATA_PTR; | ||
| defined(CONFIG_ENV_IS_IN_EXT4) || \ | ||
| defined(CONFIG_ENV_IS_IN_MTD) || \ | ||
| defined(CONFIG_ENV_IS_IN_NAND) || \ | ||
| + defined(CONFIG_ENV_IS_IN_NMBM) || \ | ||
| defined(CONFIG_ENV_IS_IN_NVRAM) || \ | ||
| defined(CONFIG_ENV_IS_IN_ONENAND) || \ | ||
| defined(CONFIG_ENV_IS_IN_SPI_FLASH) || \ | ||
| @@ -63,7 +64,7 @@ DECLARE_GLOBAL_DATA_PTR; | ||
| #if !defined(ENV_IS_IN_DEVICE) && \ | ||
| !defined(CONFIG_ENV_IS_NOWHERE) | ||
| # error Define one of CONFIG_ENV_IS_IN_{EEPROM|FLASH|MMC|FAT|EXT4|MTD|\ | ||
| -NAND|NVRAM|ONENAND|SATA|SPI_FLASH|REMOTE|UBI} or CONFIG_ENV_IS_NOWHERE | ||
| +NAND|NMBM|NVRAM|ONENAND|SATA|SPI_FLASH|REMOTE|UBI} or CONFIG_ENV_IS_NOWHERE | ||
| #endif | ||
|
|
||
| /* | ||
| --- a/env/Kconfig | ||
| +++ b/env/Kconfig | ||
| @@ -62,7 +62,7 @@ config ENV_IS_NOWHERE | ||
| @@ -59,6 +59,7 @@ config ENV_IS_DEFAULT | ||
| def_bool y if !ENV_IS_IN_EEPROM && !ENV_IS_IN_EXT4 && \ | ||
| !ENV_IS_IN_FAT && !ENV_IS_IN_FLASH && \ | ||
| !ENV_IS_IN_MMC && !ENV_IS_IN_NAND && \ | ||
| + !ENV_IS_IN_NMBM && \ | ||
| !ENV_IS_IN_NVRAM && !ENV_IS_IN_ONENAND && \ | ||
| !ENV_IS_IN_REMOTE && !ENV_IS_IN_SPI_FLASH && \ | ||
| - !ENV_IS_IN_UBI && !ENV_IS_IN_MTD | ||
| + !ENV_IS_IN_UBI && !ENV_IS_IN_NMBM && !ENV_IS_IN_MTD | ||
| help | ||
| Define this if you don't want to or can't have an environment stored | ||
| on a storage medium. In this case the environment will still exist | ||
| @@ -312,6 +312,21 @@ config ENV_RANGE | ||
| !ENV_IS_IN_UBI && !ENV_IS_IN_MTD | ||
| @@ -315,6 +316,21 @@ config ENV_RANGE | ||
| Specifying a range with more erase blocks than are needed to hold | ||
| CONFIG_ENV_SIZE allows bad blocks within the range to be avoided. | ||
|
|
||
|
|
@@ -69,7 +49,7 @@ Signed-off-by: Weijie Gao <[email protected]> | |
| config ENV_IS_IN_NVRAM | ||
| bool "Environment in a non-volatile RAM" | ||
| depends on !CHAIN_OF_TRUST | ||
| @@ -588,7 +603,7 @@ config ENV_MTD_NAME | ||
| @@ -591,7 +607,7 @@ config ENV_MTD_NAME | ||
| config ENV_OFFSET | ||
| hex "Environment offset" | ||
| depends on ENV_IS_IN_EEPROM || ENV_IS_IN_MMC || ENV_IS_IN_NAND || \ | ||
|
|
@@ -90,7 +70,7 @@ Signed-off-by: Weijie Gao <[email protected]> | |
|
|
||
| --- a/env/env.c | ||
| +++ b/env/env.c | ||
| @@ -75,6 +75,9 @@ static enum env_location env_locations[] | ||
| @@ -52,6 +52,9 @@ static enum env_location env_locations[] | ||
| #ifdef CONFIG_ENV_IS_IN_NAND | ||
| ENVL_NAND, | ||
| #endif | ||
|
|
||
Oops, something went wrong.