diff options
| author | Stephen Warren <swarren@nvidia.com> | 2014-05-05 10:40:12 -0600 |
|---|---|---|
| committer | Lukasz Majewski <l.majewski@samsung.com> | 2014-05-08 10:38:29 +0200 |
| commit | c2474d9c718dea4f26067e85d356644a3aed26c2 (patch) | |
| tree | 5153031c28b3df46738607a9bff2d4052c27b29e | |
| parent | ce19d974018273c8f69d98b7139e7fef822cc02a (diff) | |
| download | u-boot-imx-c2474d9c718dea4f26067e85d356644a3aed26c2.zip u-boot-imx-c2474d9c718dea4f26067e85d356644a3aed26c2.tar.gz u-boot-imx-c2474d9c718dea4f26067e85d356644a3aed26c2.tar.bz2 | |
ums: remove UMS_{NUM,START}_SECTORS + UMS_START_SECTOR
These values aren't set anywhere at present, and hence have no effect.
The concept of a single global offset/number of sectors to expose through
USB Mass Storage doesn't even make sense in the face of multiple storage
devices. Remove these defines to simplify the code.
Cc: Lukasz Majewski <l.majewski@samsung.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Przemyslaw Marczak <p.marczak@samsung.com>
| -rw-r--r-- | board/samsung/common/ums.c | 14 | ||||
| -rw-r--r-- | include/usb_mass_storage.h | 8 |
2 files changed, 2 insertions, 20 deletions
diff --git a/board/samsung/common/ums.c b/board/samsung/common/ums.c index ffe6368..1f7dda4 100644 --- a/board/samsung/common/ums.c +++ b/board/samsung/common/ums.c @@ -39,7 +39,6 @@ static struct ums ums_dev = { static struct ums *ums_disk_init(struct mmc *mmc) { uint64_t mmc_end_sector = mmc->capacity / SECTOR_SIZE; - uint64_t ums_end_sector = UMS_NUM_SECTORS + UMS_START_SECTOR; if (!mmc_end_sector) { error("MMC capacity is not valid"); @@ -47,17 +46,8 @@ static struct ums *ums_disk_init(struct mmc *mmc) } ums_dev.block_dev = &mmc->block_dev; - - if (ums_end_sector <= mmc_end_sector) { - ums_dev.start_sector = UMS_START_SECTOR; - if (UMS_NUM_SECTORS) - ums_dev.num_sectors = UMS_NUM_SECTORS; - else - ums_dev.num_sectors = mmc_end_sector - UMS_START_SECTOR; - } else { - ums_dev.num_sectors = mmc_end_sector; - puts("UMS: defined bad disk parameters. Using default.\n"); - } + ums_dev.start_sector = 0; + ums_dev.num_sectors = mmc_end_sector; printf("UMS: disk start sector: %#x, count: %#x\n", ums_dev.start_sector, ums_dev.num_sectors); diff --git a/include/usb_mass_storage.h b/include/usb_mass_storage.h index e3eb1eb..2b959ec 100644 --- a/include/usb_mass_storage.h +++ b/include/usb_mass_storage.h @@ -12,14 +12,6 @@ #include <part.h> #include <linux/usb/composite.h> -#ifndef UMS_START_SECTOR -#define UMS_START_SECTOR 0 -#endif - -#ifndef UMS_NUM_SECTORS -#define UMS_NUM_SECTORS 0 -#endif - /* Wait at maximum 60 seconds for cable connection */ #define UMS_CABLE_READY_TIMEOUT 60 |