commit acd05367c6feaf6971f8239c08893e50750515b1
author wdenk <wdenk> Thu Feb 24 23:23:29 2005 +0000
committer wdenk <wdenk> Thu Feb 24 23:23:29 2005 +0000
tree 66de94197932c86badc51db7f7ba9b17a8640e1a
parent 99408bad05c2face60c411efc710b3ca6e0c5892

Cleanup USB and partition defines

disk/part.c

diff --git a/disk/part.c b/disk/part.c
index 0e9ddbd..2255e72 100644
--- 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) )
 
 /* ------------------------------------------------------------------------- */
 /*

disk/part_amiga.c

diff --git a/disk/part_amiga.c b/disk/part_amiga.c
index 07b3210..41e68fc 100644
--- 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
 

disk/part_dos.c

diff --git a/disk/part_dos.c b/disk/part_dos.c
index 49d4fc1..a37c32d 100644
--- 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
  */

disk/part_iso.c

diff --git a/disk/part_iso.c b/disk/part_iso.c
index ff3e4d9..ee8c7c6 100644
--- 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)

disk/part_mac.c

diff --git a/disk/part_mac.c b/disk/part_mac.c
index 6e055af..8c23e21 100644
--- 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