From 6531aeed374f0818d7259eaa401b92b976723fb2 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 12 Aug 2025 11:31:09 -0600 Subject: env: Correct Kconfig type for ENV_MMC_SW_PARTITION As part of renaming environment related Kconfig options, ENV_MMC_SW_PARTITION was inadvertently changed from a string to a bool. Correct this. Fixes: ffc4914703a2 ("env: Rename ENV_MMC_PARTITION to ENV_MMC_SW_PARTITION") Reviewed-by: Marek Vasut Signed-off-by: Tom Rini --- env/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'env') 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. -- cgit v1.3.1 From 590c28b378ff76022b910accfb8ff7c56095f4f8 Mon Sep 17 00:00:00 2001 From: david regan Date: Thu, 14 Aug 2025 11:04:55 -0700 Subject: cmd: nand: bug fix MTD_OOB_AUTO to MTD_OPS_AUTO_OOB bug fix MTD_OOB_AUTO to MTD_OPS_AUTO_OOB since MTD_OOB_AUTO does not exist Fixes: dfe64e2c8973 ("mtd: resync with Linux-3.7.1") Signed-off-by: david regan Signed-off-by: Michael Trimarchi --- cmd/nand.c | 2 +- env/nand.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'env') diff --git a/cmd/nand.c b/cmd/nand.c index 2f785deeb7f..e09e145bc2d 100644 --- a/cmd/nand.c +++ b/cmd/nand.c @@ -412,7 +412,7 @@ int do_nand_env_oob(struct cmd_tbl *cmdtp, int argc, char *const argv[]) } 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; 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; -- cgit v1.3.1