Cleanup USB and partition defines

19 years ago · 1968e615d4
parent 151ab83a93
commit 1968e615d4
8 changed files with 27 additions and 6 deletions
--- a/2
+++ b/2
@ -2,6 +2,8 @@
 Changes for U-Boot 1.1.3:
 ======================================================================

+* Cleanup USB and partition defines
+
 * Add support for ext2 filesystems and image timestamps to TQM5200 board

 * Add reset code for Coral-P on INKA4x0 board
--- a/common/cmd_usb.c
+++ b/common/cmd_usb.c
@ -32,7 +32,9 @@

 #include <usb.h>

+#ifdef CONFIG_USB_STORAGE
 static int usb_stor_curr_dev=-1; /* current device */
+#endif

 /* some display routines (info command) */
 char * usb_get_class_desc(unsigned char dclass)
@ -441,7 +443,9 @@ int do_usb (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])

 	int i;
 	struct usb_device *dev = NULL;
+#ifdef CONFIG_USB_STORAGE
 	block_dev_desc_t *stor_dev;
+#endif

 	if ((strncmp(argv[1],"reset",5) == 0) ||
 		 (strncmp(argv[1],"start",5) == 0)){
--- a/disk/part.c
+++ b/disk/part.c
@ -36,7 +36,8 @@
 #if ((CONFIG_COMMANDS & CFG_CMD_IDE)	|| \
     (CONFIG_COMMANDS & CFG_CMD_SCSI)	|| \
     (CONFIG_COMMANDS & CFG_CMD_USB)	|| \
-     (CONFIG_MMC) || (CONFIG_SYSTEMACE) )
+     defined(CONFIG_MMC) || \
+     defined(CONFIG_SYSTEMACE) )

 /* ------------------------------------------------------------------------- */
 /*
--- a/disk/part_amiga.c
+++ b/disk/part_amiga.c
@ -26,7 +26,11 @@
 #include <ide.h>
 #include "part_amiga.h"

-#if ((CONFIG_COMMANDS & CFG_CMD_IDE) || (CONFIG_COMMANDS & CFG_CMD_SCSI)) && defined(CONFIG_AMIGA_PARTITION)
+#if ((CONFIG_COMMANDS & CFG_CMD_IDE)	|| \
+     (CONFIG_COMMANDS & CFG_CMD_SCSI)	|| \
+     (CONFIG_COMMANDS & CFG_CMD_USB)	|| \
+     defined(CONFIG_MMC) || \
+     defined(CONFIG_SYSTEMACE) ) && defined(CONFIG_AMIGA_PARTITION)

 #undef AMIGA_DEBUG

--- a/disk/part_dos.c
+++ b/disk/part_dos.c
@ -38,7 +38,8 @@
 #if ((CONFIG_COMMANDS & CFG_CMD_IDE)	|| \
     (CONFIG_COMMANDS & CFG_CMD_SCSI)	|| \
     (CONFIG_COMMANDS & CFG_CMD_USB)	|| \
-     (CONFIG_SYSTEMACE)) && defined(CONFIG_DOS_PARTITION)
+     defined(CONFIG_MMC) || \
+     defined(CONFIG_SYSTEMACE) ) && defined(CONFIG_DOS_PARTITION)

 /* Convert char[4] in little endian format to the host format integer
 */
--- a/disk/part_iso.c
+++ b/disk/part_iso.c
@ -25,9 +25,13 @@
 #include <command.h>
 #include "part_iso.h"

-#if ((CONFIG_COMMANDS & CFG_CMD_IDE) || (CONFIG_COMMANDS & CFG_CMD_SCSI)) && defined(CONFIG_ISO_PARTITION)
+#if ((CONFIG_COMMANDS & CFG_CMD_IDE)	|| \
+     (CONFIG_COMMANDS & CFG_CMD_SCSI)	|| \
+     (CONFIG_COMMANDS & CFG_CMD_USB)	|| \
+     defined(CONFIG_MMC) || \
+     defined(CONFIG_SYSTEMACE) ) && defined(CONFIG_ISO_PARTITION)

-#undef	ISO_PART_DEBUG
+/* #define	ISO_PART_DEBUG */

 #ifdef	ISO_PART_DEBUG
 #define	PRINTF(fmt,args...)	printf (fmt ,##args)
--- a/disk/part_mac.c
+++ b/disk/part_mac.c
@ -34,7 +34,11 @@
 #include <ide.h>
 #include "part_mac.h"

-#if ((CONFIG_COMMANDS & CFG_CMD_IDE) || (CONFIG_COMMANDS & CFG_CMD_SCSI)) && defined(CONFIG_MAC_PARTITION)
+#if ((CONFIG_COMMANDS & CFG_CMD_IDE)	|| \
+     (CONFIG_COMMANDS & CFG_CMD_SCSI)	|| \
+     (CONFIG_COMMANDS & CFG_CMD_USB)	|| \
+     defined(CONFIG_MMC) || \
+     defined(CONFIG_SYSTEMACE) ) && defined(CONFIG_MAC_PARTITION)

 /* stdlib.h causes some compatibility problems; should fixe these! -- wd */
 #ifndef __ldiv_t_defined
--- a/include/configs/inka4x0.h
+++ b/include/configs/inka4x0.h
@ -269,5 +269,6 @@
 #define CONFIG_USB_OHCI
 #define CONFIG_USB_CLOCK	0x00015555
 #define CONFIG_USB_CONFIG	0x00001000
+#define CONFIG_USB_STORAGE

 #endif /* __CONFIG_H */