disk/ doc/ lib_*/ and tools/: 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: Jon Loeliger <jdl@freescale.com>

diff --git a/disk/part.c b/disk/part.c
index b0c909c..0e772ee 100644 (file)
--- a/disk/part.c
+++ b/disk/part.c
@@ -174,7 +174,7 @@ void dev_print (block_dev_desc_t *dev_desc)
                puts ("            Capacity: not available\n");
        }
 }
-#endif /* CFG_CMD_IDE || CFG_CMD_SCSI || CFG_CMD_USB || CONFIG_MMC */
+#endif
 
 #if (defined(CONFIG_CMD_IDE) || \
      defined(CONFIG_CMD_SCSI) || \

diff --git a/doc/README.JFFS2 b/doc/README.JFFS2
index 270da90..c5d67fd 100644 (file)
--- a/doc/README.JFFS2
+++ b/doc/README.JFFS2
@@ -2,7 +2,7 @@ JFFS2 options and usage.
 -----------------------
 
 JFFS2 in U-Boot is a read only implementation of the file system in
-Linux with the same name. To use JFFS2 define CFG_CMD_JFFS2.
+Linux with the same name. To use JFFS2 define CONFIG_CMD_JFFS2.
 
 The module adds three new commands.
 fsload  - load binary file from a file system image

diff --git a/doc/README.PIP405 b/doc/README.PIP405
index c5ccf18..610ff21 100644 (file)
--- a/doc/README.PIP405
+++ b/doc/README.PIP405
@@ -32,10 +32,8 @@ Changed files:
 - include/cmd_bsp.h            added PIP405 commands definitions
 - include/cmd_condefs.h                added Floppy and SCSI support
 - include/cmd_disk.h           changed to work with block device description
-- include/config_LANTEC.h      excluded CFG_CMD_FDC and CFG_CMD_SCSI from
-                               CONFIG_CMD_FULL
-- include/config_hymod.h       excluded CFG_CMD_FDC and CFG_CMD_SCSI from
-                               CONFIG_CMD_FULL
+- include/config_LANTEC.h      excluded CONFIG_CMD_FDC and CONFIG_CMD_SCSI
+- include/config_hymod.h       excluded CONFIG_CMD_FDC and CONFIG_CMD_SCSI
 - include/flash.h              added INTEL_ID_28F320C3T  0x88C488C4
 - include/i2c.h                        added "defined(CONFIG_PIP405)"
 - include/image.h              added IH_OS_U_BOOT, IH_TYPE_FIRMWARE
@@ -88,8 +86,8 @@ section "Changes".
 
 New Commands:
 -------------
-CFG_CMD_SCSI   SCSI Support
-CFG_CMF_FDC    Floppy disk support
+CONFIG_CMD_SCSI        SCSI Support
+CONFIG_CMF_FDC Floppy disk support
 
 IDE additions:
 --------------
@@ -172,8 +170,8 @@ Added Devices:
 Floppy support:
 ---------------
 Support of a standard floppy disk controller at address CFG_ISA_IO_BASE_ADDRESS
-+ 0x3F0. Enabled with define CFG_CMD_FDC. Reads a unformated floppy disk with a
-image header (see: mkimage). No interrupts and no DMA are used for this.
++ 0x3F0. Enabled with define CONFIG_CMD_FDC. Reads a unformated floppy disk
+with a image header (see: mkimage). No interrupts and no DMA are used for this.
 Added files:
 - common/cmd_fdc.c
 - include/cmd_fdc.h

diff --git a/doc/README.usb b/doc/README.usb
index 41f76f4..b3bcb91 100644 (file)
--- a/doc/README.usb
+++ b/doc/README.usb
@@ -73,8 +73,8 @@ Storage USB Commands:
 
 Config Switches:
 ----------------
-CFG_CMD_USB        enables basic USB support and the usb command
-CONFIG_USB_UHCI            defines the lowlevel part.A lowlevel part must be defined if
-                   using CFG_CMD_USB
+CONFIG_CMD_USB     enables basic USB support and the usb command
+CONFIG_USB_UHCI            defines the lowlevel part.A lowlevel part must be defined
+                   if using CONFIG_CMD_USB
 CONFIG_USB_KEYBOARD enables the USB Keyboard
 CONFIG_USB_STORAGE  enables the USB storage devices

