powerpc: P1020UTM: Separate from P1_P2_RDB_P2 in Kconfig

[oweals/u-boot.git] / api / api_storage.c

diff --git a/api/api_storage.c b/api/api_storage.c
index 8c30c56e497a1ddf74c2510f7a5eec7c92cccd29..b5aaba1091e6d875eadb8bc5289f27e9bf14a5aa 100644 (file)
--- a/api/api_storage.c
+++ b/api/api_storage.c
@@ -41,7 +41,7 @@ struct stor_spec {
        char            *name;
 };
 
-static struct stor_spec specs[ENUM_MAX] = { { 0, 0, 0, 0, "" }, };
+static struct stor_spec specs[ENUM_MAX] = { { 0, 0, 0, 0, NULL }, };
 
 
 void dev_stor_init(void)
@@ -67,7 +67,7 @@ void dev_stor_init(void)
        specs[ENUM_SATA].type = DEV_TYP_STOR | DT_STOR_SATA;
        specs[ENUM_SATA].name = "sata";
 #endif
-#if defined(CONFIG_CMD_SCSI)
+#if defined(CONFIG_SCSI)
        specs[ENUM_SCSI].max_dev = CONFIG_SYS_SCSI_MAX_DEVICE;
        specs[ENUM_SCSI].enum_started = 0;
        specs[ENUM_SCSI].enum_ended = 0;
@@ -105,6 +105,10 @@ static int dev_stor_get(int type, int first, int *more, struct device_info *di)
 
        struct blk_desc *dd;
 
+       /* Wasn't configured for this type, return 0 directly */
+       if (specs[type].name == NULL)
+               return 0;
+
        if (first) {
                di->cookie = (void *)blk_get_dev(specs[type].name, 0);
                if (di->cookie == NULL)