Commit b3aff0cb9ecf236d7e8c93761dd1dadf6837a582
1 parent
ddb5d86f02
Exists in
master
and in
54 other branches
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>
Showing 12 changed files with 22 additions and 24 deletions Side-by-side Diff
disk/part.c
doc/README.JFFS2
| ... | ... | @@ -2,7 +2,7 @@ |
| 2 | 2 | ----------------------- |
| 3 | 3 | |
| 4 | 4 | JFFS2 in U-Boot is a read only implementation of the file system in |
| 5 | -Linux with the same name. To use JFFS2 define CFG_CMD_JFFS2. | |
| 5 | +Linux with the same name. To use JFFS2 define CONFIG_CMD_JFFS2. | |
| 6 | 6 | |
| 7 | 7 | The module adds three new commands. |
| 8 | 8 | fsload - load binary file from a file system image |
doc/README.PIP405
| ... | ... | @@ -32,10 +32,8 @@ |
| 32 | 32 | - include/cmd_bsp.h added PIP405 commands definitions |
| 33 | 33 | - include/cmd_condefs.h added Floppy and SCSI support |
| 34 | 34 | - include/cmd_disk.h changed to work with block device description |
| 35 | -- include/config_LANTEC.h excluded CFG_CMD_FDC and CFG_CMD_SCSI from | |
| 36 | - CONFIG_CMD_FULL | |
| 37 | -- include/config_hymod.h excluded CFG_CMD_FDC and CFG_CMD_SCSI from | |
| 38 | - CONFIG_CMD_FULL | |
| 35 | +- include/config_LANTEC.h excluded CONFIG_CMD_FDC and CONFIG_CMD_SCSI | |
| 36 | +- include/config_hymod.h excluded CONFIG_CMD_FDC and CONFIG_CMD_SCSI | |
| 39 | 37 | - include/flash.h added INTEL_ID_28F320C3T 0x88C488C4 |
| 40 | 38 | - include/i2c.h added "defined(CONFIG_PIP405)" |
| 41 | 39 | - include/image.h added IH_OS_U_BOOT, IH_TYPE_FIRMWARE |
| ... | ... | @@ -88,8 +86,8 @@ |
| 88 | 86 | |
| 89 | 87 | New Commands: |
| 90 | 88 | ------------- |
| 91 | -CFG_CMD_SCSI SCSI Support | |
| 92 | -CFG_CMF_FDC Floppy disk support | |
| 89 | +CONFIG_CMD_SCSI SCSI Support | |
| 90 | +CONFIG_CMF_FDC Floppy disk support | |
| 93 | 91 | |
| 94 | 92 | IDE additions: |
| 95 | 93 | -------------- |
| ... | ... | @@ -172,8 +170,8 @@ |
| 172 | 170 | Floppy support: |
| 173 | 171 | --------------- |
| 174 | 172 | Support of a standard floppy disk controller at address CFG_ISA_IO_BASE_ADDRESS |
| 175 | -+ 0x3F0. Enabled with define CFG_CMD_FDC. Reads a unformated floppy disk with a | |
| 176 | -image header (see: mkimage). No interrupts and no DMA are used for this. | |
| 173 | ++ 0x3F0. Enabled with define CONFIG_CMD_FDC. Reads a unformated floppy disk | |
| 174 | +with a image header (see: mkimage). No interrupts and no DMA are used for this. | |
| 177 | 175 | Added files: |
| 178 | 176 | - common/cmd_fdc.c |
| 179 | 177 | - include/cmd_fdc.h |
doc/README.usb
| ... | ... | @@ -73,9 +73,9 @@ |
| 73 | 73 | |
| 74 | 74 | Config Switches: |
| 75 | 75 | ---------------- |
| 76 | -CFG_CMD_USB enables basic USB support and the usb command | |
| 77 | -CONFIG_USB_UHCI defines the lowlevel part.A lowlevel part must be defined if | |
| 78 | - using CFG_CMD_USB | |
| 76 | +CONFIG_CMD_USB enables basic USB support and the usb command | |
| 77 | +CONFIG_USB_UHCI defines the lowlevel part.A lowlevel part must be defined | |
| 78 | + if using CONFIG_CMD_USB | |
| 79 | 79 | CONFIG_USB_KEYBOARD enables the USB Keyboard |
| 80 | 80 | CONFIG_USB_STORAGE enables the USB storage devices |
lib_arm/board.c
lib_generic/crc32.c
| ... | ... | @@ -9,7 +9,7 @@ |
| 9 | 9 | */ |
| 10 | 10 | |
| 11 | 11 | #ifndef USE_HOSTCC /* Shut down "ANSI does not permit..." warnings */ |
| 12 | -#include <common.h> /* to get command definitions like CFG_CMD_JFFS2 */ | |
| 12 | +#include <common.h> | |
| 13 | 13 | #endif |
| 14 | 14 | |
| 15 | 15 | #include "zlib.h" |
| ... | ... | @@ -196,5 +196,5 @@ |
| 196 | 196 | return crc; |
| 197 | 197 | } |
| 198 | 198 | |
| 199 | -#endif /* CFG_CMD_JFFS2 */ | |
| 199 | +#endif |
lib_i386/board.c
| ... | ... | @@ -352,7 +352,7 @@ |
| 352 | 352 | if ((s = getenv ("bootfile")) != NULL) { |
| 353 | 353 | copy_filename (BootFile, s, sizeof (BootFile)); |
| 354 | 354 | } |
| 355 | -#endif /* CFG_CMD_NET */ | |
| 355 | +#endif | |
| 356 | 356 | |
| 357 | 357 | WATCHDOG_RESET(); |
| 358 | 358 | |
| ... | ... | @@ -360,7 +360,7 @@ |
| 360 | 360 | WATCHDOG_RESET(); |
| 361 | 361 | puts("IDE: "); |
| 362 | 362 | ide_init(); |
| 363 | -#endif /* CFG_CMD_IDE */ | |
| 363 | +#endif | |
| 364 | 364 | |
| 365 | 365 | #if defined(CONFIG_CMD_SCSI) |
| 366 | 366 | WATCHDOG_RESET(); |
lib_m68k/board.c
lib_mips/board.c
lib_ppc/board.c
| ... | ... | @@ -982,7 +982,7 @@ |
| 982 | 982 | if ((s = getenv ("bootfile")) != NULL) { |
| 983 | 983 | copy_filename (BootFile, s, sizeof (BootFile)); |
| 984 | 984 | } |
| 985 | -#endif /* CFG_CMD_NET */ | |
| 985 | +#endif | |
| 986 | 986 | |
| 987 | 987 | WATCHDOG_RESET (); |
| 988 | 988 | |
| ... | ... | @@ -1051,7 +1051,7 @@ |
| 1051 | 1051 | #else |
| 1052 | 1052 | ide_init (); |
| 1053 | 1053 | #endif |
| 1054 | -#endif /* CFG_CMD_IDE */ | |
| 1054 | +#endif | |
| 1055 | 1055 | |
| 1056 | 1056 | #ifdef CONFIG_LAST_STAGE_INIT |
| 1057 | 1057 | WATCHDOG_RESET (); |
lib_ppc/kgdb.c
tools/updater/cmd_flash.c