diff options
| author | Matthew McClintock <msm@freescale.com> | 2011-05-24 05:31:19 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-07-26 14:10:14 +0200 |
| commit | df3fc52608daa1e10332f59cd2f226ba400d1c98 (patch) | |
| tree | 0c614241f09bc6055cbb5855feeaaeeeca975ce5 /drivers | |
| parent | 07c07635b4f6d4ee2a03cd508beeeaccde4b9d7e (diff) | |
| download | u-boot-imx-df3fc52608daa1e10332f59cd2f226ba400d1c98.zip u-boot-imx-df3fc52608daa1e10332f59cd2f226ba400d1c98.tar.gz u-boot-imx-df3fc52608daa1e10332f59cd2f226ba400d1c98.tar.bz2 | |
disk/part.c: Make features optional
If we don't want to build support for any partition types we can now
add #undef CONFIG_PARTITIONS in a board config file to keep this from
being compiled in. Otherwise boards assume this is compiled in by
default
Signed-off-by: Matthew McClintock <msm@freescale.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/block/mg_disk.c | 2 | ||||
| -rw-r--r-- | drivers/block/systemace.c | 2 | ||||
| -rw-r--r-- | drivers/mmc/mmc.c | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/drivers/block/mg_disk.c b/drivers/block/mg_disk.c index b74307a..f9e175d 100644 --- a/drivers/block/mg_disk.c +++ b/drivers/block/mg_disk.c @@ -522,10 +522,12 @@ mg_write_exit: return err; } +#ifdef CONFIG_PARTITIONS block_dev_desc_t *mg_disk_get_dev(int dev) { return ((block_dev_desc_t *) & mg_disk_dev); } +#endif /* must override this function */ struct mg_drv_data * __attribute__((weak)) mg_get_drv_data (void) diff --git a/drivers/block/systemace.c b/drivers/block/systemace.c index e8dff0a..58402b9 100644 --- a/drivers/block/systemace.c +++ b/drivers/block/systemace.c @@ -104,6 +104,7 @@ static void release_cf_lock(void) ace_writew((val & 0xffff), 0x18); } +#ifdef CONFIG_PARTITIONS block_dev_desc_t *systemace_get_dev(int dev) { /* The first time through this, the systemace_dev object is @@ -128,6 +129,7 @@ block_dev_desc_t *systemace_get_dev(int dev) return &systemace_dev; } +#endif /* * This function is called (by dereferencing the block_read pointer in diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index cbd7567..7e703c0 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -1167,12 +1167,14 @@ int mmc_register(struct mmc *mmc) return 0; } +#ifdef CONFIG_PARTITIONS block_dev_desc_t *mmc_get_dev(int dev) { struct mmc *mmc = find_mmc_device(dev); return mmc ? &mmc->block_dev : NULL; } +#endif int mmc_init(struct mmc *mmc) { |