diff options
| author | Rafal Jaworowski <raj@semihalf.com> | 2008-07-28 20:38:25 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-07-30 01:01:28 +0200 |
| commit | 8d87589e8e874df7120a3d9667f051bc33bac250 (patch) | |
| tree | 8ee4d94e214d59975feafe1280653f2f8266b7b3 /api | |
| parent | 6b73b754f782e1ecce5048bf20b22ce56a07a5b8 (diff) | |
| download | u-boot-imx-8d87589e8e874df7120a3d9667f051bc33bac250.zip u-boot-imx-8d87589e8e874df7120a3d9667f051bc33bac250.tar.gz u-boot-imx-8d87589e8e874df7120a3d9667f051bc33bac250.tar.bz2 | |
API: Teach the storage layer about SATA and MMC options.
Signed-off-by: Rafal Czubak <rcz@semihalf.com>
Acked-by: Rafal Jaworowski <raj@semihalf.com>
Diffstat (limited to 'api')
| -rw-r--r-- | api/api_storage.c | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/api/api_storage.c b/api/api_storage.c index 874c538..74391a5 100644 --- a/api/api_storage.c +++ b/api/api_storage.c @@ -46,7 +46,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; @@ -68,12 +69,19 @@ void dev_stor_init(void) 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 = CFG_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].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; @@ -82,6 +90,13 @@ void dev_stor_init(void) 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 } /* |