Cleanup USB and partition defines

diff --git a/CHANGELOG b/CHANGELOG
index e655482e1fd0a24467b9bfc718c7d5bd4ef1b4ab..413e04f9939e0d367d40b9ac312bff2a843b5447 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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

diff --git a/common/cmd_usb.c b/common/cmd_usb.c
index 0bf050b14dfc03b9c25972c682cbece522454c7b..25a3cc4111097d56ac0b8be07638abdd787abb21 100644 (file)
--- 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)){

diff --git a/disk/part.c b/disk/part.c
index 0e9ddbd9f82cc209f295413f60af0fd980ef5438..2255e726cf5c687994e7e7d7c138413bc2acd374 100644 (file)
--- 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) )
 
 /* ------------------------------------------------------------------------- */
 /*

diff --git a/disk/part_amiga.c b/disk/part_amiga.c
index 07b32107d600e4e36f73a3d9331b7bc1d1185d61..41e68fcf0b4216f4c41750280ac3a567280ec9c8 100644 (file)
--- 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
 

diff --git a/disk/part_dos.c b/disk/part_dos.c
index 49d4fc1115a7fe7436b6b1fab51222cd83b54760..a37c32d9e2e2af2c41f227670c0903f6f1bc7cd5 100644 (file)
--- 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
  */

diff --git a/disk/part_iso.c b/disk/part_iso.c
index ff3e4d9670484f2114f4be7fb1db00d90e8fbe5f..ee8c7c6f29b4d57a456ff77e42e2831d9a5e4a88 100644 (file)
--- 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)

diff --git a/disk/part_mac.c b/disk/part_mac.c
index 6e055af9155fe36b52b17b0f2184abbcb67e31fb..8c23e211f9cf4d9d9f6953bfc37c2e20432f0c8b 100644 (file)
--- 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

diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h
index da2e37d21b53e0916a2efd72192a4b5489117bc2..e272f715d3b4a5abda53a4ff43a8b99f2120783c 100644 (file)
--- 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 */