random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-14 12:56:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

sf: Tidy up code to avoid #ifdef

Browse Source 
Update this code to use IS_ENABLED() instead.

Signed-off-by: Simon Glass <sjg@chromium.org>

Reviewed-by: Pratyush Yadav <p.yadav@ti.com>
Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>
This commit is contained in:
Simon Glass 2021-09-19 15:49:34 -06:00
parent ad4e010054
commit 3512e1570d
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
cmd/sf.c
View File

@ -384,7 +384,6 @@ static int do_spi_protect(int argc, char *const argv[])
return ret == 0 ? 0 : 1; return ret == 0 ? 0 : 1;
} }
#ifdef CONFIG_CMD_SF_TEST
enum { enum {
STAGE_ERASE, STAGE_ERASE,
STAGE_CHECK, STAGE_CHECK,
@ -548,7 +547,6 @@ static int do_spi_flash_test(int argc, char *const argv[])
return 0; return 0;
} }
#endif /* CONFIG_CMD_SF_TEST */
static int do_spi_flash(struct cmd_tbl *cmdtp, int flag, int argc, static int do_spi_flash(struct cmd_tbl *cmdtp, int flag, int argc,
char *const argv[]) char *const argv[])
@ -582,10 +580,8 @@ static int do_spi_flash(struct cmd_tbl *cmdtp, int flag, int argc,
ret = do_spi_flash_erase(argc, argv); ret = do_spi_flash_erase(argc, argv);
else if (strcmp(cmd, "protect") == 0) else if (strcmp(cmd, "protect") == 0)
ret = do_spi_protect(argc, argv); ret = do_spi_protect(argc, argv);
#ifdef CONFIG_CMD_SF_TEST else if (IS_ENABLED(CONFIG_CMD_SF_TEST) && !strcmp(cmd, "test"))
else if (!strcmp(cmd, "test"))
ret = do_spi_flash_test(argc, argv); ret = do_spi_flash_test(argc, argv);
#endif
else else
ret = -1; ret = -1;
@ -597,16 +593,8 @@ usage:
return CMD_RET_USAGE; return CMD_RET_USAGE;
} }
#ifdef CONFIG_CMD_SF_TEST #ifdef CONFIG_SYS_LONGHELP
#define SF_TEST_HELP "\nsf test offset len " \ static const char long_help[] =
"- run a very basic destructive test"
#else
#define SF_TEST_HELP
#endif
U_BOOT_CMD(
sf, 5, 1, do_spi_flash,
"SPI flash sub-system",
"probe [[bus:]cs] [hz] [mode] - init flash device on given SPI bus\n" "probe [[bus:]cs] [hz] [mode] - init flash device on given SPI bus\n"
" and chip select\n" " and chip select\n"
"sf read addr offset|partition len - read `len' bytes starting at\n" "sf read addr offset|partition len - read `len' bytes starting at\n"
@ -622,6 +610,14 @@ U_BOOT_CMD(
" at `addr' to flash at `offset'\n" " at `addr' to flash at `offset'\n"
" or to start of mtd `partition'\n" " or to start of mtd `partition'\n"
"sf protect lock/unlock sector len - protect/unprotect 'len' bytes starting\n" "sf protect lock/unlock sector len - protect/unprotect 'len' bytes starting\n"
" at address 'sector'\n" " at address 'sector'"
SF_TEST_HELP #ifdef CONFIG_CMD_SF_TEST
"\nsf test offset len - run a very basic destructive test"
#endif
#endif /* CONFIG_SYS_LONGHELP */
;
U_BOOT_CMD(
sf, 5, 1, do_spi_flash,
"SPI flash sub-system", long_help
); );