mirror of
https://xff.cz/git/u-boot/
synced 2025-10-18 08:23:24 +02:00
common/cmd_[a-f]* : Augment CONFIG_COMMANDS tests with defined(CONFIG_CMD_*).
This is a compatibility step that allows both the older form and the new form to co-exist for a while until the older can be removed entirely. All transformations are of the form: Before: #if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) After: #if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) || defined(CONFIG_CMD_AUTOSCRIPT) Signed-off-by: Jon Loeliger <jdl@freescale.com>
This commit is contained in:
committed by
Wolfgang Denk
parent
ec63b10b61
commit
a76adc8142
@@ -48,7 +48,7 @@
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_AUTOSCRIPT) || \
|
||||
(CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT )
|
||||
(CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) || defined(CONFIG_CMD_AUTOSCRIPT)
|
||||
|
||||
extern image_header_t header; /* from cmd_bootm.c */
|
||||
int
|
||||
@@ -152,7 +152,7 @@ autoscript (ulong addr)
|
||||
|
||||
#endif /* CONFIG_AUTOSCRIPT || CFG_CMD_AUTOSCRIPT */
|
||||
/**************************************************/
|
||||
#if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT)
|
||||
#if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) || defined(CONFIG_CMD_AUTOSCRIPT)
|
||||
int
|
||||
do_autoscript (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
{
|
||||
@@ -170,7 +170,7 @@ do_autoscript (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
return rcode;
|
||||
}
|
||||
|
||||
#if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT)
|
||||
#if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) || defined(CONFIG_CMD_AUTOSCRIPT)
|
||||
U_BOOT_CMD(
|
||||
autoscr, 2, 0, do_autoscript,
|
||||
"autoscr - run script from memory\n",
|
||||
|
Reference in New Issue
Block a user