Merge branch 'master' of git://git.denx.de/u-boot-mips

[platform/kernel/u-boot.git] / api / api_storage.c

diff --git a/api/api_storage.c b/api/api_storage.c
index 874c538..6fac98b 100644 (file)
--- a/api/api_storage.c
+++ b/api/api_storage.c
@@ -30,6 +30,10 @@
 #include <common.h>
 #include <api_public.h>
 
+#if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_STORAGE)
+#include <usb.h>
+#endif
+
 #define DEBUG
 #undef DEBUG
 
@@ -46,7 +50,8 @@
 #define ENUM_USB       1
 #define ENUM_SCSI      2
 #define ENUM_MMC       3
-#define ENUM_MAX       4
+#define ENUM_SATA      4
+#define ENUM_MAX       5
 
 struct stor_spec {
        int             max_dev;
@@ -62,26 +67,40 @@ static struct stor_spec specs[ENUM_MAX] = { { 0, 0, 0, 0, "" }, };
 void dev_stor_init(void)
 {
 #if defined(CONFIG_CMD_IDE)
-       specs[ENUM_IDE].max_dev = CFG_IDE_MAXDEVICE;
+       specs[ENUM_IDE].max_dev = CONFIG_SYS_IDE_MAXDEVICE;
        specs[ENUM_IDE].enum_started = 0;
        specs[ENUM_IDE].enum_ended = 0;
        specs[ENUM_IDE].type = DEV_TYP_STOR | DT_STOR_IDE;
        specs[ENUM_IDE].name = "ide";
 #endif
-#if defined(CONFIG_CMD_USB)
-       specs[ENUM_USB].max_dev = USB_MAX_STOR_DEV;
-       specs[ENUM_USB].enum_started = 0;
-       specs[ENUM_USB].enum_ended = 0;
-       specs[ENUM_USB].type = DEV_TYP_STOR | DT_STOR_USB;
-       specs[ENUM_USB].name = "usb";
+#if defined(CONFIG_CMD_MMC)
+       specs[ENUM_MMC].max_dev = CONFIG_SYS_MMC_MAX_DEVICE;
+       specs[ENUM_MMC].enum_started = 0;
+       specs[ENUM_MMC].enum_ended = 0;
+       specs[ENUM_MMC].type = DEV_TYP_STOR | DT_STOR_MMC;
+       specs[ENUM_MMC].name = "mmc";
+#endif
+#if defined(CONFIG_CMD_SATA)
+       specs[ENUM_SATA].max_dev = CONFIG_SYS_SATA_MAX_DEVICE;
+       specs[ENUM_SATA].enum_started = 0;
+       specs[ENUM_SATA].enum_ended = 0;
+       specs[ENUM_SATA].type = DEV_TYP_STOR | DT_STOR_SATA;
+       specs[ENUM_SATA].name = "sata";
 #endif
 #if defined(CONFIG_CMD_SCSI)
-       specs[ENUM_SCSI].max_dev = CFG_SCSI_MAX_DEVICE;
+       specs[ENUM_SCSI].max_dev = CONFIG_SYS_SCSI_MAX_DEVICE;
        specs[ENUM_SCSI].enum_started = 0;
        specs[ENUM_SCSI].enum_ended = 0;
        specs[ENUM_SCSI].type = DEV_TYP_STOR | DT_STOR_SCSI;
        specs[ENUM_SCSI].name = "scsi";
 #endif
+#if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_STORAGE)
+       specs[ENUM_USB].max_dev = USB_MAX_STOR_DEV;
+       specs[ENUM_USB].enum_started = 0;
+       specs[ENUM_USB].enum_ended = 0;
+       specs[ENUM_USB].type = DEV_TYP_STOR | DT_STOR_USB;
+       specs[ENUM_USB].name = "usb";
+#endif
 }
 
 /*