at91rm9200ek: add configure target for RAM boot

[karo-tx-uboot.git] / api / api_storage.c

diff --git a/api/api_storage.c b/api/api_storage.c
index 74391a59d083108ed4c19b6b34dd1e095f82489a..c53571296f7d791c2e068982408d1ed0050a4b5c 100644 (file)
--- a/api/api_storage.c
+++ b/api/api_storage.c
@@ -24,12 +24,13 @@
  */
 
 #include <config.h>
-
-#if defined(CONFIG_API)
-
 #include <common.h>
 #include <api_public.h>
 
+#if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_STORAGE)
+#include <usb.h>
+#endif
+
 #define DEBUG
 #undef DEBUG
 
@@ -63,28 +64,28 @@ 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_MMC)
-       specs[ENUM_MMC].max_dev = CFG_MMC_MAX_DEVICE;
+       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 = CFG_SATA_MAX_DEVICE;
+       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;
@@ -387,5 +388,3 @@ lbasize_t dev_read_stor(void *cookie, void *buf, lbasize_t len, lbastart_t start
 
        return (dd->block_read(dev_stor_index(dd), start, len, buf));
 }
-
-#endif /* CONFIG_API */