Commit fd9bcaa3 authored by Jon Loeliger's avatar Jon Loeliger

common/cmd_[p-x]*: Remove obsolete references to CONFIG_COMMANDS.

Signed-off-by: default avatarJon Loeliger <jdl@freescale.com>
parent c76fe474
......@@ -38,7 +38,7 @@
#include <asm/io.h>
#include <pci.h>
#if (CONFIG_COMMANDS & CFG_CMD_PCI) || defined(CONFIG_CMD_PCI)
#if defined(CONFIG_CMD_PCI)
extern int cmd_get_data_size(char* arg, int default_size);
......@@ -565,6 +565,6 @@ U_BOOT_CMD(
" - write to CFG address\n"
);
#endif /* (CONFIG_COMMANDS & CFG_CMD_PCI) */
#endif
#endif /* CONFIG_PCI */
......@@ -61,7 +61,7 @@
/* -------------------------------------------------------------------- */
#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)
#if defined(CONFIG_CMD_PCMCIA)
extern int pcmcia_on (void);
extern int pcmcia_off (void);
......@@ -93,14 +93,13 @@ U_BOOT_CMD(
"pinit off - power off PCMCIA socket\n"
);
#endif /* CONFIG_COMMANDS & CFG_CMD_PCMCIA */
#endif
/* -------------------------------------------------------------------- */
#undef CHECK_IDE_DEVICE
#if ((CONFIG_COMMANDS & CFG_CMD_IDE) || defined(CONFIG_CMD_IDE)) \
&& defined(CONFIG_IDE_8xx_PCCARD)
#if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD)
#define CHECK_IDE_DEVICE
#endif
......
......@@ -30,7 +30,7 @@
#include <common.h>
#include <command.h>
#if (CONFIG_COMMANDS & CFG_CMD_PORTIO) || defined(CONFIG_CMD_PORTIO)
#if defined(CONFIG_CMD_PORTIO)
extern int cmd_get_data_size (char *arg, int default_size);
......
......@@ -33,7 +33,7 @@
#include <mpc5xxx.h>
#endif
#if (CONFIG_COMMANDS & CFG_CMD_REGINFO) || defined(CONFIG_CMD_REGINFO)
#if defined(CONFIG_CMD_REGINFO)
int do_reginfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
......@@ -335,14 +335,14 @@ int do_reginfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
return 0;
}
#endif /* CONFIG_COMMANDS & CFG_CMD_REGINFO */
#endif
/**************************************************/
#if ( defined(CONFIG_8xx) || defined(CONFIG_405GP) || \
defined(CONFIG_405EP) || defined(CONFIG_MPC5200) ) && \
((CONFIG_COMMANDS & CFG_CMD_REGINFO) || defined(CONFIG_CMD_REGINFO))
defined(CONFIG_CMD_REGINFO)
U_BOOT_CMD(
reginfo, 2, 1, do_reginfo,
......
......@@ -28,7 +28,7 @@
*/
#include <common.h>
#if (CONFIG_COMMANDS & CFG_CMD_REISER) || defined(CONFIG_CMD_REISER)
#if defined(CONFIG_CMD_REISER)
#include <config.h>
#include <command.h>
#include <image.h>
......@@ -240,4 +240,4 @@ U_BOOT_CMD(
" to address 'addr' from dos filesystem\n"
);
#endif /* CONFIG_COMMANDS & CFG_CMD_REISER */
#endif
......@@ -34,7 +34,7 @@
#include <image.h>
#include <pci.h>
#if (CONFIG_COMMANDS & CFG_CMD_SCSI) || defined(CONFIG_CMD_SCSI)
#if defined(CONFIG_CMD_SCSI)
#ifdef CONFIG_SCSI_SYM53C8XX
#define SCSI_VEND_ID 0x1000
......@@ -609,4 +609,4 @@ U_BOOT_CMD(
"loadAddr dev:part\n"
);
#endif /* #if (CONFIG_COMMANDS & CFG_CMD_SCSI) */
#endif
......@@ -29,7 +29,7 @@
#include <command.h>
#include <spi.h>
#if (CONFIG_COMMANDS & CFG_CMD_SPI) || defined(CONFIG_CMD_SPI)
#if defined(CONFIG_CMD_SPI)
/*-----------------------------------------------------------------------
* Definitions
......
......@@ -28,7 +28,7 @@
#include <universe.h>
#if (CONFIG_COMMANDS & CFG_CMD_UNIVERSE) || defined(CONFIG_CMD_UNIVERSE)
#if defined(CONFIG_CMD_UNIVERSE)
#define PCI_VENDOR PCI_VENDOR_ID_TUNDRA
#define PCI_DEVICE PCI_DEVICE_ID_TUNDRA_CA91C042
......@@ -387,4 +387,4 @@ U_BOOT_CMD(
" 03 -> D32 Data Width\n"
);
#endif /* (CONFIG_COMMANDS & CFG_CMD_UNIVERSE) */
#endif
......@@ -30,7 +30,7 @@
#include <asm/byteorder.h>
#include <part.h>
#if (CONFIG_COMMANDS & CFG_CMD_USB) || defined(CONFIG_CMD_USB)
#if defined(CONFIG_CMD_USB)
#include <usb.h>
......@@ -609,10 +609,10 @@ int do_usb (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
}
#endif /* (CONFIG_COMMANDS & CFG_CMD_USB) */
#endif
#if (CONFIG_COMMANDS & CFG_CMD_USB) || defined(CONFIG_CMD_USB)
#if defined(CONFIG_CMD_USB)
#ifdef CONFIG_USB_STORAGE
U_BOOT_CMD(
......
......@@ -35,7 +35,7 @@
#include <common.h>
#include <command.h>
#if (CONFIG_COMMANDS & CFG_CMD_VFD) || defined(CONFIG_CMD_VFD)
#if defined(CONFIG_CMD_VFD)
#include <vfd_logo.h>
#define VFD_TEST_LOGO_BMPNR 0
......
......@@ -24,7 +24,7 @@
* MA 02111-1307 USA
*/
#if (CONFIG_COMMANDS & CFG_CMD_XIMG) || defined(CONFIG_CMD_XIMG)
#if defined(CONFIG_CMD_XIMG)
/*
* Multi Image extract
......@@ -141,4 +141,4 @@ U_BOOT_CMD(imxtract, 4, 1, do_imgextract,
"addr part [dest]\n"
" - extract <part> from image at <addr> and copy to <dest>\n");
#endif /* CONFIG_COMMANDS & CFG_CMD_XIMG */
#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