Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 72732318a956847a64fd112c4d210824b7616dc8

Authored by Joel Johnson
Committed by Stefano Babic
1 parent 4cfeb8df31
Exists in smarc_8mq_lf_v2020.04 and in 9 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

cmd: mdc/mwc: normalize disjoint MX_CYCLIC usage 

Both CMD_MX_CYCLIC and MX_CYCLIC are in use and defined in Kconfig,
but only the non-CMD version currently does anything. This changes all
usages to prefer the CMD_MX_CYCLIC option (since it's only affecting
addition of the commands), and switches defconfigs using the non-CMD
version to use the CMD version.

Signed-off-by: Joel Johnson <mrjoel@lixil.net>
Reviewed-by: Tom Rini <trini@konsulko.com>

Showing 32 changed files with 35 additions and 41 deletions Side-by-side Diff

... ... @@ -3025,7 +3025,7 @@
3025 3025 Add the "loopw" memory command. This only takes effect if
3026 3026 the memory commands are activated globally (CONFIG_CMD_MEMORY).
3027 3027  
3028   -- CONFIG_MX_CYCLIC
  3028 +- CONFIG_CMD_MX_CYCLIC
3029 3029 Add the "mdc" and "mwc" memory commands. These are cyclic
3030 3030 "md/mw" commands.
3031 3031 Examples:
... ... @@ -702,7 +702,7 @@
702 702 base - print or set address offset
703 703 loop - initialize loop on address range
704 704  
705   -config MX_CYCLIC
  705 +config CMD_MX_CYCLIC
706 706 bool "Enable cyclic md/mw commands"
707 707 depends on CMD_MEMORY
708 708 help
... ... @@ -736,12 +736,6 @@
736 736 Use a more complete alternative memory test.
737 737  
738 738 endif
739   -
740   -config CMD_MX_CYCLIC
741   - bool "mdc, mwc"
742   - help
743   - mdc - memory display cyclic
744   - mwc - memory write cyclic
745 739  
746 740 config CMD_SHA1SUM
747 741 bool "sha1sum"
... ... @@ -165,7 +165,7 @@
165 165 return 0;
166 166 }
167 167  
168   -#ifdef CONFIG_MX_CYCLIC
  168 +#ifdef CONFIG_CMD_MX_CYCLIC