diff --git a/lib_arm/board.c b/lib_arm/board.c
index e175607..8f4e19b 100644 (file)
--- a/lib_arm/board.c
+++ b/lib_arm/board.c
@@ -382,7 +382,7 @@ void start_armboot (void)
        if ((s = getenv ("bootfile")) != NULL) {
                copy_filename (BootFile, s, sizeof (BootFile));
        }
-#endif /* CFG_CMD_NET */
+#endif
 
 #ifdef BOARD_LATE_INIT
        board_late_init ();

diff --git a/lib_generic/crc32.c b/lib_generic/crc32.c
index da23336..df0dbca 100644 (file)
--- a/lib_generic/crc32.c
+++ b/lib_generic/crc32.c
@@ -9,7 +9,7 @@
  */
 
 #ifndef USE_HOSTCC     /* Shut down "ANSI does not permit..." warnings */
-#include <common.h>    /* to get command definitions like CFG_CMD_JFFS2 */
+#include <common.h>
 #endif
 
 #include "zlib.h"
@@ -196,4 +196,4 @@ uLong ZEXPORT crc32_no_comp(uLong crc, const Bytef *buf, uInt len)
     return crc;
 }
 
-#endif /* CFG_CMD_JFFS2 */
+#endif

diff --git a/lib_i386/board.c b/lib_i386/board.c
index 667d2da..47fbab4 100644 (file)
--- a/lib_i386/board.c
+++ b/lib_i386/board.c
@@ -352,7 +352,7 @@ void start_i386boot (void)
        if ((s = getenv ("bootfile")) != NULL) {
                copy_filename (BootFile, s, sizeof (BootFile));
        }
-#endif /* CFG_CMD_NET */
+#endif
 
        WATCHDOG_RESET();
 
@@ -360,7 +360,7 @@ void start_i386boot (void)
        WATCHDOG_RESET();
        puts("IDE:   ");
        ide_init();
-#endif /* CFG_CMD_IDE */
+#endif
 
 #if defined(CONFIG_CMD_SCSI)
        WATCHDOG_RESET();

diff --git a/lib_m68k/board.c b/lib_m68k/board.c
index b7e76b8..293fd04 100644 (file)
--- a/lib_m68k/board.c
+++ b/lib_m68k/board.c
@@ -624,7 +624,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
        if ((s = getenv ("bootfile")) != NULL) {
                copy_filename (BootFile, s, sizeof (BootFile));
        }
-#endif /* CFG_CMD_NET */
+#endif
 
        WATCHDOG_RESET ();
 

diff --git a/lib_mips/board.c b/lib_mips/board.c
index dd3d167..91ccec0 100644 (file)
--- a/lib_mips/board.c
+++ b/lib_mips/board.c
@@ -403,7 +403,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
        if ((s = getenv ("bootfile")) != NULL) {
                copy_filename (BootFile, s, sizeof (BootFile));
        }
-#endif /* CFG_CMD_NET */
+#endif
 
 #if defined(CONFIG_MISC_INIT_R)
        /* miscellaneous platform dependent initialisations */

diff --git a/lib_ppc/board.c b/lib_ppc/board.c
index 12ea473..8651cb3 100644 (file)
--- a/lib_ppc/board.c
+++ b/lib_ppc/board.c
@@ -982,7 +982,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
        if ((s = getenv ("bootfile")) != NULL) {
                copy_filename (BootFile, s, sizeof (BootFile));
        }
-#endif /* CFG_CMD_NET */
+#endif
 
        WATCHDOG_RESET ();
 
@@ -1051,7 +1051,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
 #else
        ide_init ();
 #endif
-#endif /* CFG_CMD_IDE */
+#endif
 
 #ifdef CONFIG_LAST_STAGE_INIT
        WATCHDOG_RESET ();

diff --git a/lib_ppc/kgdb.c b/lib_ppc/kgdb.c
index d272d3a..78c2f0c 100644 (file)
--- a/lib_ppc/kgdb.c
+++ b/lib_ppc/kgdb.c
@@ -323,4 +323,4 @@ kgdb_breakpoint(int argc, char *argv[])
            ");
 }
 
-#endif /* CFG_CMD_KGDB */
+#endif

diff --git a/tools/updater/cmd_flash.c b/tools/updater/cmd_flash.c
index 746bcbb..a976e0d 100644 (file)
--- a/tools/updater/cmd_flash.c
+++ b/tools/updater/cmd_flash.c
@@ -427,4 +427,4 @@ int flash_sect_protect (int p, ulong addr_first, ulong addr_last)
        return rcode;
 }
 
-#endif /* CFG_CMD_FLASH */
+#endif