NAND: Allow NAND and OneNAND to coexist

[people/ms/u-boot.git] / disk / part_dos.c

diff --git a/disk/part_dos.c b/disk/part_dos.c
index 133ee7988343aa0e130a19232c0f8933a86143dc..4d778ec5b24b69fad5ae6a4829e8bb4f58ce1cbd 100644 (file)
--- a/disk/part_dos.c
+++ b/disk/part_dos.c
@@ -35,9 +35,10 @@
 #include <ide.h>
 #include "part_dos.h"
 
-#if ((CONFIG_COMMANDS & CFG_CMD_IDE)   || \
-     (CONFIG_COMMANDS & CFG_CMD_SCSI)  || \
-     (CONFIG_COMMANDS & CFG_CMD_USB)   || \
+#if (defined(CONFIG_CMD_IDE) || \
+     defined(CONFIG_CMD_SATA) || \
+     defined(CONFIG_CMD_SCSI) || \
+     defined(CONFIG_CMD_USB) || \
      defined(CONFIG_MMC) || \
      defined(CONFIG_SYSTEMACE) ) && defined(CONFIG_DOS_PARTITION)
 
@@ -194,6 +195,7 @@ static int get_partition_info_extended (block_dev_desc_t *dev_desc, int ext_part
                        info->size  = le32_to_int (pt->size4);
                        switch(dev_desc->if_type) {
                                case IF_TYPE_IDE:
+                               case IF_TYPE_SATA:
                                case IF_TYPE_ATAPI:
                                        sprintf ((char *)info->name, "hd%c%d\n", 'a' + dev_desc->dev, part_num);
                                        break;
@@ -248,4 +250,4 @@ int get_partition_info_dos (block_dev_desc_t *dev_desc, int part, disk_partition
 }
 
 
-#endif /* (CONFIG_COMMANDS & CFG_CMD_IDE) && CONFIG_DOS_PARTITION */
+#endif