169 169 static int do_mem_mdc(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
170 170 {
171 171 int i;
... ... @@ -219,7 +219,7 @@
219 219  
220 220 return 0;
221 221 }
222   -#endif /* CONFIG_MX_CYCLIC */
  222 +#endif /* CONFIG_CMD_MX_CYCLIC */
223 223  
224 224 static int do_mem_cmp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
225 225 {
... ... @@ -1270,7 +1270,7 @@
1270 1270 );
1271 1271 #endif /* CONFIG_CMD_MEMTEST */
1272 1272  
1273   -#ifdef CONFIG_MX_CYCLIC
  1273 +#ifdef CONFIG_CMD_MX_CYCLIC
1274 1274 U_BOOT_CMD(
1275 1275 mdc, 4, 1, do_mem_mdc,
1276 1276 "memory display cyclic",
... ... @@ -1290,7 +1290,7 @@
1290 1290 "[.b, .w, .l] address value delay(ms)"
1291 1291 #endif
1292 1292 );
1293   -#endif /* CONFIG_MX_CYCLIC */
  1293 +#endif /* CONFIG_CMD_MX_CYCLIC */
1294 1294  
1295 1295 #ifdef CONFIG_CMD_MEMINFO
1296 1296 U_BOOT_CMD(
configs/M5249EVB_defconfig
Diff comments   View file @ 7273231
... ... @@ -9,7 +9,7 @@
9 9 # CONFIG_AUTOBOOT is not set
10 10 CONFIG_CMD_IMLS=y
11 11 CONFIG_LOOPW=y
12   -CONFIG_MX_CYCLIC=y
  12 +CONFIG_CMD_MX_CYCLIC=y
13 13 # CONFIG_CMD_SETEXPR is not set
14 14 CONFIG_CMD_CACHE=y
15 15 CONFIG_DEFAULT_DEVICE_TREE="M5249EVB"
configs/amcore_defconfig
Diff comments   View file @ 7273231
... ... @@ -14,7 +14,7 @@
14 14 CONFIG_CMD_IMLS=y
15 15 # CONFIG_CMD_XIMG is not set
16 16 CONFIG_LOOPW=y
17   -CONFIG_MX_CYCLIC=y
  17 +CONFIG_CMD_MX_CYCLIC=y
18 18 # CONFIG_CMD_SETEXPR is not set
19 19 CONFIG_CMD_CACHE=y
20 20 CONFIG_CMD_TIMER=y
configs/bcm11130_defconfig
Diff comments   View file @ 7273231
... ... @@ -13,7 +13,7 @@
13 13 # CONFIG_AUTOBOOT is not set
14 14 CONFIG_CMD_BOOTZ=y
15 15 CONFIG_CMD_ASKENV=y
16   -CONFIG_MX_CYCLIC=y
  16 +CONFIG_CMD_MX_CYCLIC=y
17 17 CONFIG_CMD_GPIO=y
18 18 CONFIG_CMD_I2C=y
19 19 CONFIG_CMD_MMC=y
configs/bcm11130_nand_defconfig
Diff comments   View file @ 7273231
... ... @@ -12,7 +12,7 @@
12 12 # CONFIG_AUTOBOOT is not set
13 13 CONFIG_CMD_BOOTZ=y
14 14 CONFIG_CMD_ASKENV=y
15   -CONFIG_MX_CYCLIC=y
  15 +CONFIG_CMD_MX_CYCLIC=y
16 16 # CONFIG_CMD_FLASH is not set
17 17 CONFIG_CMD_GPIO=y
18 18 CONFIG_CMD_I2C=y
configs/bcm23550_w1d_defconfig
Diff comments   View file @ 7273231
... ... @@ -15,7 +15,7 @@
15 15 CONFIG_HUSH_PARSER=y
16 16 CONFIG_CMD_BOOTZ=y
17 17 CONFIG_CMD_ASKENV=y
18   -CONFIG_MX_CYCLIC=y
  18 +CONFIG_CMD_MX_CYCLIC=y
19 19 CONFIG_CMD_GPIO=y
20 20 CONFIG_CMD_I2C=y
21 21 CONFIG_CMD_MMC=y
configs/bcm28155_ap_defconfig
Diff comments   View file @ 7273231
... ... @@ -14,7 +14,7 @@
14 14 # CONFIG_AUTOBOOT is not set
15 15 CONFIG_CMD_BOOTZ=y
16 16 CONFIG_CMD_ASKENV=y
17   -CONFIG_MX_CYCLIC=y
  17 +CONFIG_CMD_MX_CYCLIC=y
18 18 CONFIG_CMD_GPIO=y
19 19 CONFIG_CMD_I2C=y
20 20 CONFIG_CMD_MMC=y
configs/bcm28155_w1d_defconfig
Diff comments   View file @ 7273231
... ... @@ -13,7 +13,7 @@
13 13 # CONFIG_AUTOBOOT is not set
14 14 CONFIG_CMD_BOOTZ=y
15 15 CONFIG_CMD_ASKENV=y
16   -CONFIG_MX_CYCLIC=y
  16 +CONFIG_CMD_MX_CYCLIC=y
17 17 CONFIG_CMD_GPIO=y
18 18 CONFIG_CMD_I2C=y
19 19 CONFIG_CMD_MMC=y
configs/bcm911360_entphn-ns_defconfig
Diff comments   View file @ 7273231
... ... @@ -12,7 +12,7 @@
12 12 # CONFIG_AUTOBOOT is not set
13 13 CONFIG_CMD_BOOTZ=y
14 14 CONFIG_CMD_ASKENV=y
15   -CONFIG_MX_CYCLIC=y
  15 +CONFIG_CMD_MX_CYCLIC=y
16 16 # CONFIG_CMD_SETEXPR is not set
17 17 CONFIG_CMD_MII=y
18 18 CONFIG_CMD_PING=y
configs/bcm911360_entphn_defconfig
Diff comments   View file @ 7273231
... ... @@ -12,7 +12,7 @@
12 12 # CONFIG_AUTOBOOT is not set
13 13 CONFIG_CMD_BOOTZ=y
14 14 CONFIG_CMD_ASKENV=y
15   -CONFIG_MX_CYCLIC=y
  15 +CONFIG_CMD_MX_CYCLIC=y
16 16 # CONFIG_CMD_SETEXPR is not set
17 17 CONFIG_CMD_MII=y
18 18 CONFIG_CMD_PING=y
configs/bcm911360k_defconfig
Diff comments   View file @ 7273231
... ... @@ -12,7 +12,7 @@
12 12 # CONFIG_AUTOBOOT is not set
13 13 CONFIG_CMD_BOOTZ=y
14 14 CONFIG_CMD_ASKENV=y
15   -CONFIG_MX_CYCLIC=y
  15 +CONFIG_CMD_MX_CYCLIC=y
16 16 # CONFIG_CMD_SETEXPR is not set
17 17 CONFIG_CMD_MII=y
18 18 CONFIG_CMD_PING=y
configs/bcm958300k-ns_defconfig
Diff comments   View file @ 7273231
... ... @@ -12,7 +12,7 @@
12 12 # CONFIG_AUTOBOOT is not set
13 13 CONFIG_CMD_BOOTZ=y
14 14 CONFIG_CMD_ASKENV=y
15   -CONFIG_MX_CYCLIC=y
  15 +CONFIG_CMD_MX_CYCLIC=y
16 16 # CONFIG_CMD_SETEXPR is not set
17 17 CONFIG_CMD_MII=y
18 18 CONFIG_CMD_PING=y
configs/bcm958300k_defconfig
Diff comments   View file @ 7273231
... ... @@ -12,7 +12,7 @@
12 12 # CONFIG_AUTOBOOT is not set
13 13 CONFIG_CMD_BOOTZ=y
14 14 CONFIG_CMD_ASKENV=y
15   -CONFIG_MX_CYCLIC=y
  15 +CONFIG_CMD_MX_CYCLIC=y
16 16 # CONFIG_CMD_SETEXPR is not set
17 17 CONFIG_CMD_MII=y
18 18 CONFIG_CMD_PING=y
configs/bcm958305k_defconfig
Diff comments   View file @ 7273231
... ... @@ -12,7 +12,7 @@
12 12 # CONFIG_AUTOBOOT is not set
13 13 CONFIG_CMD_BOOTZ=y
14 14 CONFIG_CMD_ASKENV=y
15   -CONFIG_MX_CYCLIC=y
  15 +CONFIG_CMD_MX_CYCLIC=y
16 16 # CONFIG_CMD_SETEXPR is not set
17 17 CONFIG_CMD_MII=y
18 18 CONFIG_CMD_PING=y
configs/bcm958622hr_defconfig
Diff comments   View file @ 7273231
... ... @@ -13,7 +13,7 @@
13 13 CONFIG_CMD_BOOTZ=y
14 14 CONFIG_CMD_ASKENV=y
15 15 CONFIG_CRC32_VERIFY=y
16   -CONFIG_MX_CYCLIC=y
  16 +CONFIG_CMD_MX_CYCLIC=y
17 17 # CONFIG_CMD_SETEXPR is not set
18 18 CONFIG_CMD_CACHE=y
19 19 CONFIG_CMD_TIME=y
configs/da850evm_defconfig
Diff comments   View file @ 7273231
... ... @@ -33,7 +33,7 @@
33 33 CONFIG_HUSH_PARSER=y
34 34 CONFIG_SYS_PROMPT="U-Boot > "
35 35 CONFIG_CRC32_VERIFY=y
36   -CONFIG_MX_CYCLIC=y
  36 +CONFIG_CMD_MX_CYCLIC=y
37 37 CONFIG_CMD_DM=y
38 38 # CONFIG_CMD_FLASH is not set
39 39 # CONFIG_CMD_GPT is not set
configs/da850evm_direct_nor_defconfig
Diff comments   View file @ 7273231
... ... @@ -24,7 +24,7 @@
24 24 # CONFIG_CMD_BOOTZ is not set
25 25 CONFIG_CMD_IMLS=y
26 26 CONFIG_CRC32_VERIFY=y
27   -CONFIG_MX_CYCLIC=y
  27 +CONFIG_CMD_MX_CYCLIC=y
28 28 CONFIG_CMD_DM=y
29 29 # CONFIG_CMD_GPT is not set
30 30 # CONFIG_CMD_MMC is not set
configs/da850evm_nand_defconfig
Diff comments   View file @ 7273231
... ... @@ -31,7 +31,7 @@
31 31 CONFIG_HUSH_PARSER=y
32 32 CONFIG_SYS_PROMPT="U-Boot > "
33 33 CONFIG_CRC32_VERIFY=y
34   -CONFIG_MX_CYCLIC=y
  34 +CONFIG_CMD_MX_CYCLIC=y
35 35 CONFIG_CMD_DM=y
36 36 # CONFIG_CMD_FLASH is not set
37 37 # CONFIG_CMD_GPT is not set
configs/k2e_evm_defconfig
Diff comments   View file @ 7273231
... ... @@ -25,7 +25,7 @@
25 25 CONFIG_SPL_POWER_SUPPORT=y
26 26 CONFIG_SPL_SPI_LOAD=y
27 27 CONFIG_SYS_SPI_U_BOOT_OFFS=0x10000
28   -CONFIG_MX_CYCLIC=y
  28 +CONFIG_CMD_MX_CYCLIC=y
29 29 # CONFIG_CMD_FLASH is not set
30 30 # CONFIG_CMD_GPIO is not set
31 31 # CONFIG_CMD_GPT is not set
configs/k2e_hs_evm_defconfig
Diff comments   View file @ 7273231
... ... @@ -17,7 +17,7 @@
17 17 CONFIG_SYS_CONSOLE_INFO_QUIET=y
18 18 CONFIG_VERSION_VARIABLE=y
19 19 CONFIG_BOARD_EARLY_INIT_F=y
20   -CONFIG_MX_CYCLIC=y
  20 +CONFIG_CMD_MX_CYCLIC=y
21 21 # CONFIG_CMD_FLASH is not set
22 22 # CONFIG_CMD_GPIO is not set
23 23 # CONFIG_CMD_GPT is not set
configs/k2g_evm_defconfig
Diff comments   View file @ 7273231
... ... @@ -24,7 +24,7 @@
24 24 CONFIG_SPL_POWER_SUPPORT=y
25 25 CONFIG_SPL_SPI_LOAD=y
26 26 CONFIG_SYS_SPI_U_BOOT_OFFS=0x10000
27   -CONFIG_MX_CYCLIC=y
  27 +CONFIG_CMD_MX_CYCLIC=y
28 28 # CONFIG_CMD_FLASH is not set
29 29 # CONFIG_CMD_GPIO is not set
30 30 # CONFIG_CMD_GPT is not set
configs/k2g_hs_evm_defconfig
Diff comments   View file @ 7273231
... ... @@ -16,7 +16,7 @@
16 16 CONFIG_SYS_CONSOLE_INFO_QUIET=y
17 17 CONFIG_VERSION_VARIABLE=y
18 18 CONFIG_BOARD_EARLY_INIT_F=y
19   -CONFIG_MX_CYCLIC=y
  19 +CONFIG_CMD_MX_CYCLIC=y
20 20 # CONFIG_CMD_FLASH is not set
21 21 # CONFIG_CMD_GPIO is not set
22 22 # CONFIG_CMD_GPT is not set
configs/k2hk_evm_defconfig
Diff comments   View file @ 7273231
... ... @@ -25,7 +25,7 @@
25 25 CONFIG_SPL_POWER_SUPPORT=y
26 26 CONFIG_SPL_SPI_LOAD=y
27 27 CONFIG_SYS_SPI_U_BOOT_OFFS=0x10000
28   -CONFIG_MX_CYCLIC=y
  28 +CONFIG_CMD_MX_CYCLIC=y
29 29 # CONFIG_CMD_FLASH is not set
30 30 # CONFIG_CMD_GPIO is not set
31 31 # CONFIG_CMD_GPT is not set
configs/k2hk_hs_evm_defconfig
Diff comments   View file @ 7273231
... ... @@ -17,7 +17,7 @@
17 17 CONFIG_SYS_CONSOLE_INFO_QUIET=y
18 18 CONFIG_VERSION_VARIABLE=y
19 19 CONFIG_BOARD_EARLY_INIT_F=y
20   -CONFIG_MX_CYCLIC=y
  20 +CONFIG_CMD_MX_CYCLIC=y
21 21 # CONFIG_CMD_FLASH is not set
22 22 # CONFIG_CMD_GPIO is not set
23 23 # CONFIG_CMD_GPT is not set
configs/k2l_evm_defconfig
Diff comments   View file @ 7273231
... ... @@ -25,7 +25,7 @@
25 25 CONFIG_SPL_POWER_SUPPORT=y
26 26 CONFIG_SPL_SPI_LOAD=y
27 27 CONFIG_SYS_SPI_U_BOOT_OFFS=0x10000
28   -CONFIG_MX_CYCLIC=y
  28 +CONFIG_CMD_MX_CYCLIC=y
29 29 # CONFIG_CMD_FLASH is not set
30 30 # CONFIG_CMD_GPIO is not set
31 31 # CONFIG_CMD_GPT is not set
configs/k2l_hs_evm_defconfig
Diff comments   View file @ 7273231
... ... @@ -16,7 +16,7 @@
16 16 CONFIG_VERSION_VARIABLE=y
17 17 CONFIG_BOARD_EARLY_INIT_F=y
18 18 CONFIG_HUSH_PARSER=y
19   -CONFIG_MX_CYCLIC=y
  19 +CONFIG_CMD_MX_CYCLIC=y
20 20 # CONFIG_CMD_FLASH is not set
21 21 # CONFIG_CMD_GPIO is not set
22 22 # CONFIG_CMD_GPT is not set
configs/legoev3_defconfig
Diff comments   View file @ 7273231
... ... @@ -15,7 +15,7 @@
15 15 CONFIG_AUTOBOOT_STOP_STR="l"
16 16 CONFIG_CMD_ASKENV=y
17 17 CONFIG_CRC32_VERIFY=y
18   -CONFIG_MX_CYCLIC=y
  18 +CONFIG_CMD_MX_CYCLIC=y
19 19 # CONFIG_CMD_FLASH is not set
20 20 CONFIG_CMD_MMC=y
21 21 CONFIG_CMD_SPI=y
configs/omapl138_lcdk_defconfig
Diff comments   View file @ 7273231
... ... @@ -30,7 +30,7 @@
30 30 CONFIG_HUSH_PARSER=y
31 31 CONFIG_CRC32_VERIFY=y
32 32 # CONFIG_CMD_EEPROM is not set
33   -CONFIG_MX_CYCLIC=y
  33 +CONFIG_CMD_MX_CYCLIC=y
34 34 CONFIG_CMD_DM=y
35 35 # CONFIG_CMD_FLASH is not set
36 36 CONFIG_CMD_NAND=y
configs/x600_defconfig
Diff comments   View file @ 7273231
... ... @@ -27,7 +27,7 @@
27 27 CONFIG_AUTOBOOT_STOP_STR=" "
28 28 CONFIG_CMD_IMLS=y
29 29 CONFIG_LOOPW=y
30   -CONFIG_MX_CYCLIC=y
  30 +CONFIG_CMD_MX_CYCLIC=y
31 31 CONFIG_CMD_GPIO=y
32 32 CONFIG_CMD_I2C=y
33 33 CONFIG_CMD_NAND=y
configs/xtfpga_defconfig
Diff comments   View file @ 7273231
... ... @@ -15,7 +15,7 @@
15 15 CONFIG_CMD_IMLS=y
16 16 CONFIG_CMD_ASKENV=y
17 17 CONFIG_CRC32_VERIFY=y
18   -CONFIG_MX_CYCLIC=y
  18 +CONFIG_CMD_MX_CYCLIC=y
19 19 CONFIG_CMD_SAVES=y
20 20 CONFIG_CMD_DHCP=y
21 21 CONFIG_CMD_PING=y