Commit 90253178 authored by Jon Loeliger's avatar Jon Loeliger

common/: Remove lingering references to CFG_CMD_* symbols.

Fixed some broken instances of "#ifdef CMD_CFG_IDE" too.
Those always evaluated TRUE, and thus were always compiled
even when IDE really wasn't defined/wanted.
Signed-off-by: default avatarJon Loeliger <jdl@freescale.com>
parent d39b5741
......@@ -149,7 +149,8 @@ autoscript (ulong addr)
return rcode;
}
#endif /* CONFIG_AUTOSCRIPT || CFG_CMD_AUTOSCRIPT */
#endif
/**************************************************/
#if defined(CONFIG_CMD_AUTOSCRIPT)
int
......@@ -176,6 +177,6 @@ U_BOOT_CMD(
"[addr] - run script starting at addr"
" - A valid autoscr header must be present\n"
);
#endif /* CFG_CMD_AUTOSCRIPT */
#endif
#endif /* CFG_CMD_AUTOSCRIPT */
#endif
......@@ -167,7 +167,7 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
print_num ("sram size", (ulong)bd->bi_sramsize);
#endif
#if defined(CFG_CMD_NET)
#if defined(CONFIG_CMD_NET)
puts ("ethaddr =");
for (i=0; i<6; ++i) {
printf ("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]);
......@@ -195,7 +195,7 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
print_num ("sram start ", (ulong)bd->bi_sramstart);
print_num ("sram size ", (ulong)bd->bi_sramsize);
#endif
#if defined(CFG_CMD_NET)
#if defined(CONFIG_CMD_NET)
puts ("ethaddr =");
for (i=0; i<6; ++i) {
printf ("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]);
......@@ -285,4 +285,4 @@ U_BOOT_CMD(
"bdinfo - print Board Info structure\n",
NULL
);
#endif /* CFG_CMD_BDI */
#endif
......@@ -413,7 +413,7 @@ int do_bedbug_rdump (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
U_BOOT_CMD (rdump, 1, 1, do_bedbug_rdump,
"rdump - Show registers.\n", " - Show registers.\n");
/* ====================================================================== */
#endif /* CFG_CMD_BEDBUG */
#endif
/*
......
......@@ -138,7 +138,7 @@ static boot_os_Fcn do_bootm_vxworks;
static boot_os_Fcn do_bootm_qnxelf;
int do_bootvx ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[] );
int do_bootelf (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[] );
#endif /* CFG_CMD_ELF */
#endif
#if defined(CONFIG_ARTOS) && defined(CONFIG_PPC)
static boot_os_Fcn do_bootm_artos;
#endif
......@@ -449,7 +449,7 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
do_bootm_qnxelf (cmdtp, flag, argc, argv,
addr, len_ptr, verify);
break;
#endif /* CFG_CMD_ELF */
#endif
#ifdef CONFIG_ARTOS
case IH_OS_ARTOS:
do_bootm_artos (cmdtp, flag, argc, argv,
......@@ -1315,7 +1315,7 @@ U_BOOT_CMD(
" image contents (magic number, header and payload checksums)\n"
);
#endif /* CFG_CMD_IMI */
#endif
#if defined(CONFIG_CMD_IMLS)
/*-----------------------------------------------------------------------
......@@ -1373,7 +1373,7 @@ U_BOOT_CMD(
" - Prints information about all images found at sector\n"
" boundaries in flash.\n"
);
#endif /* CFG_CMD_IMLS */
#endif
void
print_image_hdr (image_header_t *hdr)
......@@ -1389,7 +1389,7 @@ print_image_hdr (image_header_t *hdr)
printf (" Created: %4d-%02d-%02d %2d:%02d:%02d UTC\n",
tm.tm_year, tm.tm_mon, tm.tm_mday,
tm.tm_hour, tm.tm_min, tm.tm_sec);
#endif /* CFG_CMD_DATE, CONFIG_TIMESTAMP */
#endif
puts (" Image Type: "); print_type(hdr);
printf ("\n Data Size: %d Bytes = ", ntohl(hdr->ih_size));
print_size (ntohl(hdr->ih_size), "\n");
......@@ -1614,7 +1614,7 @@ do_bootm_qnxelf (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
local_args[1] = str; /* and provide it via the arguments */
do_bootelf(cmdtp, 0, 2, local_args);
}
#endif /* CFG_CMD_ELF */
#endif
#ifdef CONFIG_LYNXKDI
static void
......
......@@ -109,4 +109,4 @@ U_BOOT_CMD(
" - enable or disable data (writethrough) cache\n"
);
#endif /* CFG_CMD_CACHE */
#endif
......@@ -68,4 +68,4 @@ U_BOOT_CMD(
""
);
#endif /* CFG_CMD_CONSOLE */
#endif
......@@ -211,4 +211,4 @@ U_BOOT_CMD(
" - with 'reset' argument: reset the RTC\n"
);
#endif /* CFG_CMD_DATE */
#endif
......@@ -246,4 +246,4 @@ U_BOOT_CMD(
"adr_dcrn[.dat_dcrn] offset value - write offset to adr_dcrn, write value to dat_dcrn.\n"
);
#endif /* CONFIG_4xx & CFG_CMD_SETGETDCR */
#endif
......@@ -77,4 +77,4 @@ U_BOOT_CMD(
" - run specified tests\n"
);
#endif /* CFG_CMD_DIAG */
#endif
......@@ -79,4 +79,4 @@ U_BOOT_CMD(
" - without arguments: clear dot matrix display\n"
);
#endif /* CFG_CMD_DISPLAY */
#endif
......@@ -110,7 +110,7 @@ int do_eeprom ( cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
printf ("Usage:\n%s\n", cmdtp->usage);
return 1;
}
#endif /* CFG_CMD_EEPROM */
#endif
/*-----------------------------------------------------------------------
*
......@@ -422,7 +422,8 @@ void eeprom_init (void)
}
/*-----------------------------------------------------------------------
*/
#endif /* CFG_CMD_EEPROM */
#endif
/***************************************************/
#if defined(CONFIG_CMD_EEPROM)
......@@ -445,4 +446,4 @@ U_BOOT_CMD(
);
#endif /* CFG_I2C_MULTI_EEPROMS */
#endif /* CFG_CMD_EEPROM */
#endif
......@@ -324,4 +324,4 @@ U_BOOT_CMD(
" [address] - load address of vxWorks ELF image.\n"
);
#endif /* CFG_CMD_ELF */
#endif
......@@ -324,4 +324,4 @@ void hexdump (int cnt, unsigned char *data)
}
#endif /* NOT_IMPLEMENTED_YET */
#endif /* CFG_CMD_FAT */
#endif
......@@ -732,4 +732,4 @@ U_BOOT_CMD(
#undef TMP_PROT_ON
#undef TMP_PROT_OFF
#endif /* CFG_CMD_FLASH */
#endif
......@@ -877,7 +877,7 @@ int do_sdram ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
return 0;
}
#endif /* CFG_CMD_SDRAM */
#endif
#if defined(CONFIG_I2C_CMD_TREE)
#if defined(CONFIG_I2C_MULTI_BUS)
......@@ -941,7 +941,7 @@ int do_i2c(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
#if defined(CONFIG_CMD_SDRAM)
if (!strncmp(argv[1], "sd", 2))
return do_sdram(cmdtp, flag, --argc, ++argv);
#endif /* CFG_CMD_SDRAM */
#endif
else
printf ("Usage:\n%s\n", cmdtp->usage);
return 0;
......@@ -967,7 +967,7 @@ U_BOOT_CMD(
"i2c loop chip address[.0, .1, .2] [# of objects] - looping read of device\n"
#if defined(CONFIG_CMD_SDRAM)
"i2c sdram chip - print SDRAM configuration information\n"
#endif /* CFG_CMD_SDRAM */
#endif
);
#endif /* CONFIG_I2C_CMD_TREE */
U_BOOT_CMD(
......@@ -1025,4 +1025,4 @@ U_BOOT_CMD(
);
#endif
#endif /* CFG_CMD_I2C */
#endif
......@@ -720,4 +720,4 @@ U_BOOT_CMD(
);
#endif /* CFG_CMD_IMMAP && (CONFIG_8xx || CONFIG_8260) */
#endif
......@@ -2192,4 +2192,4 @@ U_BOOT_CMD(
/***************************************************/
#endif /* CFG_CMD_JFFS2 */
#endif
......@@ -43,10 +43,10 @@ static int read_record (char *buf, ulong len);
# if defined(CONFIG_CMD_SAVES)
static int save_serial (ulong offset, ulong size);
static int write_record (char *buf);
# endif /* CFG_CMD_SAVES */
#endif
static int do_echo = 1;
#endif /* CFG_CMD_LOADS */
#endif
/* -------------------------------------------------------------------- */
......@@ -399,9 +399,9 @@ write_record (char *buf)
}
return (0);
}
# endif /* CFG_CMD_SAVES */
# endif
#endif /* CFG_CMD_LOADS */
#endif
#if defined(CONFIG_CMD_LOADB)
......@@ -1038,7 +1038,7 @@ static ulong load_serial_ymodem (ulong offset)
return offset;
}
#endif /* CFG_CMD_LOADB */
#endif
/* -------------------------------------------------------------------- */
......@@ -1084,8 +1084,8 @@ U_BOOT_CMD(
" - save S-Record file over serial line with offset 'off' and size 'size'\n"
);
#endif /* CFG_LOADS_BAUD_CHANGE */
#endif /* CFG_CMD_SAVES */
#endif /* CFG_CMD_LOADS */
#endif
#endif
#if defined(CONFIG_CMD_LOADB)
......@@ -1105,7 +1105,7 @@ U_BOOT_CMD(
" with offset 'off' and baudrate 'baud'\n"
);
#endif /* CFG_CMD_LOADB */
#endif
/* -------------------------------------------------------------------- */
......@@ -1135,4 +1135,4 @@ U_BOOT_CMD(
"[on|off]\n - change RTS/CTS hardware flow control over serial line\n"
);
#endif /* CFG_CMD_HWFLOW */
#endif
......@@ -1253,4 +1253,4 @@ U_BOOT_CMD(
#endif /* CONFIG_MX_CYCLIC */
#endif
#endif /* CFG_CMD_MEMORY */
#endif
......@@ -414,4 +414,4 @@ U_BOOT_CMD (rspr, 3, 1, do_rspr,
" 1 - EAR - Exception address register\n"
" 2 - ESR - Exception status register\n");
#endif /* CONFIG_MICROBLAZE & CFG_CMD_MFSL */
#endif
......@@ -595,4 +595,4 @@ U_BOOT_CMD(
#endif /* CONFIG_TERSE_MII */
#endif /* CFG_CMD_MII */
#endif
......@@ -69,4 +69,4 @@ U_BOOT_CMD(
" - delay execution for N seconds (N is _decimal_ !!!)\n"
);
#endif /* CFG_CMD_MISC */
#endif
......@@ -43,4 +43,4 @@ U_BOOT_CMD(
NULL
);
#endif /* CFG_CMD_MMC */
#endif
......@@ -79,7 +79,7 @@ U_BOOT_CMD(
"dhcp\t- invoke DHCP client to obtain IP/boot params\n",
"\n"
);
#endif /* CFG_CMD_DHCP */
#endif
#if defined(CONFIG_CMD_NFS)
int do_nfs (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
......@@ -92,7 +92,7 @@ U_BOOT_CMD(
"nfs\t- boot image via network using NFS protocol\n",
"[loadAddress] [host ip addr:bootfilename]\n"
);
#endif /* CFG_CMD_NFS */
#endif
static void netboot_update_env (void)
{
......@@ -249,7 +249,7 @@ U_BOOT_CMD(
"ping\t- send ICMP ECHO_REQUEST to network host\n",
"pingAddress\n"
);
#endif /* CFG_CMD_PING */
#endif
#if defined(CONFIG_CMD_CDP)
......@@ -292,7 +292,7 @@ U_BOOT_CMD(
cdp, 1, 1, do_cdp,
"cdp\t- Perform CDP network configuration\n",
);
#endif /* CFG_CMD_CDP */
#endif
#if defined(CONFIG_CMD_SNTP)
int do_sntp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
......@@ -330,6 +330,6 @@ U_BOOT_CMD(
"sntp\t- synchronize RTC via network\n",
"[NTP server IP]\n"
);
#endif /* CFG_CMD_SNTP */
#endif
#endif /* CFG_CMD_NET */
#endif
......@@ -372,7 +372,7 @@ int _do_setenv (int flag, int argc, char *argv[])
copy_filename (BootFile, argv[2], sizeof(BootFile));
return 0;
}
#endif /* CFG_CMD_NET */
#endif
#ifdef CONFIG_AMIGAONEG3SE
if (strcmp(argv[1], "vga_fg_color") == 0 ||
......@@ -483,7 +483,7 @@ int do_askenv ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
/* Continue calling setenv code */
return _do_setenv (flag, len, local_args);
}
#endif /* CFG_CMD_ASKENV */
#endif
/************************************************************************
* Look up variable from environment,
......@@ -603,7 +603,7 @@ U_BOOT_CMD(
NULL
);
#endif /* CFG_CMD_ENV */
#endif
#if defined(CONFIG_CMD_ASKENV)
......@@ -620,7 +620,7 @@ U_BOOT_CMD(
" - display 'message' string and get environment variable 'name'"
"from stdin (max 'size' chars)\n"
);
#endif /* CFG_CMD_ASKENV */
#endif
#if defined(CONFIG_CMD_RUN)
int do_run (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
......@@ -630,4 +630,4 @@ U_BOOT_CMD(
"var [...]\n"
" - run the commands in the environment variable(s) 'var'\n"
);
#endif /* CFG_CMD_RUN */
#endif
......@@ -166,4 +166,4 @@ U_BOOT_CMD(
" - read datum from IO port\n"
);
#endif /* CFG_CMD_PORTIO */
#endif
......@@ -140,4 +140,4 @@ U_BOOT_CMD(
"<dout> - Hexadecimal string that gets sent\n"
);
#endif /* CFG_CMD_SPI */
#endif
......@@ -73,7 +73,7 @@ U_BOOT_CMD(
"vfd ADDR\n"
" - load bitmap at address ADDR\n"
);
#endif /* CFG_CMD_VFD */
#endif
#ifdef CONFIG_VFD
int trab_vfd (ulong bitmap)
......
......@@ -76,7 +76,7 @@ U_BOOT_CMD(
" - echo args to console; \\c suppresses newline\n"
);
#endif /* CFG_CMD_ECHO */
#endif
#ifdef CFG_HUSH_PARSER
......
......@@ -40,7 +40,7 @@ DECLARE_GLOBAL_DATA_PTR;
#if defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)
#define CMD_SAVEENV
#elif defined(CFG_ENV_ADDR_REDUND)
#error Cannot use CFG_ENV_ADDR_REDUND without CFG_CMD_ENV & CFG_CMD_FLASH
#error Cannot use CFG_ENV_ADDR_REDUND without CONFIG_CMD_ENV & CONFIG_CMD_FLASH
#endif
#if defined(CFG_ENV_SIZE_REDUND) && (CFG_ENV_SIZE_REDUND < CFG_ENV_SIZE)
......
......@@ -42,7 +42,7 @@
#if defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)
#define CMD_SAVEENV
#elif defined(CFG_ENV_OFFSET_REDUND)
#error Cannot use CFG_ENV_OFFSET_REDUND without CFG_CMD_ENV & CFG_CMD_NAND
#error Cannot use CFG_ENV_OFFSET_REDUND without CONFIG_CMD_ENV & CONFIG_CMD_NAND
#endif
#if defined(CFG_ENV_SIZE_REDUND) && (CFG_ENV_SIZE_REDUND != CFG_ENV_SIZE)
......
......@@ -1694,7 +1694,7 @@ static int run_pipe_real(struct pipe *pi)
else
flag |= CMD_FLAG_BOOTD;
}
#endif /* CFG_CMD_BOOTD */
#endif
/* found - check max args */
if ((child->argc - i) > cmdtp->maxargs) {
printf ("Usage:\n%s\n", cmdtp->usage);
......
......@@ -591,4 +591,4 @@ U_BOOT_CMD(
int kgdb_not_configured = 1;
#endif /* CFG_CMD_KGDB */
#endif
......@@ -1325,7 +1325,7 @@ int run_command (const char *cmd, int flag)
flag |= CMD_FLAG_BOOTD;
}
}
#endif /* CFG_CMD_BOOTD */
#endif
/* OK - call function to do the command */
if ((cmdtp->cmd) (cmdtp, flag, argc, argv) != 0) {
......@@ -1372,4 +1372,4 @@ int do_run (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
}
return 0;
}
#endif /* CFG_CMD_RUN */
#endif
......@@ -1249,4 +1249,4 @@ int usb_stor_get_info(struct usb_device *dev,struct us_data *ss,block_dev_desc_t
}
#endif /* CONFIG_USB_STORAGE */
#endif /* CFG_CMD_USB */
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment