diff options
Diffstat (limited to 'disk')
| -rw-r--r-- | disk/part.c | 3 | ||||
| -rw-r--r-- | disk/part_amiga.c | 6 | ||||
| -rw-r--r-- | disk/part_dos.c | 3 | ||||
| -rw-r--r-- | disk/part_iso.c | 8 | ||||
| -rw-r--r-- | disk/part_mac.c | 6 | 
5 files changed, 20 insertions, 6 deletions
| diff --git a/disk/part.c b/disk/part.c index 0e9ddbd9f..2255e726c 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) )  /* ------------------------------------------------------------------------- */  /* diff --git a/disk/part_amiga.c b/disk/part_amiga.c index 07b32107d..41e68fcf0 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 diff --git a/disk/part_dos.c b/disk/part_dos.c index 49d4fc111..a37c32d9e 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   */ diff --git a/disk/part_iso.c b/disk/part_iso.c index ff3e4d967..ee8c7c6f2 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) diff --git a/disk/part_mac.c b/disk/part_mac.c index 6e055af91..8c23e211f 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 |