diff options
| author | Tom Rini <[email protected]> | 2025-08-25 13:28:49 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-08-25 13:28:49 -0600 |
| commit | fceb37d802b65beb4713f17e9167e7ecc4dbbe67 (patch) | |
| tree | ec0390afd09a92d03b571927ad675a7e18f59311 /env | |
| parent | 91595c96a53360dce696c2da694b1983c91d64f6 (diff) | |
| parent | dca578a9c9decb85271665de8086b8f41731d388 (diff) | |
Merge tag 'v2025.10-rc3' into next
Prepare v2025.10-rc3
Diffstat (limited to 'env')
| -rw-r--r-- | env/Kconfig | 2 | ||||
| -rw-r--r-- | env/nand.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/env/Kconfig b/env/Kconfig index 1df7ebd547e..03c189b7266 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -732,7 +732,7 @@ config ENV_MMC_USE_SW_PARTITION depends on ENV_IS_IN_MMC config ENV_MMC_SW_PARTITION - bool "SD/MMC environment software partition name" + string "SD/MMC environment software partition name" depends on ENV_MMC_USE_SW_PARTITION help SD/MMC software partition name used to save environment variables. diff --git a/env/nand.c b/env/nand.c index fdaa903cd61..709f8411eb6 100644 --- a/env/nand.c +++ b/env/nand.c @@ -275,7 +275,7 @@ int get_nand_env_oob(struct mtd_info *mtd, unsigned long *result) int ret; ops.datbuf = NULL; - ops.mode = MTD_OOB_AUTO; + ops.mode = MTD_OPS_AUTO_OOB; ops.ooboffs = 0; ops.ooblen = ENV_OFFSET_SIZE; ops.oobbuf = (void *)oob_buf; |