Skip to content

Modify the Kconfig name of the mtdconfig module 2 #3371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zhaoxingyu12 wants to merge 2 commits into
base: master
Choose a base branch
from
+7 −7
Open

Modify the Kconfig name of the mtdconfig module 2 #3371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59b3be2
mtd/nvs: modify config name to MTD_CONFIG_NVS part1
zhaoxingyu12 Jun 4, 2025
52a914f
mtdconfig: lomtdconfig device change to depends on !MTD_CONFIG_NONE
zhaoxingyu12 Jun 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nshlib/nsh_command.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ static const struct cmdmap_s g_cmdmap[] =

#ifndef CONFIG_DISABLE_MOUNTPOINT
# if defined(CONFIG_MTD_LOOP) && !defined(CONFIG_NSH_DISABLE_LOMTD)
# ifdef CONFIG_MTD_CONFIG
# ifndef CONFIG_MTD_CONFIG_NONE
CMD_MAP("lomtd", cmd_lomtd, 3, 10,
"[-d <dev-path>] | [[-o <offset>] [-e <erase-size>] "
"[-b <sect-size>] [-c <configdata>] <dev-path> <file-path>]]"),
Expand Down
8 changes: 4 additions & 4 deletions nshlib/nsh_fscmds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1308,7 +1308,7 @@ int cmd_lomtd(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
int sectsize = -1;
off_t offset = 0;
bool badarg = false;
# ifdef CONFIG_MTD_CONFIG
# ifndef CONFIG_MTD_CONFIG_NONE
int configdata = 0;
# endif
int ret = ERROR;
Expand All @@ -1324,7 +1324,7 @@ int cmd_lomtd(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
* NOTE that the -o and -r options are accepted with the -d option, but
* will be ignored.
*/
# ifdef CONFIG_MTD_CONFIG
# ifndef CONFIG_MTD_CONFIG_NONE
while ((option = getopt(argc, argv, "d:o:e:b:c:")) != ERROR)
# else
while ((option = getopt(argc, argv, "d:o:e:b:")) != ERROR)
Expand All @@ -1349,7 +1349,7 @@ int cmd_lomtd(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
sectsize = atoi(optarg);
break;

# ifdef CONFIG_MTD_CONFIG
# ifndef CONFIG_MTD_CONFIG_NONE
case 'c':
configdata = atoi(optarg);
break;
Expand Down Expand Up @@ -1435,7 +1435,7 @@ int cmd_lomtd(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
setup.sectsize = sectsize; /* The sector size to use with the block device */
setup.erasesize = erasesize; /* The sector size to use with the block device */
setup.offset = offset; /* An offset that may be applied to the device */
# ifdef CONFIG_MTD_CONFIG
# ifndef CONFIG_MTD_CONFIG_NONE
setup.configdata = configdata; /* Is a loop mtdconfig device */
# endif

Expand Down
2 changes: 1 addition & 1 deletion system/cfgdata/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
config SYSTEM_CFGDATA
tristate "Cfgdata Command"
default n
depends on MTD_CONFIG
depends on !MTD_CONFIG_NONE
---help---
Enable support for the CFGDATA tool.

Expand Down
2 changes: 1 addition & 1 deletion testing/fs/mtd_config_fs/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
config TESTING_MTD_CONFIG_FAIL_SAFE
tristate "MTD Config fail-safe storage test"
default n
depends on MTD_CONFIG_FAIL_SAFE
depends on MTD_CONFIG_NVS
select MTD_CONFIG_NAMED
---help---
Enable the fail-safe storage test
Expand Down
Loading