Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-17 18:34:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

usb: storage: s/CONFIG_BLK/CONFIG_IS_ENABLED(BLK)/

Browse source 
This fixes link issues when building the SPL without USB driver model
but with USB storage support. CONFIG_BLK can be enabled and disabled
independently for SPL and non-SPL builds. We leverage that existing
functionality here.

Signed-off-by: Sven Schwermer <sven@svenschwermer.de>
This commit is contained in:
Sven Schwermer 2018-11-21 08:43:57 +01:00 • committed by Marek Vasut
parent fd09c205fc
commit 1af9bfd334
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
common/usb_storage.c
View file

@ -66,7 +66,7 @@ static __u32 CBWTag;
static int usb_max_devs; /* number of highest available usb device */ static int usb_max_devs; /* number of highest available usb device */
#ifndef CONFIG_BLK #if !CONFIG_IS_ENABLED(BLK)
static struct blk_desc usb_dev_desc[USB_MAX_STOR_DEV]; static struct blk_desc usb_dev_desc[USB_MAX_STOR_DEV];
#endif #endif
@ -99,7 +99,7 @@ struct us_data {
unsigned short max_xfer_blk; /* maximum transfer blocks */ unsigned short max_xfer_blk; /* maximum transfer blocks */
}; };
#ifndef CONFIG_BLK #if !CONFIG_IS_ENABLED(BLK)
static struct us_data usb_stor[USB_MAX_STOR_DEV]; static struct us_data usb_stor[USB_MAX_STOR_DEV];
#endif #endif
@ -111,7 +111,7 @@ int usb_stor_get_info(struct usb_device *dev, struct us_data *us,
struct blk_desc *dev_desc); struct blk_desc *dev_desc);
int usb_storage_probe(struct usb_device *dev, unsigned int ifnum, int usb_storage_probe(struct usb_device *dev, unsigned int ifnum,
struct us_data *ss); struct us_data *ss);
#ifdef CONFIG_BLK #if CONFIG_IS_ENABLED(BLK)
static unsigned long usb_stor_read(struct udevice *dev, lbaint_t blknr, static unsigned long usb_stor_read(struct udevice *dev, lbaint_t blknr,
lbaint_t blkcnt, void *buffer); lbaint_t blkcnt, void *buffer);
static unsigned long usb_stor_write(struct udevice *dev, lbaint_t blknr, static unsigned long usb_stor_write(struct udevice *dev, lbaint_t blknr,
@ -136,7 +136,7 @@ static void usb_show_progress(void)
int usb_stor_info(void) int usb_stor_info(void)
{ {
int count = 0; int count = 0;
#ifdef CONFIG_BLK #if CONFIG_IS_ENABLED(BLK)
struct udevice *dev; struct udevice *dev;
for (blk_first_device(IF_TYPE_USB, &dev); for (blk_first_device(IF_TYPE_USB, &dev);
@ -186,7 +186,7 @@ static int usb_stor_probe_device(struct usb_device *udev)
{ {
int lun, max_lun; int lun, max_lun;
#ifdef CONFIG_BLK #if CONFIG_IS_ENABLED(BLK)
struct us_data *data; struct us_data *data;
int ret; int ret;
#else #else
@ -197,7 +197,7 @@ static int usb_stor_probe_device(struct usb_device *udev)
#endif #endif
debug("\n\nProbing for storage\n"); debug("\n\nProbing for storage\n");
#ifdef CONFIG_BLK #if CONFIG_IS_ENABLED(BLK)
/* /*
* We store the us_data in the mass storage device's platdata. It * We store the us_data in the mass storage device's platdata. It
* is shared by all LUNs (block devices) attached to this mass storage * is shared by all LUNs (block devices) attached to this mass storage
@ -1119,7 +1119,7 @@ static void usb_bin_fixup(struct usb_device_descriptor descriptor,
} }
#endif /* CONFIG_USB_BIN_FIXUP */ #endif /* CONFIG_USB_BIN_FIXUP */
#ifdef CONFIG_BLK #if CONFIG_IS_ENABLED(BLK)
static unsigned long usb_stor_read(struct udevice *dev, lbaint_t blknr, static unsigned long usb_stor_read(struct udevice *dev, lbaint_t blknr,
lbaint_t blkcnt, void *buffer) lbaint_t blkcnt, void *buffer)
#else #else
@ -1134,14 +1134,14 @@ static unsigned long usb_stor_read(struct blk_desc *block_dev, lbaint_t blknr,
struct us_data *ss; struct us_data *ss;
int retry; int retry;
struct scsi_cmd *srb = &usb_ccb; struct scsi_cmd *srb = &usb_ccb;
#ifdef CONFIG_BLK #if CONFIG_IS_ENABLED(BLK)
struct blk_desc *block_dev; struct blk_desc *block_dev;
#endif #endif
if (blkcnt == 0) if (blkcnt == 0)
return 0; return 0;
/* Setup device */ /* Setup device */
#ifdef CONFIG_BLK #if CONFIG_IS_ENABLED(BLK)
block_dev = dev_get_uclass_platdata(dev); block_dev = dev_get_uclass_platdata(dev);
udev = dev_get_parent_priv(dev_get_parent(dev)); udev = dev_get_parent_priv(dev_get_parent(dev));
debug("\nusb_read: udev %d\n", block_dev->devnum); debug("\nusb_read: udev %d\n", block_dev->devnum);
@ -1200,7 +1200,7 @@ retry_it:
return blkcnt; return blkcnt;
} }
#ifdef CONFIG_BLK #if CONFIG_IS_ENABLED(BLK)
static unsigned long usb_stor_write(struct udevice *dev, lbaint_t blknr, static unsigned long usb_stor_write(struct udevice *dev, lbaint_t blknr,
lbaint_t blkcnt, const void *buffer) lbaint_t blkcnt, const void *buffer)
#else #else
@ -1215,7 +1215,7 @@ static unsigned long usb_stor_write(struct blk_desc *block_dev, lbaint_t blknr,
struct us_data *ss; struct us_data *ss;
int retry; int retry;
struct scsi_cmd *srb = &usb_ccb; struct scsi_cmd *srb = &usb_ccb;
#ifdef CONFIG_BLK #if CONFIG_IS_ENABLED(BLK)
struct blk_desc *block_dev; struct blk_desc *block_dev;
#endif #endif
@ -1223,7 +1223,7 @@ static unsigned long usb_stor_write(struct blk_desc *block_dev, lbaint_t blknr,
return 0; return 0;
/* Setup device */ /* Setup device */
#ifdef CONFIG_BLK #if CONFIG_IS_ENABLED(BLK)
block_dev = dev_get_uclass_platdata(dev); block_dev = dev_get_uclass_platdata(dev);
udev = dev_get_parent_priv(dev_get_parent(dev)); udev = dev_get_parent_priv(dev_get_parent(dev));
debug("\nusb_read: udev %d\n", block_dev->devnum); debug("\nusb_read: udev %d\n", block_dev->devnum);
@ -1519,7 +1519,7 @@ U_BOOT_DRIVER(usb_mass_storage) = {
.id = UCLASS_MASS_STORAGE, .id = UCLASS_MASS_STORAGE,
.of_match = usb_mass_storage_ids, .of_match = usb_mass_storage_ids,
.probe = usb_mass_storage_probe, .probe = usb_mass_storage_probe,
#ifdef CONFIG_BLK #if CONFIG_IS_ENABLED(BLK)
.platdata_auto_alloc_size = sizeof(struct us_data), .platdata_auto_alloc_size = sizeof(struct us_data),
#endif #endif
}; };
@ -1540,7 +1540,7 @@ static const struct usb_device_id mass_storage_id_table[] = {
U_BOOT_USB_DEVICE(usb_mass_storage, mass_storage_id_table); U_BOOT_USB_DEVICE(usb_mass_storage, mass_storage_id_table);
#endif #endif
#ifdef CONFIG_BLK #if CONFIG_IS_ENABLED(BLK)
static const struct blk_ops usb_storage_ops = { static const struct blk_ops usb_storage_ops = {
.read = usb_stor_read, .read = usb_stor_read,
.write = usb_stor_write, .write = usb_stor_write,