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>
This commit is contained in:
Jon Loeliger
parent
ddb5d86f02
commit
b3aff0cb9e
|
|
@ -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) || \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 ();
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -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 ();
|
||||
|
||||
|
|
|
|||
|
|
@ -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 */
|
||||
|
|
|
|||
|
|
@ -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 ();
|
||||
|
|
|
|||
|
|
@ -323,4 +323,4 @@ kgdb_breakpoint(int argc, char *argv[])
|
|||
");
|
||||
}
|
||||
|
||||
#endif /* CFG_CMD_KGDB */
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -427,4 +427,4 @@ int flash_sect_protect (int p, ulong addr_first, ulong addr_last)
|
|||
return rcode;
|
||||
}
|
||||
|
||||
#endif /* CFG_CMD_FLASH */
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue