Commit 1968e615d4092f728f4732a0b148ded6d1caa731
1 parent
151ab83a93
Exists in
master
and in
54 other branches
Cleanup USB and partition defines
Showing 8 changed files with 27 additions and 6 deletions Side-by-side Diff
CHANGELOG
| ... | ... | @@ -2,6 +2,8 @@ |
| 2 | 2 | Changes for U-Boot 1.1.3: |
| 3 | 3 | ====================================================================== |
| 4 | 4 | |
| 5 | +* Cleanup USB and partition defines | |
| 6 | + | |
| 5 | 7 | * Add support for ext2 filesystems and image timestamps to TQM5200 board |
| 6 | 8 | |
| 7 | 9 | * Add reset code for Coral-P on INKA4x0 board |
common/cmd_usb.c
| ... | ... | @@ -32,7 +32,9 @@ |
| 32 | 32 | |
| 33 | 33 | #include <usb.h> |
| 34 | 34 | |
| 35 | +#ifdef CONFIG_USB_STORAGE | |
| 35 | 36 | static int usb_stor_curr_dev=-1; /* current device */ |
| 37 | +#endif | |
| 36 | 38 | |
| 37 | 39 | /* some display routines (info command) */ |
| 38 | 40 | char * usb_get_class_desc(unsigned char dclass) |
| 39 | 41 | |
| ... | ... | @@ -441,7 +443,9 @@ |
| 441 | 443 | |
| 442 | 444 | int i; |
| 443 | 445 | struct usb_device *dev = NULL; |
| 446 | +#ifdef CONFIG_USB_STORAGE | |
| 444 | 447 | block_dev_desc_t *stor_dev; |
| 448 | +#endif | |
| 445 | 449 | |
| 446 | 450 | if ((strncmp(argv[1],"reset",5) == 0) || |
| 447 | 451 | (strncmp(argv[1],"start",5) == 0)){ |
disk/part.c
| ... | ... | @@ -36,7 +36,8 @@ |
| 36 | 36 | #if ((CONFIG_COMMANDS & CFG_CMD_IDE) || \ |
| 37 | 37 | (CONFIG_COMMANDS & CFG_CMD_SCSI) || \ |
| 38 | 38 | (CONFIG_COMMANDS & CFG_CMD_USB) || \ |
| 39 | - (CONFIG_MMC) || (CONFIG_SYSTEMACE) ) | |
| 39 | + defined(CONFIG_MMC) || \ | |
| 40 | + defined(CONFIG_SYSTEMACE) ) | |
| 40 | 41 | |
| 41 | 42 | /* ------------------------------------------------------------------------- */ |
| 42 | 43 | /* |
disk/part_amiga.c
| ... | ... | @@ -26,7 +26,11 @@ |
| 26 | 26 | #include <ide.h> |
| 27 | 27 | #include "part_amiga.h" |
| 28 | 28 | |
| 29 | -#if ((CONFIG_COMMANDS & CFG_CMD_IDE) || (CONFIG_COMMANDS & CFG_CMD_SCSI)) && defined(CONFIG_AMIGA_PARTITION) | |
| 29 | +#if ((CONFIG_COMMANDS & CFG_CMD_IDE) || \ | |
| 30 | + (CONFIG_COMMANDS & CFG_CMD_SCSI) || \ | |
| 31 | + (CONFIG_COMMANDS & CFG_CMD_USB) || \ | |
| 32 | + defined(CONFIG_MMC) || \ | |
| 33 | + defined(CONFIG_SYSTEMACE) ) && defined(CONFIG_AMIGA_PARTITION) | |
| 30 | 34 | |
| 31 | 35 | #undef AMIGA_DEBUG |
| 32 | 36 |
disk/part_dos.c
| ... | ... | @@ -38,7 +38,8 @@ |
| 38 | 38 | #if ((CONFIG_COMMANDS & CFG_CMD_IDE) || \ |
| 39 | 39 | (CONFIG_COMMANDS & CFG_CMD_SCSI) || \ |
| 40 | 40 | (CONFIG_COMMANDS & CFG_CMD_USB) || \ |
| 41 | - (CONFIG_SYSTEMACE)) && defined(CONFIG_DOS_PARTITION) | |
| 41 | + defined(CONFIG_MMC) || \ | |
| 42 | + defined(CONFIG_SYSTEMACE) ) && defined(CONFIG_DOS_PARTITION) | |
| 42 | 43 | |
| 43 | 44 | /* Convert char[4] in little endian format to the host format integer |
| 44 | 45 | */ |
disk/part_iso.c
| ... | ... | @@ -25,9 +25,13 @@ |
| 25 | 25 | #include <command.h> |
| 26 | 26 | #include "part_iso.h" |
| 27 | 27 | |
| 28 | -#if ((CONFIG_COMMANDS & CFG_CMD_IDE) || (CONFIG_COMMANDS & CFG_CMD_SCSI)) && defined(CONFIG_ISO_PARTITION) | |
| 28 | +#if ((CONFIG_COMMANDS & CFG_CMD_IDE) || \ | |
| 29 | + (CONFIG_COMMANDS & CFG_CMD_SCSI) || \ | |
| 30 | + (CONFIG_COMMANDS & CFG_CMD_USB) || \ | |
| 31 | + defined(CONFIG_MMC) || \ | |
| 32 | + defined(CONFIG_SYSTEMACE) ) && defined(CONFIG_ISO_PARTITION) | |
| 29 | 33 | |
| 30 | -#undef ISO_PART_DEBUG | |
| 34 | +/* #define ISO_PART_DEBUG */ | |
| 31 | 35 | |
| 32 | 36 | #ifdef ISO_PART_DEBUG |
| 33 | 37 | #define PRINTF(fmt,args...) printf (fmt ,##args) |
disk/part_mac.c
| ... | ... | @@ -34,7 +34,11 @@ |
| 34 | 34 | #include <ide.h> |
| 35 | 35 | #include "part_mac.h" |
| 36 | 36 | |
| 37 | -#if ((CONFIG_COMMANDS & CFG_CMD_IDE) || (CONFIG_COMMANDS & CFG_CMD_SCSI)) && defined(CONFIG_MAC_PARTITION) | |
| 37 | +#if ((CONFIG_COMMANDS & CFG_CMD_IDE) || \ | |
| 38 | + (CONFIG_COMMANDS & CFG_CMD_SCSI) || \ | |
| 39 | + (CONFIG_COMMANDS & CFG_CMD_USB) || \ | |
| 40 | + defined(CONFIG_MMC) || \ | |
| 41 | + defined(CONFIG_SYSTEMACE) ) && defined(CONFIG_MAC_PARTITION) | |
| 38 | 42 | |
| 39 | 43 | /* stdlib.h causes some compatibility problems; should fixe these! -- wd */ |
| 40 | 44 | #ifndef __ldiv_t_defined |